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:05:34 +02:00 · 2025-05-20 10:07:55 +02:00 · 2025-05-12 09:45:15 +02:00 · 2025-05-12 08:49:13 +02:00 · 2025-01-07 10:41:21 +01:00 · 2024-12-16 15:48:13 +01:00
51 changed files with 2300 additions and 1371 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -0,0 +1,28 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	symlinks = true
+[remote "origin"]
+	url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[branch "zg1/zone1"]
+	remote = origin
+	merge = refs/heads/zg1/zone1
+[branch "zg1/zone2"]
+	remote = origin
+	merge = refs/heads/zg1/zone2
+[branch "zg1/zone3"]
+	remote = origin
+	merge = refs/heads/zg1/zone3
+[branch "zg1/zone4"]
+	remote = origin
+	merge = refs/heads/zg1/zone4
+[pull]
+	rebase = false
+[push]
+	autoSetupRemote = true
--- a/.githooks/post-checkout
+++ b/.githooks/post-checkout
@@ -4,48 +4,57 @@
 # echo "CURR-HEAD=$2"
 # echo "BRANCH-CHECKOUT=$3"

-readonly CHECKOUT_HISTORY_FILE="/opt/app/tools/atbupdate/checkout_history"
 readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
-readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands"
-
+readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
+            
 write_log_file () {
-    if [ -f $CHECKOUT_HISTORY_FILE ]; then
-        # repo: customer_281
-        readonly repo=$(basename $(git rev-parse --show-toplevel))
-        # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 
-        readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
-        readonly line="$repo:$branch"
-        readonly now="$(date +%Y-%m-%dT%T)"
-        if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then
-            # line not found. first checkout of this branch (on this PSA).
-            # mark dc and print-templates to be downloaded by update-tool.
-            echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
-            if grep -qE . "${OPKG_COMMANDS_FILE}"; then
-                readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
-                for opkg_c in "${opkg_commands[@]}"; do
-                    # check for lines longer than 'opkg '
-                    if [ "${#opkg_c}" -gt 4 ]; then
-                        # comment: spaces, at least one '#'
-                        grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
-                        echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
-                        echo "" >> $GIT_UPDATE_LOG 2>&1
-                    fi
-                done
-            fi
-        else
-            echo "Found existing line: $line. Do nothing"
+    # repo: customer_281
+    # readonly repo=$(basename $(git rev-parse --show-toplevel))
+    # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 
+    # readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
+    # readonly line="$repo:$branch"
+    readonly now="$(date +%Y-%m-%dT%T)"
+    # echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
+    # echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
+    if [ -f "$OPKG_COMMANDS_FILE" ]; then
+        if grep -qE . "${OPKG_COMMANDS_FILE}"; then
+            # make sure the file is empty
+            echo -n "" > $GIT_UPDATE_LOG 
+            readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
+            for opkg_c in "${opkg_commands[@]}"; do
+                # check for lines longer than 'opkg '
+                if [ "${#opkg_c}" -gt 4 ]; then
+                    # comment: spaces, at least one '#'
+                    grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
+                    echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
+                    echo "" >> $GIT_UPDATE_LOG 2>&1
+                fi
+            done
        fi
-        echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
-    else
-        echo "*******************************************************"
-        echo "     $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!!         "
-        echo "*******************************************************"
    fi
 }

