Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.

restore tariff files after special day at 17th of May
comment all opkg lines
2025-05-22 11:06:14 +02:00 · 2025-05-20 10:08:37 +02:00 · 2025-05-12 09:47:54 +02:00 · 2025-05-12 08:52:51 +02:00 · 2025-01-07 10:42:11 +01:00 · 2024-12-16 15:49:08 +01:00
18 changed files with 569 additions and 1380 deletions
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,8 +11,10 @@ if [ -z $IFS ]; then
    IFS=$'\n'
 fi
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
 #TODO: use in UpdateController
 get_blob () {   # get the blob of the file(name) passed as $1
@@ -27,6 +29,7 @@ get_commit_for_blob () {
           grep -q $1 && echo -n {} && head -n 1")
 }
 write_log_file () {
    local now=$(date +"%Y-%m-%dT%T")
    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,27 @@
 # First, ignore everything
 *
-
+# Now, whitelist anything that's a directory
-## Except
+!*/
 # And all the file types you're interested in
 !.gitignore
 !.githooks/post-merge
 !.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
-!/etc/*.ini
+!**/.githooks/post-checkout
 !/etc/atb/*.ini
 !/etc/psa_config/*
 !/etc/psa_update/*
 !/etc/psa_tariff/*
 !/etc/dc/dc2c.hex
-!/opt/app/ATBAPP/*.ini
+## Except
-!/opt/app/sysconfig/*.ini
+!etc/atb/*
-!/opt/app/ISMASMgr/*.ini
+!etc/psa_config/*
 !etc/psa_update/*
 !etc/psa_tariff/*
 !etc/dc/*.hex
 !etc/dc/*.bin
 !*/etc/*.ini
 !*/etc/atb/*
 !*/etc/psa_config/*
 !*/etc/psa_update/*
 !*/etc/psa_tariff/*
 !*/etc/dc/*.hex
 !*/etc/dc/*.bin
--- a/etc/dc/dc2c.4.21.bin
+++ b/etc/dc/dc2c.4.21.bin
--- a/etc/dc/dc2c.4.22.bin
+++ b/etc/dc/dc2c.4.22.bin
--- a/etc/dc/dc2c.4.35.bin
+++ b/etc/dc/dc2c.4.35.bin
--- a/etc/dc/dc2c.bin
+++ b/etc/dc/dc2c.bin
@@ -1 +0,0 @@
 dc2c.4.35.bin
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -0,0 +1,16 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
 "version":"1.0.0-2024-07-05",
 "CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
 "CoinValue(15..0)":[730,365,185,0,0,0,0,100,200,100,50,20,10,5,0,3],
 "CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],
 "ExchangeRate":365,
 "TokenChannel":1,
 "BillValues(7..0)":[0,0,0,0,0,0,0,0],
 "LocalTaxRate":20,
 "ForeignTaxRate":19,
 "Surcharge":0,	
 "Discount":0
 }
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -0,0 +1,27 @@
 "title":"DC2C_pri22",
 "project":"DBM Szeged StartParking",
 "styl":"size 00",
 "text":"Automata száma: ",
 "vari":"manu",
 "feed":"nl",
 "text":"Igazoló sz. sorsz: ",
 "feed":"nl",
 "vari":"Dynamic07",
 "feed":"nl",
 "vari":"Dynamic08",
 "feed":"nl",
 "text":"Az igazolo szelvény",
 "feed":"nl"
 "text":"a nyugtával együtt érvényes. ",
 "feed":"nl",
 "feed":"nl",
 "text":"Üf. szolg nyitvatartás:",
 "feed":"nl",
 "text":"Zrínyi utca 4-8",
 "feed":"nl",
 "text":"H - P: 7:45 - 17:00",
 "feed":"nl",
 "text":"Tel: (80) 820-500",
 "feed":"nl",
 "feed":"nl"
 }
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -0,0 +1,29 @@
 {
 "title":"DC2C_pri25",
 "project":"DBM Szeged StopParking",
 "text":"érvényes.",
 "feed":"nl",
 "feed":"nl",
 "text":"Üf. szolg nyitvatartás:"
 "feed":"nl",
 "text":"    Zrínyi utca 4-8",
 "styl":"size 00",
 "feed":"nl",
 "text":"  H - P: 7:45 - 17:00",
 "feed":"nl",
 "text":"   Tel: (80) 820-500",
 "feed":"nl",
 "feed":"nl",
 "text":"Szegedi Közlekedési Kft",
 "feed":"nl",
 "text":"   6720 Szeged ",
 "feed":"nl",
 "text":" Zrínyi utca 4-8.",
 "feed":"nl",
 "text":"Adósz: 11092612-2-06",
 "feed":"nl",
 "text":"  A jegy ára az ÁFA-t",
 "feed":"nl",
 "text":"     tartalmazza!",
 "feed":"nl"
 }
--- a/etc/psa_config/DC2C_print28.json
+++ b/etc/psa_config/DC2C_print28.json
@@ -0,0 +1,34 @@
 {
 "title":"DC2C_pri28",
 "project":"DBM Szeged Error",
 "styl":"size 00",
 "text":" Üf. szolg nyitvatartás:",
 "feed":"nl",
 "text":"  Zrínyi utca 4-8 ",
 "feed":"nl",
 "text":"  H - P: 7:45 - 17:00",
 "feed":"nl",
 "text":"   Tel: (80) 820-500",
 "feed":"nl",
 "feed":"nl",
 "text":"Szegedi Közlekedési Kft",
 "feed":"nl",
 "text":"     6720",
 "text":" Szeged ",
 "feed":"nl",
 "text":"  Zrínyi utca 4-8",
 "feed":"nl",
 "text":"Adósz: ", 
 "text":"11092612-2-06", 
 "feed":"nl",
 "feed":"nl",
 "text":"Parkoljon egy érintéssel.",
 "feed":"nl",
 "text":"Használja bankkártyáját",
 "feed":"nl",
 "text":"  automatáinknál",
 "text":" is!",
 "feed":"nl",
 "feed":"eject"
 }
--- a/etc/psa_tariff/.tariff04.json.swp
+++ b/etc/psa_tariff/.tariff04.json.swp
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 1",
  "Version" :   "1.0.1",
  "Info"    :   "6725",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,16 +39,16 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 42,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 900
+      "pop_daily_card_price": 990
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1049,
      "pra_payment_unit_id": 1,
-      "pra_price": 150
+      "pra_price": 165
    }
  ],
  "Duration": [
@@ -465,182 +468,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2025-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2060,
      "ped_label": "Labour Day 2",
      "ped_date_start": "2025-05-02",
      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
+      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -658,10 +581,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "ped_date_end": "2024-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2061,
      "ped_label": "Christmas 4th day",
      "ped_date_start": "2024-12-28",
      "ped_date_end": "2024-12-28",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -675,124 +606,38 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 2",
  "Version" :   "1.0.1",
  "Info"    :   "6724",
  "Currency": [
    {
      "pcu_id": 2,
@@ -35,17 +38,17 @@
      "pop_day_night_end_time": "16:27:00",
      "pop_price_night": 0,
      "pop_min_time": 15,
-      "pop_max_time": 300,
+      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 65,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 1320
+      "pop_daily_card_price": 1560
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1050,
      "pra_payment_unit_id": 1,
-      "pra_price": 230
+      "pra_price": 260
    }
  ],
  "Duration": [
@@ -465,182 +468,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2025-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2060,
      "ped_label": "Labour Day 2",
      "ped_date_start": "2025-05-02",
      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
+      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -658,10 +581,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "ped_date_end": "2024-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2061,
      "ped_label": "Christmas 4th day",
      "ped_date_start": "2024-12-28",
      "ped_date_end": "2024-12-28",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -675,123 +606,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 3",
  "Version" :   "1.0.1",
  "Info"    :   "6721",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,16 +39,16 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 90,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 1980
+      "pop_daily_card_price": 2160
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1051,
      "pra_payment_unit_id": 1,
-      "pra_price": 330
+      "pra_price": 360
    }
  ],
  "Duration": [
@@ -100,13 +103,6 @@
      "pwd_period_day_in_week_id": 5,
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "18:00:00"
    },
    {
      "pwd_id": 637,
      "pwd_period_week_day_id": 37,
      "pwd_period_day_in_week_id": 6,
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "12:00:00"
    }
  ],
  "PeriodYear": [
@@ -472,182 +468,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2025-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2060,
      "ped_label": "Labour Day 2",
      "ped_date_start": "2025-05-02",
      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
+      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -665,10 +581,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "ped_date_end": "2024-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2061,
      "ped_label": "Christmas 4th day",
      "ped_date_start": "2024-12-28",
      "ped_date_end": "2024-12-28",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -682,123 +606,40 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 4",
  "Version" :   "1.0.1",
  "Info"    :   "6720",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,9 +39,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 240,
-      "pop_min_price": 0,
+      "pop_min_price": 163,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2400,
+      "pop_daily_card_price": 2600,
      "pop_multi_hour_price": 0
    }
  ],
@@ -46,7 +49,7 @@
    {
      "pra_payment_option_id": 1052,
      "pra_payment_unit_id": 1,
-      "pra_price": 600
+      "pra_price": 650
    }
  ],
  "Duration": [
@@ -627,182 +630,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2025-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2060,
      "ped_label": "Labour Day 2",
      "ped_date_start": "2025-05-02",
      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
+      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -820,10 +743,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "ped_date_end": "2024-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2061,
      "ped_label": "Christmas 4th day",
      "ped_date_start": "2024-12-28",
      "ped_date_end": "2024-12-28",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -837,125 +768,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 5",
  "Version" :   "1.0.1",
  "Info"    :   "6723",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,9 +39,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 90,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 1980,
+      "pop_daily_card_price": 2160,
      "pop_multi_hour_price": 0
    }
  ],
@@ -46,7 +49,7 @@
    {
      "pra_payment_option_id": 1081,
      "pra_payment_unit_id": 1,
-      "pra_price": 330
+      "pra_price": 360
    }
  ],
  "Duration": [
@@ -634,182 +637,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2025-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2060,
      "ped_label": "Labour Day 2",
      "ped_date_start": "2025-05-02",
      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
+      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -827,10 +750,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "ped_date_end": "2024-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2061,
      "ped_label": "Christmas 4th day",
      "ped_date_start": "2024-12-28",
      "ped_date_end": "2024-12-28",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -844,123 +775,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 6",
  "Version" :   "1.0.1",
  "Info"    :   "6722",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,9 +39,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 240,
-      "pop_min_price": 0,
+      "pop_min_price": 163,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2400,
+      "pop_daily_card_price": 2600,
      "pop_multi_hour_price": 0
    }
  ],
@@ -46,7 +49,7 @@
    {
      "pra_payment_option_id": 1082,
      "pra_payment_unit_id": 1,
-      "pra_price": 600
+      "pra_price": 650
    }
  ],
  "Duration": [
@@ -634,182 +637,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
   {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2025-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2060,
      "ped_label": "Labour Day 2",
      "ped_date_start": "2025-05-02",
      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
+      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -827,10 +750,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "ped_date_end": "2024-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2061,
      "ped_label": "Christmas 4th day",
      "ped_date_start": "2024-12-28",
      "ped_date_end": "2024-12-28",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -844,123 +775,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -3,18 +3,16 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-# 
+##
-opkg info atbqt
+# opkg update
-opkg info atbupdatetool
+# opkg install prepare-update
-opkg update
+# download packages
-opkg install prepare-update
+# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
-# opkg install atbupdatetool
+# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
-# opkg remove atb-accountingtool
+# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
-# opkg install atb-accountingtool
+# opkg --cache /var/cache/opkg --download-only upgrade atbqt
-# opkg --cache /var/cache/opkg --download-only upgrade
+# install packages
-# opkg --cache /var/cache/opkg upgrade
+# opkg --cache /var/cache/opkg upgrade tariff-config-281
-# opkg remove apism
+# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
-# opkg install apism
+# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
-opkg info apism
+# opkg --cache /var/cache/opkg upgrade atbqt
 opkg info atbqt
 opkg info atbupdatetool
Author	SHA1	Message	Date
Gerhard Hoffmann	de4775b25b	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:06:14 +02:00
Gerhard Hoffmann	ad69e5d3d9	restore tariff files after special day at 17th of May	2025-05-20 10:08:37 +02:00
Gerhard Hoffmann	e271588861	comment all opkg lines	2025-05-12 09:47:54 +02:00
Gerhard Hoffmann	2008f023d3	special saturday 2025/05/17	2025-05-12 08:52:51 +02:00
Gerhard Hoffmann	a04cb8c3b2	set service fridays: 8-18	2025-01-07 10:42:11 +01:00
Gerhard Hoffmann	3b45a157a7	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:49:08 +01:00
Gerhard Hoffmann	36b3c0a7f1	additional holidays 2024/2025	2024-12-03 13:48:20 +01:00
Gerhard Hoffmann	4e4274bb95	Adapt for Saturday 07/12	2024-12-02 17:08:31 +01:00
Gerhard Hoffmann	c53504b14d	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:32:19 +01:00
Gerhard Hoffmann	1a6c5836bc	Revert to original versions	2024-08-08 12:23:14 +02:00
Gerhard Hoffmann	4e64df50d7	set 8:00-18:00 for 03.08	2024-08-01 12:38:27 +02:00
Gerhard Hoffmann	c4dd836ee3	Activate opkg_commands	2024-07-15 08:54:40 +02:00
Gerhard Hoffmann	cab404e238	opkg: none	2024-07-08 13:37:38 +02:00
Gerhard Hoffmann	84b2b1ca27	Set ex.rate to 365.	2024-07-05 09:40:22 +02:00
Gerhard Hoffmann	e245ae27a0	Set ex.rate to 365.	2024-07-05 09:31:39 +02:00
Gerhard Hoffmann	4f5fcfe7b5	re-commit: change of ISMAS settings	2024-06-25 08:36:21 +02:00
Gerhard Hoffmann	caa7030a97	ZoneId in tariff-files	2024-06-24 11:31:03 +02:00
Siegfried Siegert	3657e299b3	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2024-06-07 08:15:14 +02:00
Siegfried Siegert	bad9bb1103	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:11:51 +02:00
Gerhard Hoffmann	acc80f2c04	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:33:33 +02:00
Gerhard Hoffmann	503e355667	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:51:06 +02:00
Gerhard Hoffmann	6cad56650b	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:10:20 +02:00
Gerhard Hoffmann	6318b15756	Use empty file.	2024-04-18 16:09:50 +02:00
Gerhard Hoffmann	a523fe72c3	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:09:45 +01:00
Gerhard Hoffmann	8fde0a4f4d	added empty lines to restart download	2024-03-28 11:57:17 +01:00
Gerhard Hoffmann	cb7a17cdad	even remove opkg update	2024-03-26 10:06:16 +01:00
Gerhard Hoffmann	2702208167	only install prepare-update script	2024-03-26 09:51:41 +01:00
Gerhard Hoffmann	2c0fd877ab	Removed all holidays except thos for 2024	2024-03-26 09:40:11 +01:00
Gerhard Hoffmann	59cd4bfb7e	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:29:34 +01:00
Gerhard Hoffmann	0cfd6b7071	tariff01.json: set min-price: 165 / 4 -> 45 tariff02.json: set min-price: 260 / 4 -> 65 tariff03.json: set min-price: 360 / 4 -> 90 tariff04.json: set min-price: 650 / 4 -> 165 tariff05.json: set min-price: 360 / 4 -> 90 tariff06.json: set min-price: 650 / 4 -> 165	2024-02-15 14:26:37 +01:00
Gerhard Hoffmann	443961ca5d	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:45:05 +01:00
Gerhard Hoffmann	c2c21df05a	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:43:35 +01:00
Gerhard Hoffmann	053d554c45	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 10:59:14 +01:00
Gerhard Hoffmann	048ef21538	Update exchange rate to 352.	2023-12-31 08:16:57 +01:00
Gerhard Hoffmann	19b8b6ba28	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:08:07 +01:00
Gerhard Hoffmann	1e2b4bcc7d	switch back to previous prices until 01.01.2024	2023-12-23 08:33:34 +01:00
Gerhard Hoffmann	aa32676431	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:24:51 +01:00
Gerhard Hoffmann	a9b9fd75bf	Remove dc-files (to be used later)	2023-12-20 13:55:56 +01:00
Gerhard Hoffmann	60a375a773	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:50:58 +01:00
Gerhard Hoffmann	b4c50748ba	Reset to previous prices keeping current holidays	2023-12-20 12:50:39 +01:00
Gerhard Hoffmann	c3c07329b6	Updated to use new prices.	2023-12-19 16:49:12 +01:00
Gerhard Hoffmann	d14dc38340	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:57:18 +01:00
Gerhard Hoffmann	ecabc589d8	delete all json files	2023-12-19 13:54:09 +01:00
Gerhard Hoffmann	6e756202d7	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:56:39 +01:00
Gerhard Hoffmann	d478ce44ab	switch back to previous prices, but keeping current holidays	2023-12-19 11:17:30 +01:00
Gerhard Hoffmann	1746b94678	tariff01: new price: 165 new daily price: 990 tariff02: new price: 260 new daily price: 1560 tariff03: new price: 360 new daily price: 2160 tariff04: new price: 650 Set new holidays starting from Dec. 2023.	2023-12-18 14:42:54 +01:00
Gerhard Hoffmann	1f54b1ec90	Fixed wrong comma after exchange rate	2023-10-11 14:13:59 +02:00
Gerhard Hoffmann	e1c39f1df6	set exchange rate to 360	2023-10-10 16:29:38 +02:00
Siegfried Siegert	2d65b9ba14	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-09-18 17:18:26 +02:00
Siegfried Siegert	38386d7aed	Update test 20230811113644-00281	2023-09-18 17:16:56 +02:00
Gerhard Hoffmann	e9dc8f6e10	Remove ini-file (used for testing) and obsolete tariff.current file.	2023-08-11 12:44:07 +02:00
Gerhard Hoffmann	2cc7ec9dc7	Install ptu5-gitinstaller, atbupdatetool and atbqt.	2023-08-11 12:43:10 +02:00
Gerhard Hoffmann	25e9e014de	set useLanguage 240 -> 248	2023-08-10 16:37:45 +02:00
Gerhard Hoffmann	0657b3ea27	install apism via opkg	2023-08-09 16:21:48 +02:00
Gerhard Hoffmann	5629444870	Appended a dateline. Set useLanguage 248 -> 240	2023-08-09 16:20:08 +02:00
Gerhard Hoffmann	9461dfafb0	add another line for testing	2023-08-09 10:20:38 +02:00
Gerhard Hoffmann	5a25611a39	240 -> 248	2023-08-09 10:16:51 +02:00
Gerhard Hoffmann	73f5bfd568	add another line for testing	2023-08-09 10:13:42 +02:00
Gerhard Hoffmann	4331c32dc5	Add file for testing. 248 -> 240 for useLanguage	2023-08-09 09:58:28 +02:00
Gerhard Hoffmann	23e5e1339e	appended datelien for testing	2023-08-09 09:54:41 +02:00
Gerhard Hoffmann	5d9882c569	set daily cardprice to 2400	2023-08-03 15:44:06 +02:00
Gerhard Hoffmann	6ed893f3fc	add json files for zones 5 and 6	2023-08-03 15:30:58 +02:00
Gerhard Hoffmann	69e3fbe55a	use same tariff-file as branch for zone4	2023-07-26 14:48:20 +02:00
Gerhard Hoffmann	d72bafb8d7	Set max_time to 240	2023-07-25 10:15:11 +02:00
Gerhard Hoffmann	0b7614c2d9	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:17 +02:00
Gerhard Hoffmann	de0b5a3e70	Update json-printer-files (provided by Dennis)	2023-07-06 15:10:50 +02:00
Gerhard Hoffmann	e9fa1e6dd5	remove file in wrong localtion	2023-07-06 15:10:14 +02:00
Gerhard Hoffmann	ee0a06ba0b	remove handling og checkout_history file	2023-07-04 14:00:48 +02:00
Gerhard Hoffmann	96a1db1fba	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:23 +02:00
Gerhard Hoffmann	1071e8e762	Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone2	2023-07-04 12:14:20 +02:00
Gerhard Hoffmann	794c26ee97	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:14:13 +02:00
Siegfried Siegert	8211505d34	Revert last ATBQT.ini change	2023-06-30 15:42:20 +02:00
Siegfried Siegert	1c08df6da1	Fix: filename	2023-06-30 15:33:45 +02:00
Siegfried Siegert	031c9653f1	Update Test for ATBQT.ini	2023-06-30 15:28:33 +02:00
Siegfried Siegert	9643f36c1d	Add dc2c.4.33.bin for test	2023-06-30 15:13:31 +02:00
Siegfried Siegert	d6ef0ac4a6	Prevent updating atbqt	2023-06-30 15:12:13 +02:00
Siegfried Siegert	bf5bce2be8	DC Update Test	2023-06-30 15:10:13 +02:00
Siegfried Siegert	ef12748e72	Szeged Test	2023-06-30 14:37:52 +02:00
Siegfried Siegert	6a47b52c24	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-30 14:36:47 +02:00
Gerhard Hoffmann	cebda53e85	return to normal workflow after testing	2023-06-30 10:51:32 +02:00
Gerhard Hoffmann	8b5f310464	Provide opkg commands for zone2	2023-06-29 14:30:39 +02:00
Gerhard Hoffmann	db54f86be9	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:21:37 +02:00
Gerhard Hoffmann	cf5b677bfe	Adding device-controller firmware version 4.35	2023-06-27 16:21:28 +02:00
Gerhard Hoffmann	d25e6232e0	install same post-merge-hook as in branch zg1/zone1	2023-06-27 14:32:34 +02:00
Gerhard Hoffmann	8949d1850c	install same post-checkout-hook as in branch zg1/zone1	2023-06-27 14:31:17 +02:00
Gerhard Hoffmann	22d1a9f8a1	Set daily_card_price to 2400 for zone4	2023-06-27 14:17:37 +02:00
Siegfried Siegert	ee70081ab3	Remove old deviceController firmware	2023-06-26 14:37:00 +02:00
Siegfried Siegert	a5f76131ff	Add correct tariff config files	2023-06-25 15:04:58 +02:00
Siegfried Siegert	7ed84450e2	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-25 14:57:42 +02:00
Siegfried Siegert	8b58d78cd8	Remove invalid config files	2023-06-25 14:57:13 +02:00
Siegfried Siegert	fe7c8bf282	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-19 10:37:27 +02:00
Siegfried Siegert	8fdb94ac90	Merge branch 'zg1/zone1' into zg1/zone2	2023-06-19 10:32:20 +02:00
Siegfried Siegert	ad987e5be6	Update tariff configurations	2023-06-19 10:24:34 +02:00
Gerhard Hoffmann	1e629e5fea	check for existence of opkg_commands-file (2)	2023-06-05 15:58:15 +02:00
Gerhard Hoffmann	7939f576a0	check for existence of opkg_commands-file	2023-06-05 15:52:30 +02:00
Gerhard Hoffmann	bbd39fbccb	adding post-checkout hook ad for zone1	2023-06-05 15:46:25 +02:00
Siegfried Siegert	936e3f4dac	Remove old files	2023-06-01 17:12:22 +02:00
Siegfried Siegert	9566a0793c	Update tariff files for current Szeged testing	2023-06-01 16:10:14 +02:00
Siegfried Siegert	1ce636908f	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-01 16:04:42 +02:00
Gerhard Hoffmann	338e36c5e6	handle dc2c.bin as link to the real device controller file	2023-05-31 09:46:47 +02:00
Gerhard Hoffmann	279bcc009f	Adding link to dc2c.4.22.bin	2023-05-31 09:37:20 +02:00
Gerhard Hoffmann	ac77c0d08a	removed obsolete hex-file	2023-05-31 09:35:39 +02:00
Gerhard Hoffmann	db1b9ac700	removed downloading of tariff-files. removed downloading of dc.hex files (only dc.bin-files are downloaded)	2023-05-31 09:12:43 +02:00
Gerhard Hoffmann	8d8cc811c6	Add device controller version 4.22	2023-05-31 08:58:21 +02:00
Gerhard Hoffmann	bbdde459b6	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2023-05-31 08:55:31 +02:00
Gerhard Hoffmann	94b9cec72c	Adding device controller version 4.22	2023-05-31 08:55:22 +02:00
Siegfried Siegert	4a1bc704e5	Update to latest ATBAPP.ini	2023-05-30 10:33:10 +02:00
Gerhard Hoffmann	8766a0bd86	testing	2023-05-30 10:10:24 +02:00
Gerhard Hoffmann	fe56c2c73e	Add date to each line in checkout_history-file	2023-05-26 09:57:22 +02:00
Gerhard Hoffmann	0e8aa33feb	testing	2023-05-26 08:16:24 +02:00
Gerhard Hoffmann	6e7501e54c	testing	2023-05-26 08:03:28 +02:00
Gerhard Hoffmann	c0deb2d4a0	testing	2023-05-25 17:39:10 +02:00
Gerhard Hoffmann	24f5ae1696	testing	2023-05-25 17:37:19 +02:00
Gerhard Hoffmann	609cf8bc3c	testing	2023-05-25 17:32:39 +02:00
Gerhard Hoffmann	79e823df52	testing	2023-05-25 17:31:07 +02:00
Gerhard Hoffmann	74edb5e88a	testing	2023-05-25 17:28:09 +02:00
Gerhard Hoffmann	f342d81db2	testing	2023-05-25 17:25:12 +02:00
Gerhard Hoffmann	2e09b19564	testing	2023-05-25 17:23:11 +02:00
Gerhard Hoffmann	7a0950e004	testing	2023-05-25 17:21:15 +02:00
Gerhard Hoffmann	faf1b68ce9	testing	2023-05-25 17:16:10 +02:00
Gerhard Hoffmann	47c6a9fdb0	testing	2023-05-25 17:06:12 +02:00
Gerhard Hoffmann	14b26aa8fa	test for syntax errors	2023-05-25 17:04:23 +02:00
Gerhard Hoffmann	72ecd841df	test for syntax errors	2023-05-25 17:03:11 +02:00
Gerhard Hoffmann	97abd39097	test for syntax errors	2023-05-25 16:59:12 +02:00
Gerhard Hoffmann	050deba0bd	test for syntax errors	2023-05-25 16:54:25 +02:00
Gerhard Hoffmann	a7df379b6c	test for syntax errors	2023-05-25 16:47:29 +02:00
Gerhard Hoffmann	70e3028978	test for syntax errors	2023-05-25 16:40:09 +02:00
Gerhard Hoffmann	103f66f044	test for syntax errors	2023-05-25 16:36:54 +02:00
Gerhard Hoffmann	8729683fca	test for syntax errors	2023-05-25 16:32:08 +02:00
Gerhard Hoffmann	12d1458bcb	Add handling for opkg-commands	2023-05-25 16:20:18 +02:00
Gerhard Hoffmann	7db36e8de4	Testing. Add known files to be downloaded/executed.	2023-05-25 15:31:02 +02:00
Gerhard Hoffmann	b6137a41f2	Testing. remove spaces from branch-name	2023-05-25 15:13:07 +02:00
Gerhard Hoffmann	5939060c69	Testing	2023-05-25 15:08:21 +02:00
Gerhard Hoffmann	e0d813b34a	Testing	2023-05-25 15:04:51 +02:00
Gerhard Hoffmann	affc74e711	Testing	2023-05-25 15:01:15 +02:00
Gerhard Hoffmann	13942e34f3	Testing	2023-05-25 14:54:59 +02:00
Gerhard Hoffmann	d3847df593	Test: add an entry into update_log.csv	2023-05-25 14:51:42 +02:00
Gerhard Hoffmann	a9cb3b53f4	Use basename to get only the name of the repo	2023-05-25 14:41:04 +02:00
Gerhard Hoffmann	346247b88a	extract branch info	2023-05-25 14:33:48 +02:00
Gerhard Hoffmann	5c89c49f08	Add debug message for branch name which is checked out	2023-05-25 14:10:43 +02:00
Gerhard Hoffmann	6b6313d429	testing	2023-05-24 16:33:31 +02:00
Gerhard Hoffmann	4d698ffb79	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:20:16 +02:00
Gerhard Hoffmann	e83e1589fb	Adding dc-version 4.21	2023-05-24 16:19:39 +02:00
Gerhard Hoffmann	0aaeaa7350	Updated printer-templates (24/05/2023) because of printing problems on DC side	2023-05-24 16:17:22 +02:00
Gerhard Hoffmann	7d0cebe0ff	Adding dc version 4.21	2023-05-24 12:32:37 +02:00
Gerhard Hoffmann	bf5709d053	Testing	2023-05-24 12:18:00 +02:00
Gerhard Hoffmann	b22b3b31ee	Only test entry.	2023-05-24 12:15:02 +02:00
Gerhard Hoffmann	b4998ffe48	Fixed typo	2023-05-24 12:10:11 +02:00
Gerhard Hoffmann	c94b276be0	Added write_log_file()	2023-05-24 12:08:59 +02:00
Gerhard Hoffmann	505911ef5b	Replaced __date by __datum	2023-05-24 12:06:01 +02:00
Gerhard Hoffmann	794229660c	Minor change to check commit...	2023-05-24 12:01:28 +02:00
Gerhard Hoffmann	13cfbb4932	Use /opt/app/tools/atbupdate/update_log.csv as main-file for update-history.	2023-05-24 11:35:50 +02:00
Gerhard Hoffmann	4bf9efcf3a	Updating print templates as of 11 May, 2023.	2023-05-18 12:15:37 +02:00
Gerhard Hoffmann	981dade375	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2023-05-18 12:14:35 +02:00
Gerhard Hoffmann	3e1cf3c4e3	Updating printing templates as of May 11, 2023.	2023-05-18 12:13:25 +02:00
Siegfried Siegert	be84634d62	Update ATBQT.ini SysetemControl.ini for Szeged Test	2023-05-05 10:59:31 +02:00
Siegfried Siegert	f33d45d082	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-05-05 10:51:28 +02:00
Siegfried Siegert	a6862f566a	Update ATBQT.ini SysetemControl.ini for Szeged Test	2023-05-05 10:49:51 +02:00
Gerhard Hoffmann	64937d6fb4	Add tariff-file for zone 4	2023-05-04 10:55:28 +02:00
Gerhard Hoffmann	dc68633378	Add tariff-file for zone 4	2023-05-04 10:54:08 +02:00
Gerhard Hoffmann	61c9253239	test	2023-04-25 13:07:28 +02:00
Gerhard Hoffmann	6acc53275d	Update as for branch zg1/zone1	2023-04-25 11:53:41 +02:00
Gerhard Hoffmann	378de9200c	use a better name for file: git_changed_files_for_last_pull	2023-04-25 11:50:40 +02:00
Gerhard Hoffmann	4a3ac32724	test	2023-04-25 11:42:30 +02:00
Gerhard Hoffmann	0fbea3a260	use filename for getting commit, not the blob of the file	2023-04-25 11:41:49 +02:00
Gerhard Hoffmann	123291a2c2	test	2023-04-25 11:24:07 +02:00
Gerhard Hoffmann	cca3484256	debugging ...	2023-04-25 11:23:09 +02:00
Gerhard Hoffmann	5beba99abb	test	2023-04-25 11:19:29 +02:00
Gerhard Hoffmann	13b3af1f92	debugging ...	2023-04-25 11:18:54 +02:00
Gerhard Hoffmann	6de220b8ba	test	2023-04-25 11:14:34 +02:00
Gerhard Hoffmann	009b5c0170	removed changed_file_names	2023-04-25 11:12:26 +02:00
Gerhard Hoffmann	fb2d0cf506	test	2023-04-25 11:09:38 +02:00
Gerhard Hoffmann	22b1efd66e	Try fo fix evaluating last-commit...	2023-04-25 11:09:17 +02:00
Gerhard Hoffmann	abf75d636b	assum blob not empty	2023-04-25 11:01:22 +02:00
Gerhard Hoffmann	b6a999e014	test	2023-04-25 10:59:55 +02:00
Gerhard Hoffmann	dcc7397232	test	2023-04-25 10:56:43 +02:00
Gerhard Hoffmann	f248f3f85f	try to use blob and commit for changed file	2023-04-25 10:50:10 +02:00
Gerhard Hoffmann	93ba8215b9	test	2023-04-25 10:39:48 +02:00
Gerhard Hoffmann	cd85b2c6e9	test	2023-04-25 10:34:17 +02:00
Siegfried Siegert	0f5c66fccc	Update ATBAPP config	2023-04-04 08:59:21 +02:00
Siegfried Siegert	58e833b3a6	Update gitignore	2023-04-04 08:58:45 +02:00
Siegfried Siegert	48a299002c	gitignore: do not track application default ini files	2023-04-04 08:04:54 +02:00
Siegfried Siegert	91130d96f0	SystemControl: Fix: config: AT_TASKS configuration	2023-04-03 14:50:59 +02:00
Siegfried Siegert	b115f3dfb8	SystemControl: config: add AT_TASKS configuration	2023-04-03 13:52:13 +02:00
Siegfried Siegert	76c4663d8f	TEST: change SystemControl.ini	2023-04-03 11:18:30 +02:00
Siegfried Siegert	7462ce9e12	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-04-03 11:17:50 +02:00
Gerhard Hoffmann	1480313fd0	add empty lines	2023-04-03 10:53:26 +02:00
Siegfried Siegert	a17bcb8b17	Updatetest	2023-04-03 10:26:22 +02:00
Siegfried Siegert	469ecbc482	Add initial SystemControl.ini	2023-04-03 09:54:08 +02:00
Gerhard Hoffmann	273e6a8422	datumseintrag	2023-04-03 08:51:28 +02:00
Gerhard Hoffmann	1bfbfbb670	Removed *.ini-Files.	2023-03-31 11:47:49 +02:00
Gerhard Hoffmann	87af143cbd	Removed *.ini-Files.	2023-03-31 11:46:54 +02:00
Gerhard Hoffmann	4071d8ea14	Removed *ini-Files.	2023-03-31 11:42:27 +02:00
Gerhard Hoffmann	f383f8282e	aset fsize only when file exists	2023-03-31 10:13:16 +02:00
Gerhard Hoffmann	2bcc19f9f6	rm test file	2023-03-31 10:09:10 +02:00
Gerhard Hoffmann	e46c1f272b	Add .gitignore	2023-03-31 09:51:38 +02:00
Gerhard Hoffmann	094fc2ef9a	removed 'local' keyword	2023-03-31 09:39:16 +02:00
Gerhard Hoffmann	ba690aea25	Add .gitignore file	2023-03-31 09:37:10 +02:00
Gerhard Hoffmann	5b57d0704c	testing	2023-03-31 09:06:53 +02:00
Gerhard Hoffmann	cc75917193	Fixed typo	2023-03-31 09:01:13 +02:00
Gerhard Hoffmann	5f3a7608ba	testing	2023-03-31 09:00:01 +02:00
Gerhard Hoffmann	b6b37ec0c0	testing	2023-03-31 08:57:17 +02:00
Gerhard Hoffmann	8a64c8bcdc	testing	2023-03-31 08:55:27 +02:00
Gerhard Hoffmann	d0574c6574	testing	2023-03-31 08:50:06 +02:00
Gerhard Hoffmann	ef1b9e6add	testing	2023-03-31 08:48:22 +02:00
Gerhard Hoffmann	ef5bb0e182	rm empty test binary	2023-03-31 07:58:31 +02:00
Gerhard Hoffmann	3c97eaf7d8	test	2023-03-30 13:13:12 +02:00
Gerhard Hoffmann	5293268086	Add empty test bin	2023-03-30 12:56:35 +02:00
Gerhard Hoffmann	73fbc3d5ad	Add handling for binary dc-files	2023-03-30 12:48:33 +02:00
Gerhard Hoffmann	d96a34d875	Add handling for binary dc-files	2023-03-30 12:46:04 +02:00
Gerhard Hoffmann	4d48b9bcc3	Add binary device controller file (29/03/2023)	2023-03-30 12:37:29 +02:00
Gerhard Hoffmann	8c736577fe	Update to version dc2c.4.11.hex	2023-03-30 09:31:23 +02:00
Hoffmann Gerhard	9b2d7c77f6	commit test	2023-03-28 16:05:28 +02:00
Hoffmann Gerhard	998c44fd5c	Test for change of json	2023-03-28 15:28:13 +02:00
Gerhard Hoffmann	05fe40a2e6	test	2022-07-08 15:20:18 +02:00
Gerhard Hoffmann	040f15bc0e	test	2022-07-08 15:16:19 +02:00
Gerhard Hoffmann	80e38a8482	test	2022-07-08 15:10:11 +02:00
Gerhard Hoffmann	731dfcf961	test	2022-07-08 15:07:34 +02:00
Gerhard Hoffmann	a668dfbe3f	test	2022-07-08 15:06:42 +02:00
Gerhard Hoffmann	26d3c61c7d	test	2022-07-08 15:02:42 +02:00
Gerhard Hoffmann	bbd6566772	test	2022-07-08 14:57:07 +02:00
Gerhard Hoffmann	ce9ecc509c	Add tariff files for szeged	2023-04-24 12:43:46 +02:00
Gerhard Hoffmann	ad110349d8	Fixed JSON-typo	2023-04-17 12:41:33 +02:00
Gerhard Hoffmann	50c5549834	Fixed JSON-typo	2023-04-17 12:40:32 +02:00
Gerhard Hoffmann	59840c6db9	Update for Hungarian format	2023-04-13 16:38:41 +02:00
Gerhard Hoffmann	621a8ac361	Print the values of the passed parameters.	2023-04-12 15:59:57 +02:00
Gerhard Hoffmann	9ca0a00763	Adding get_blob, get_commit_for_blob, changed_file_names.	2023-04-12 15:28:39 +02:00
Gerhard Hoffmann	09633c3754	Add hook post-checkout	2023-04-12 14:49:55 +02:00
Gerhard Hoffmann	5c85a294d5	Adding git hook post-checkout.	2023-04-12 14:22:17 +02:00