--- a/README.md
+++ b/README.md
--- a/etc/dc/dc2c.4.11.bin
+++ b/etc/dc/dc2c.4.11.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.bin
+++ b/etc/dc/dc2c.bin
@@ -1 +0,0 @@
-dc2c.4.22.bin
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,16 +1,16 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
-"localCoinAccept(7..0)":[0,0,0,1,1,1,1,1],
-"Name of Currency":"Huf",
-"local tax rate":20,
-"foreignCoinAccept(15..8)":[0,0,0,0,0,1,1,1],
-"CurrencyName":"EUR",
-"foreign tax rate":19,
-"TokenChannel":3,
-"Bills(7..0)":[0,0,0,0,0,0,0,0],
-"surcharge":0,	
-"discount":0,
-"":""
+"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_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -1,13 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
-"custNum":281,
-"machNum":999,
-"borough":1,
-"zone":1,
-"alias":1357,
-"location":"92637Weiden/Opf_Bahnhofstraße 65",
-"":""
-}
-
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,38 +0,0 @@
-{
-"title":"DC2C_pri01",
-"project":"DBM Szeged park_coins",
-"issued":"13.04.2023 01.02",
-"styl":"font 08",
-"styl":"size 10",
-"feed":"margin02",
-"feed":"rim02",
-"text":"PARKOLÓJEGY",
-"styl":"size 00",
-"feed":"nl",
-"text":"      Nyugta",
-"feed":"nl",
-"text":"Kérjük az elsö szélvédö",
-"feed":"nl",
-"text":"mögé jól láthatóan", 
-"feed":"nl",
-"text":"elhelyezni!",
-"feed":"nl",
-"text":"A PARKOLÓ NEM ÕRZÖTT",
-"feed":"nl",
-"feed":"nl",
-"text":"Rendszám: ",
-"vari":"Dynamic01",
-"feed":"nl",
-"text":"Parkolási idõ vége:",
-"feed":"nl",
-"styl":"size 01",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl",
-"text":"Parkolás helye: ",
-"feed":"nl",
-"vari":"location",
-}
-
-
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,37 +0,0 @@
-{
-"title":"DC2C_pri02",
-"project":"DBM Szeged park_coins",
-"issued":"13.04.2023 01.01",
-
-"text":"Összeg: ",
-"styl":"size 01",
-"vari":"Dynamic02",
-"styl":"size 00",
-"feed":"nl",
-"text":"Kiadás időpontja:",
-"feed":"nl",
-"vari":"date us",	
-"vari":"time short",	
-"feed":"nl",
-"text":"Automata száma: ",
-"vari":"manu",
-"text":"Park.jegy sorsz.: ",
-"vari":"TickCtr",
-"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",
-"text":"Üf. szolg nyitvatartás:",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,22 +0,0 @@
-{
-"title":"DC2C_pri03",
-"project":"DBM Szeged park_coins",
-"issued":"13.04.2023 01.01",
-
-"styl":"size 00",
-"text":"H - P: 7:45 - 17:00",
-"feed":"nl",
-"text":"Tel: (80) 820-500",
-"feed":"nl",
-"text":"Parkoljon egy érintéssel. ",
-"feed":"nl",
-"text":"Használja bankkártyáját ",
-"feed":"nl",
-"text":"  automatáinknál is!",
-"feed":"nl",
-"feed":"nl",
-"feed":"nl",
-"feed":"eject",
-}
-
-
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,8 +0,0 @@
-{
-"title":"DC2C_pri04",
-"project":"empty",
-"issued":"24.05.2023 01.00",
-"text":""
-}
-
-
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri05",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri06",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri07",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri08",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri09",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri10",
-"version":"27.02.2023 12:20 00001",
-"test":""
-}
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri11",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri12",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri13",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri14",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri15",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri16",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri17",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri18",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri19",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri20",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print21.json
+++ b/etc/psa_config/DC2C_print21.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri21",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -1,5 +1,27 @@
-{
-"title":"DC2C_pri22",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+"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_print23.json
+++ b/etc/psa_config/DC2C_print23.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri23",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri24",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -1,5 +1,29 @@
-{
-"title":"DC2C_pri25",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"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_print26.json
+++ b/etc/psa_config/DC2C_print26.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri26",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print27.json
+++ b/etc/psa_config/DC2C_print27.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri27",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print28.json
+++ b/etc/psa_config/DC2C_print28.json
@@ -1,5 +1,34 @@
-{
-"title":"DC2C_pri28",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"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_config/DC2C_print29.json
+++ b/etc/psa_config/DC2C_print29.json
@@ -1,24 +0,0 @@
-{
-"title":"DC2C_pri29",
-"project":"ATB test",
-"issued":"24.05.2023 01.00",
-"styl":"font 08",
-"styl":"size 11",
-"feed":"margin02",
-"feed":"rim02",
-"text":"All 8 Variables:",
-"feed":"nl",
-"vari":"Dynamic01",
-"vari":"Dynamic02",
-"vari":"Dynamic03",
-"vari":"Dynamic04",
-"vari":"Dynamic05",
-"vari":"Dynamic06",
-"vari":"Dynamic07",
-"vari":"Dynamic08",
-"feed":"eject",
-
-
-}
-
-
--- a/etc/psa_config/DC2C_print30.json
+++ b/etc/psa_config/DC2C_print30.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri30",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri31",
-"version":"27.02.2023 12:20 00001",
-"":"iiii"
-}
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri32",
-"project":"DBM Szeged door",
-"issued":"18.04.2023 01.01",
-"styl":"font 08",
-"styl":"size 10",
-"feed":"margin02",
-"feed":"rim02",
-"styl":"size 11",
-"text":"AJTÓ NYITÁS",
-"feed":"nl",
-"styl":"size 00",
-"text":"Door closed",
-"feed":"nl",
-"feed":"nl",
-"text":"CuNu: ",
-"vari":"cunu",	
-"text":"MaNu: ",
-"vari":"manu",	
-"text":"Place: ",
-"vari":"location",	
-"text":"Group: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
-"text":"Name: ",
-"vari":"alias",	
-"text":"Date: ",
-"vari":"date us",
-"text":"Time: ",
-"vari":"time long",
-"feed":"nl",
-"text":" * * * * * * * * ",
-"feed":"nl",
-"feed":"nl",
-"feed":"eject",
-}
-
-
--- a/etc/psa_config/DC2C_serial.json
+++ b/etc/psa_config/DC2C_serial.json
@@ -1,13 +0,0 @@
-{	     
-"title":"DC2C_serial",
-"setup_master_interface":"",
-"project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
-"crcChk":1,
-"baudRate":9600,
-"data":8,
-"parity":"no",
-"stop":1,
-"":""
-}
-
--- a/etc/psa_config/tariff01.json
+++ b/etc/psa_config/tariff01.json
--- 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,
@@ -35,17 +38,17 @@
      "pop_day_night_end_time": "16:25:00",
      "pop_price_night": 0,
      "pop_min_time": 15,
-      "pop_max_time": 300,
-      "pop_min_price": 0,
+      "pop_max_time": 360,
+      "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": [
@@ -104,7 +107,7 @@
  ],
  "PeriodYear": [
    {
-      "pye_id": 8,
+      "pye_id": 2,
      "pye_label": "Whole year",
      "pye_start_month": 1,
      "pye_start_day": 1,
@@ -465,341 +468,176 @@
    }
  ],
  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_date_start": "2025-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": "2022-12-24",
-      "ped_date_end": "2022-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_date_start": "2025-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": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_date_start": "2025-04-18",
+      "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": "2023-04-09",
-      "ped_date_end": "2023-04-09",
+      "ped_date_start": "2025-04-20",
+      "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": "2023-04-10",
-      "ped_date_end": "2023-04-10",
+      "ped_date_start": "2025-04-21",
+      "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": "2023-05-28",
-      "ped_date_end": "2023-05-28",
+      "ped_date_start": "2025-06-08",
+      "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": "2023-05-29",
-      "ped_date_end": "2023-05-29",
+      "ped_date_start": "2025-06-09",
+      "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": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_date_start": "2025-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": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_date_start": "2025-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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
+      "ped_date_start": "2025-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": "2023-11-01",
-      "ped_date_end": "2023-11-01",
+      "ped_date_start": "2025-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": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2053,
      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
-      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "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
    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2022-12-24",
-      "ped_date_end": "2022-12-24",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "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_date_start": "2023-04-09",
-      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2023-05-28",
-      "ped_date_end": "2023-05-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2062,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2023-05-29",
-      "ped_date_end": "2023-05-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2063,
-      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2066,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2023-11-01",
-      "ped_date_end": "2023-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2067,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2068,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2069,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2070,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2071,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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_min_price": 0,
+      "pop_max_time": 360,
+      "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": [
@@ -104,7 +107,7 @@
  ],
  "PeriodYear": [
    {
-      "pye_id": 8,
+      "pye_id": 2,
      "pye_label": "Whole year",
      "pye_start_month": 1,
      "pye_start_day": 1,
@@ -465,341 +468,177 @@
    }
  ],
  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_date_start": "2025-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": "2022-12-24",
-      "ped_date_end": "2022-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_date_start": "2025-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": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_date_start": "2025-04-18",
+      "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": "2023-04-09",
-      "ped_date_end": "2023-04-09",
+      "ped_date_start": "2025-04-20",
+      "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": "2023-04-10",
-      "ped_date_end": "2023-04-10",
+      "ped_date_start": "2025-04-21",
+      "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": "2023-05-28",
-      "ped_date_end": "2023-05-28",
+      "ped_date_start": "2025-06-08",
+      "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": "2023-05-29",
-      "ped_date_end": "2023-05-29",
+      "ped_date_start": "2025-06-09",
+      "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": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_date_start": "2025-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": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_date_start": "2025-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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
+      "ped_date_start": "2025-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": "2023-11-01",
-      "ped_date_end": "2023-11-01",
+      "ped_date_start": "2025-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": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2053,
      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
-      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "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
    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2022-12-24",
-      "ped_date_end": "2022-12-24",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "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_date_start": "2023-04-09",
-      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2023-05-28",
-      "ped_date_end": "2023-05-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2062,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2023-05-29",
-      "ped_date_end": "2023-05-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2063,
-      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2066,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2023-11-01",
-      "ped_date_end": "2023-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2067,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2068,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2069,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2070,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2071,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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,
@@ -35,17 +38,17 @@
      "pop_day_night_end_time": "16:29:00",
      "pop_price_night": 0,
      "pop_min_time": 15,
-      "pop_max_time": 300,
-      "pop_min_price": 0,
+      "pop_max_time": 360,
+      "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,18 +103,11 @@
      "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": [
    {
-      "pye_id": 8,
+      "pye_id": 2,
      "pye_label": "Whole year",
      "pye_start_month": 1,
      "pye_start_day": 1,
@@ -472,341 +468,178 @@
    }
  ],
  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_date_start": "2025-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": "2022-12-24",
-      "ped_date_end": "2022-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_date_start": "2025-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": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_date_start": "2025-04-18",
+      "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": "2023-04-09",
-      "ped_date_end": "2023-04-09",
+      "ped_date_start": "2025-04-20",
+      "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": "2023-04-10",
-      "ped_date_end": "2023-04-10",
+      "ped_date_start": "2025-04-21",
+      "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": "2023-05-28",
-      "ped_date_end": "2023-05-28",
+      "ped_date_start": "2025-06-08",
+      "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": "2023-05-29",
-      "ped_date_end": "2023-05-29",
+      "ped_date_start": "2025-06-09",
+      "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": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_date_start": "2025-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": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_date_start": "2025-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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
+      "ped_date_start": "2025-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": "2023-11-01",
-      "ped_date_end": "2023-11-01",
+      "ped_date_start": "2025-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": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2053,
      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
-      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "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
    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2022-12-24",
-      "ped_date_end": "2022-12-24",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "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_date_start": "2023-04-09",
-      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2023-05-28",
-      "ped_date_end": "2023-05-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2062,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2023-05-29",
-      "ped_date_end": "2023-05-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2063,
-      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2066,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2023-11-01",
-      "ped_date_end": "2023-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2067,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2068,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2069,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2070,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2071,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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,
@@ -35,17 +38,18 @@
      "pop_day_night_end_time": "16:30:00",
      "pop_price_night": 0,
      "pop_min_time": 15,
-      "pop_max_time": 600,
-      "pop_min_price": 0,
+      "pop_max_time": 240,
+      "pop_min_price": 163,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 0
+      "pop_daily_card_price": 2600,
+      "pop_multi_hour_price": 0
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1052,
      "pra_payment_unit_id": 1,
-      "pra_price": 600
+      "pra_price": 650
    }
  ],
  "Duration": [
@@ -63,6 +67,11 @@
      "pun_id": 4,
      "pun_label": "1 min",
      "pun_duration": 1
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "Voller Tag",
+      "pun_duration": 1441
    }
  ],
  "WeekDaysWorktime": [
@@ -104,7 +113,7 @@
  ],
  "PeriodYear": [
    {
-      "pye_id": 8,
+      "pye_id": 2,
      "pye_label": "Whole year",
      "pye_start_month": 1,
      "pye_start_day": 1,
@@ -166,6 +175,22 @@
      "pye_start_day": 1,
      "pye_end_month": 12,
      "pye_end_day": 31
+    },
+    {
+      "pye_id": 17,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 18,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
    }
  ],
  "SpecialDaysWorktime": [
@@ -462,344 +487,320 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2271,
+      "pedwt_period_exc_day_id": 2072,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2272,
+      "pedwt_period_exc_day_id": 2073,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2273,
+      "pedwt_period_exc_day_id": 2074,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2274,
+      "pedwt_period_exc_day_id": 2075,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2275,
+      "pedwt_period_exc_day_id": 2076,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2276,
+      "pedwt_period_exc_day_id": 2077,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2277,
+      "pedwt_period_exc_day_id": 2078,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2278,
+      "pedwt_period_exc_day_id": 2079,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2279,
+      "pedwt_period_exc_day_id": 2080,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2280,
+      "pedwt_period_exc_day_id": 2081,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2281,
+      "pedwt_period_exc_day_id": 2082,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2282,
+      "pedwt_period_exc_day_id": 2083,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2283,
+      "pedwt_period_exc_day_id": 2084,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2284,
+      "pedwt_period_exc_day_id": 2085,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2285,
+      "pedwt_period_exc_day_id": 2086,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2286,
+      "pedwt_period_exc_day_id": 2087,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2287,
+      "pedwt_period_exc_day_id": 2088,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2288,
+      "pedwt_period_exc_day_id": 2089,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2289,
+      "pedwt_period_exc_day_id": 2090,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2290,
+      "pedwt_period_exc_day_id": 2091,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
    }
  ],
  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_date_start": "2025-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": "2022-12-24",
-      "ped_date_end": "2022-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_date_start": "2025-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": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_date_start": "2025-04-18",
+      "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": "2023-04-09",
-      "ped_date_end": "2023-04-09",
+      "ped_date_start": "2025-04-20",
+      "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": "2023-04-10",
-      "ped_date_end": "2023-04-10",
+      "ped_date_start": "2025-04-21",
+      "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": "2023-05-28",
-      "ped_date_end": "2023-05-28",
+      "ped_date_start": "2025-06-08",
+      "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": "2023-05-29",
-      "ped_date_end": "2023-05-29",
+      "ped_date_start": "2025-06-09",
+      "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": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_date_start": "2025-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": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_date_start": "2025-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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
+      "ped_date_start": "2025-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": "2023-11-01",
-      "ped_date_end": "2023-11-01",
+      "ped_date_start": "2025-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": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "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",
-      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2022-12-25",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2053,
      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2022-12-26",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
-      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2022-10-23",
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "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
    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2022-12-24",
-      "ped_date_end": "2022-12-24",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
-      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2023-01-01",
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2023-04-07",
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "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_date_start": "2023-04-09",
-      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2023-05-28",
-      "ped_date_end": "2023-05-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2062,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2023-05-29",
-      "ped_date_end": "2023-05-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2063,
-      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2023-03-15",
-      "ped_date_end": "2023-03-15",
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2023-05-01",
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "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": "2023-08-20",
-      "ped_date_end": "2023-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2066,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2023-11-01",
-      "ped_date_end": "2023-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2067,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2068,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2069,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2070,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2071,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
    }
  ]
 }
+
+
+
+
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -0,0 +1,813 @@
+{
+  "Project" :   "Szeged Zone 5",
+  "Version" :   "1.0.1",
+  "Info"    :   "6723",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "Ft",
+      "pcu_major": "HUF",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1081,
+      "pop_label": "Zone Gelb Mars 5",
+      "pop_payment_method_id": 3,
+      "pop_day_end_time": "15:08:00",
+      "pop_day_night_end_time": "15:08:00",
+      "pop_price_night": 0,
+      "pop_min_time": 15,
+      "pop_max_time": 360,
+      "pop_min_price": 90,
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 2160,
+      "pop_multi_hour_price": 0
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1081,
+      "pra_payment_unit_id": 1,
+      "pra_price": 360
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "1h",
+      "pun_duration": 60
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "15 min",
+      "pun_duration": 15
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "1 min",
+      "pun_duration": 1
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "Voller Tag",
+      "pun_duration": 1441
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 632,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 633,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 634,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 635,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 636,
+      "pwd_period_week_day_id": 37,
+      "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": [
+    {
+      "pye_id": 2,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 9,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 10,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 11,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 12,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 13,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 14,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 15,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 17,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 18,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ],
+  "SpecialDaysWorktime": [
+    {
+      "pedwt_id": 2156,
+      "pedwt_period_exc_day_id": 2024,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2158,
+      "pedwt_period_exc_day_id": 2025,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2160,
+      "pedwt_period_exc_day_id": 2026,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2162,
+      "pedwt_period_exc_day_id": 2027,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2164,
+      "pedwt_period_exc_day_id": 2028,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2170,
+      "pedwt_period_exc_day_id": 2030,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2172,
+      "pedwt_period_exc_day_id": 2032,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2174,
+      "pedwt_period_exc_day_id": 11,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2175,
+      "pedwt_period_exc_day_id": 13,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2178,
+      "pedwt_period_exc_day_id": 2022,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2179,
+      "pedwt_period_exc_day_id": 14,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2184,
+      "pedwt_period_exc_day_id": 2021,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2188,
+      "pedwt_period_exc_day_id": 2031,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2189,
+      "pedwt_period_exc_day_id": 2029,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2194,
+      "pedwt_period_exc_day_id": 2034,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2200,
+      "pedwt_period_exc_day_id": 2037,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2202,
+      "pedwt_period_exc_day_id": 2038,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2226,
+      "pedwt_period_exc_day_id": 2016,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2245,
+      "pedwt_period_exc_day_id": 2035,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2246,
+      "pedwt_period_exc_day_id": 2036,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2249,
+      "pedwt_period_exc_day_id": 2050,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "16:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2250,
+      "pedwt_period_exc_day_id": 2051,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "16:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2251,
+      "pedwt_period_exc_day_id": 2052,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2252,
+      "pedwt_period_exc_day_id": 2053,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2253,
+      "pedwt_period_exc_day_id": 2054,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2254,
+      "pedwt_period_exc_day_id": 2055,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2255,
+      "pedwt_period_exc_day_id": 2056,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2256,
+      "pedwt_period_exc_day_id": 2057,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2257,
+      "pedwt_period_exc_day_id": 2058,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2258,
+      "pedwt_period_exc_day_id": 2059,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2259,
+      "pedwt_period_exc_day_id": 2060,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2260,
+      "pedwt_period_exc_day_id": 2061,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2261,
+      "pedwt_period_exc_day_id": 2062,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2262,
+      "pedwt_period_exc_day_id": 2063,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2263,
+      "pedwt_period_exc_day_id": 2064,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2264,
+      "pedwt_period_exc_day_id": 2065,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2265,
+      "pedwt_period_exc_day_id": 2066,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2266,
+      "pedwt_period_exc_day_id": 2067,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2267,
+      "pedwt_period_exc_day_id": 2068,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2268,
+      "pedwt_period_exc_day_id": 2069,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2269,
+      "pedwt_period_exc_day_id": 2070,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2270,
+      "pedwt_period_exc_day_id": 2071,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2271,
+      "pedwt_period_exc_day_id": 2072,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2272,
+      "pedwt_period_exc_day_id": 2073,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2273,
+      "pedwt_period_exc_day_id": 2074,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2274,
+      "pedwt_period_exc_day_id": 2075,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2275,
+      "pedwt_period_exc_day_id": 2076,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2276,
+      "pedwt_period_exc_day_id": 2077,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2277,
+      "pedwt_period_exc_day_id": 2078,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2278,
+      "pedwt_period_exc_day_id": 2079,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2279,
+      "pedwt_period_exc_day_id": 2080,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2280,
+      "pedwt_period_exc_day_id": 2081,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2281,
+      "pedwt_period_exc_day_id": 2082,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2282,
+      "pedwt_period_exc_day_id": 2083,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2283,
+      "pedwt_period_exc_day_id": 2084,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2284,
+      "pedwt_period_exc_day_id": 2085,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2285,
+      "pedwt_period_exc_day_id": 2086,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2286,
+      "pedwt_period_exc_day_id": 2087,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2287,
+      "pedwt_period_exc_day_id": 2088,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2288,
+      "pedwt_period_exc_day_id": 2089,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2289,
+      "pedwt_period_exc_day_id": 2090,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2290,
+      "pedwt_period_exc_day_id": 2091,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    }
+  ],
+  "SpecialDays": [
+    {
+      "ped_id": 14,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2022,
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-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": "2025-04-18",
+      "ped_date_end": "2025-04-18",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2025,
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2026,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2027,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2028,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2029,
+      "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": 2030,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-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": "2025-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": "2025-11-01",
+      "ped_date_end": "2025-11-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2052,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2053,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "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
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas (Sunday)",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    }
+  ]
+}
+
+
+
+
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -0,0 +1,813 @@
+{
+  "Project" :   "Szeged Zone 6",
+  "Version" :   "1.0.1",
+  "Info"    :   "6722",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "Ft",
+      "pcu_major": "HUF",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1082,
+      "pop_label": "Zone Grün Mars 6",
+      "pop_payment_method_id": 3,
+      "pop_day_end_time": "15:13:00",
+      "pop_day_night_end_time": "15:13:00",
+      "pop_price_night": 0,
+      "pop_min_time": 15,
+      "pop_max_time": 240,
+      "pop_min_price": 163,
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 2600,
+      "pop_multi_hour_price": 0
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1082,
+      "pra_payment_unit_id": 1,
+      "pra_price": 650
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "1h",
+      "pun_duration": 60
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "15 min",
+      "pun_duration": 15
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "1 min",
+      "pun_duration": 1
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "Voller Tag",
+      "pun_duration": 1441
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 632,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 633,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 634,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 635,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 636,
+      "pwd_period_week_day_id": 37,
+      "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": [
+    {
+      "pye_id": 2,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 9,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 10,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 11,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 12,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 13,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 14,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 15,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 17,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 18,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ],
+  "SpecialDaysWorktime": [
+    {
+      "pedwt_id": 2156,
+      "pedwt_period_exc_day_id": 2024,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2158,
+      "pedwt_period_exc_day_id": 2025,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2160,
+      "pedwt_period_exc_day_id": 2026,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2162,
+      "pedwt_period_exc_day_id": 2027,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2164,
+      "pedwt_period_exc_day_id": 2028,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2170,
+      "pedwt_period_exc_day_id": 2030,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2172,
+      "pedwt_period_exc_day_id": 2032,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2174,
+      "pedwt_period_exc_day_id": 11,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2175,
+      "pedwt_period_exc_day_id": 13,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2178,
+      "pedwt_period_exc_day_id": 2022,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2179,
+      "pedwt_period_exc_day_id": 14,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2184,
+      "pedwt_period_exc_day_id": 2021,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2188,
+      "pedwt_period_exc_day_id": 2031,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2189,
+      "pedwt_period_exc_day_id": 2029,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2194,
+      "pedwt_period_exc_day_id": 2034,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2200,
+      "pedwt_period_exc_day_id": 2037,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2202,
+      "pedwt_period_exc_day_id": 2038,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2226,
+      "pedwt_period_exc_day_id": 2016,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2245,
+      "pedwt_period_exc_day_id": 2035,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2246,
+      "pedwt_period_exc_day_id": 2036,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2249,
+      "pedwt_period_exc_day_id": 2050,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "16:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2250,
+      "pedwt_period_exc_day_id": 2051,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "16:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2251,
+      "pedwt_period_exc_day_id": 2052,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2252,
+      "pedwt_period_exc_day_id": 2053,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2253,
+      "pedwt_period_exc_day_id": 2054,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2254,
+      "pedwt_period_exc_day_id": 2055,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2255,
+      "pedwt_period_exc_day_id": 2056,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2256,
+      "pedwt_period_exc_day_id": 2057,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2257,
+      "pedwt_period_exc_day_id": 2058,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2258,
+      "pedwt_period_exc_day_id": 2059,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2259,
+      "pedwt_period_exc_day_id": 2060,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2260,
+      "pedwt_period_exc_day_id": 2061,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2261,
+      "pedwt_period_exc_day_id": 2062,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2262,
+      "pedwt_period_exc_day_id": 2063,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2263,
+      "pedwt_period_exc_day_id": 2064,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2264,
+      "pedwt_period_exc_day_id": 2065,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2265,
+      "pedwt_period_exc_day_id": 2066,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2266,
+      "pedwt_period_exc_day_id": 2067,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2267,
+      "pedwt_period_exc_day_id": 2068,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2268,
+      "pedwt_period_exc_day_id": 2069,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2269,
+      "pedwt_period_exc_day_id": 2070,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2270,
+      "pedwt_period_exc_day_id": 2071,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2271,
+      "pedwt_period_exc_day_id": 2072,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2272,
+      "pedwt_period_exc_day_id": 2073,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2273,
+      "pedwt_period_exc_day_id": 2074,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2274,
+      "pedwt_period_exc_day_id": 2075,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2275,
+      "pedwt_period_exc_day_id": 2076,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2276,
+      "pedwt_period_exc_day_id": 2077,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2277,
+      "pedwt_period_exc_day_id": 2078,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2278,
+      "pedwt_period_exc_day_id": 2079,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2279,
+      "pedwt_period_exc_day_id": 2080,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2280,
+      "pedwt_period_exc_day_id": 2081,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2281,
+      "pedwt_period_exc_day_id": 2082,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2282,
+      "pedwt_period_exc_day_id": 2083,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2283,
+      "pedwt_period_exc_day_id": 2084,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2284,
+      "pedwt_period_exc_day_id": 2085,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2285,
+      "pedwt_period_exc_day_id": 2086,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2286,
+      "pedwt_period_exc_day_id": 2087,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2287,
+      "pedwt_period_exc_day_id": 2088,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2288,
+      "pedwt_period_exc_day_id": 2089,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2289,
+      "pedwt_period_exc_day_id": 2090,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2290,
+      "pedwt_period_exc_day_id": 2091,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    }
+  ],
+  "SpecialDays": [
+   {
+      "ped_id": 14,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2022,
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-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": "2025-04-18",
+      "ped_date_end": "2025-04-18",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2025,
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2026,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2027,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2028,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2029,
+      "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": 2030,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-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": "2025-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": "2025-11-01",
+      "ped_date_end": "2025-11-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2052,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2053,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "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
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas (Sunday)",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    }
+  ]
+}
+
+
+
+
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -1,25 +1,18 @@
-# opkg prefix will be added inside evaluating script
-#
-# package manipulation commands without package:
-# update, upgrade, clean
-#
-# informational commands without package:
-# list, list-installed, list-upgradable
-#
-# ptu5-atb-apinfo
-# ptu5-scripts
-# ptu5-atb-apinfo
-# atb-plugin-calculateprice-prm
-# atb-plugin-cc-tcpzvt
-# atbqt
-# list-installed
-# --force-reinstall install ptu5-atb-apinfo
-# --force-reinstall install atbqt
-# update
-opkg update
-# opkg --noaction install atbqt
-# opkg install atbqt
-#
-#
-#
-
+###############################################################################
+#                          !!! NOTE !!!
+###############################################################################
+# opkg-commands added to this file will be executed by ATBUpdateTool.          
+###############################################################################
+##
+# opkg update
+# opkg install prepare-update
+# download packages
+# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
+# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
+# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+# opkg --cache /var/cache/opkg --download-only upgrade atbqt
+# install packages
+# opkg --cache /var/cache/opkg upgrade tariff-config-281
+# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
+# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+# opkg --cache /var/cache/opkg upgrade atbqt
--- a/opt/app/ATBAPP/tariff.current
+++ b/opt/app/ATBAPP/tariff.current
@@ -1 +0,0 @@
-"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"
				`@@ -1 +0,0 @@`
				`"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"`