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

restore tariff files after special day at 17th of May
comment all opkg lines
2025-05-22 11:06:44 +02:00 · 2025-05-20 10:09:18 +02:00 · 2025-05-12 09:48:36 +02:00 · 2025-05-12 08:54:33 +02:00 · 2025-01-07 10:46:48 +01:00 · 2024-12-16 15:50:08 +01:00
44 changed files with 2269 additions and 1701 deletions
--- a/.githooks/post-checkout
+++ b/.githooks/post-checkout
@@ -1,73 +1,60 @@
 #!/bin/bash -
-# echo "POST-CHECKOUT $PWD" > "/tmp/post_checkout.txt"
+# echo "POST-CHECKOUT"
 # echo "PREV-HEAD=$1"
 # 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"
            
 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.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
-                    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
+    # 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
-            fi
-            echo "$line" >> $CHECKOUT_HISTORY_FILE
-        else
-            echo "Found existing line: $line. Do nothing"
+            done
        fi
-        # echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
-    else
-        echo "*******************************************************"
-        echo "     $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!!         "
-        echo "*******************************************************"
    fi
 }

--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,16 @@
-# First, ignore everything
 *
-# Now, whitelist anything that's a directory
-!*/
-# And all the file types you're interested in
-!.gitignore
-!.githooks/post-merge
-!.githooks/post-checkout
-!**/.gitignore
-!**/.githooks/post-merge
-!**/.githooks/post-checkout

 ## Except
-!etc/atb/*
-!etc/psa_config/*
-!etc/psa_update/*
-!etc/psa_tariff/*
-!etc/dc/*.hex
-!etc/dc/*.bin
-!*/etc/*.ini
-!*/etc/atb/*
-!*/etc/psa_config/*
-!*/etc/psa_update/*
-!*/etc/psa_tariff/*
-!*/etc/dc/*.hex
-!*/etc/dc/*.bin
+!**/.gitignore
+!**/.githooks/post-merge
+!/etc/*.ini
+!/etc/atb/*.ini
+!/etc/psa_config/*
+!/etc/psa_update/*
+!/etc/psa_tariff/*
+!/etc/dc/dc2c.hex
+
+!/opt/app/ATBAPP/*.ini
+!/opt/app/sysconfig/*.ini
+!/opt/app/ISMASMgr/*.ini

--- 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.4.33.bin
+++ b/etc/dc/dc2c.4.33.bin
--- a/etc/dc/dc2c.4.35.bin
+++ b/etc/dc/dc2c.4.35.bin
--- a/etc/dc/dc2c.bin
+++ b/etc/dc/dc2c.bin
@@ -1 +0,0 @@
-dc2c.4.35.bin
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,17 +1,16 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
-"version":"22.03.2023 11:59 01.02.03",
+"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)":[760,380,190,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":378
+"ExchangeRate":365,
 "TokenChannel":1,
 "BillValues(7..0)":[0,0,0,0,0,0,0,0],
 "LocalTaxRate":20,
 "ForeignTaxRate":19,
 "Surcharge":0,	
-"Discount":0,	
-
+"Discount":0
 }

--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
-"custNum":281,
-"machNum":997,
-"borough":1,
-"zone":1,
-"alias":997,
-"location":"ATB Thomas' office"
-}
-
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,25 +0,0 @@
-{
-"title":"DC2C_device",
-"project":"DBM Szeged",
-"Version":"13.02.2023 12:20 00001",
-"printer":1,
-"coinChk":1,
-"mifRd":1,
-"solarPwr":1,
-"modem":1,
-"creditCard":0,
-"escrow":1,
-"RejMotor":1,
-"shutter":1,
-"billRd":1,
-"vaultLock":1,
-"autoAlarm":1,
-"autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
-"CBwarnLev":1600,
-"CBerrLev":1900
-
-}
-
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,40 +0,0 @@
-{
-"title":"DC2C_pri01",
-"project":"DBM Szeged coins hour",
-"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":"cash short term",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,39 +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",
-"feed":"nl",
-"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,9 +0,0 @@
-{
-"title":"DC2C_pri04",
-"project":"empty template",
-"issued":"09.06.2023 01.01",
-"styl":"size 10"
-
-}
-
-
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,40 +0,0 @@
-{
-"title":"DC2C_pri05",
-"project":"DBM Szeged CC hour",
-"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":"card pay short",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri06",
-"project":"DBM Szeged",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,22 +0,0 @@
-{
-"title":"DC2C_pri07",
-"project":"DBM Szeged",
-"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_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,8 +0,0 @@
-{
-"title":"DC2C_pri08",
-"project":"empty template",
-"issued":"09.06.2023 01.01",
-"styl":"size 10"
-}
-
-
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@@ -1,40 +0,0 @@
-{
-"title":"DC2C_pri09",
-"project":"DBM Szeged cash day",
-"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":"Cash day ticket",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri10",
-"project":"DBM Szeged",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@@ -1,22 +0,0 @@
-{
-"title":"DC2C_pri11",
-"project":"DBM Szeged",
-"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_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@@ -1,8 +0,0 @@
-{
-"title":"DC2C_pri12",
-"project":"empty template",
-"issued":"09.06.2023 01.01",
-"styl":"size 10"
-}
-
-
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -1,40 +0,0 @@
-{
-"title":"DC2C_pri13",
-"project":"DBM Szeged card day",
-"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":"card pay day",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri14",
-"project":"DBM Szeged",
-"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",
-"feed":"nl",
-"feed":"nl",
-}
-
-
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -1,22 +0,0 @@
-{
-"title":"DC2C_pri15",
-"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_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -1,8 +0,0 @@
-{
-"title":"DC2C_pri16",
-"project":"empty template",
-"issued":"09.06.2023 01.01",
-"styl":"size 10"
-}
-
-
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -1,32 +0,0 @@
-{
-"title":"DC2C_pri17",
-"styl":"align l",
-"feed":"margin01",
-"feed":"nl",
-"feed":"nl",
-"feed":"nl",
-"feed":"part",
-"text":"Utazzon tovább "
-"text":"közösségi "
-"text":"közle-"
-"text":"kedéssel! Ehhez a "
-"text":"leválasztható"
-"text":" szelvényhez a közösségi "
-"text":"közle- "
-"text":"kedési járművek (villa"
-"text":"mos, helyi- jár"
-"text":"atos busz,troli"
-"text":"busz,vasút",
-"text":"villa-mos) ba",
-"text":"nkkártyás fedélzeti "
-"text":"jegy-  kiadó automatá"
-"text":"iból,illetve"
-"text":" a jegy- árusí"
-"text":"tó applikációk"
-"text":"ból Közte"
-"text":"rületi"
-"text":"fizető ",
-"text":"parkolás na"
-"text":"pijegyhez vál-   tott "
-
-
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -1,21 +0,0 @@
-"title":"DC2C_pri18",
-"styl":"align l",
-"feed":"margin01",
-"text":"fizető ",
-"text":"parkolás na"
-"text":"pijegyhez vál-   tott "
-"text":"kiegészítő "
-"text":"Körút napijegy"
-"text":" vá-sárolható "
-"text":"(ára 440,-Ft)"
-"text":"1 fő részé-re."
-"text":" Ez a napijegy "
-"text":"Szeged, Nagy- körút"
-"text":"ig bezárólag illet"
-"text":"ve a Nagy- kör"
-"text":"úton túli első "
-"text":"megálló"
-"text":"helytől"
-"text":"    agy megálló"
-"text":"helyig kor"
-"text":"látlan uta-"
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -1,31 +0,0 @@
-{
-"title":"DC2C_pri19",
-"styl":"align l",
-"feed":"margin01",
-"text":"vagy megálló"
-"text":"helyig kor"
-"text":"látlan uta-"
-"text":"zás"
-"text":"ra érvényes a "
-"text":"parkolás nap-"
-"text":"   ján."
-"text":"Ellenőrz"
-"text":"éshez ezt a szelvényt"
-"text":"és az utazásra "
-"text":"jogosító papírt" 
-"feed":"nl",
-"text":"vagy elektronikus "
-"text":"napijegyet "
-"feed":"nl",
-"text":"együttesen kell "
-"text":"bemutatni."
-"feed":"nl",
-"text":"Rendszám:"
-"vari":"Dynamic01",
-"text":"Parkolás kezdete:"
-"feed":"nl",
-"text":"(Kék Zóna)"
-"feed":"nl",
-"vari":"date us",	
-"vari":"time short",
-"feed":"eject",
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -1,9 +0,0 @@
-{
-"title":"DC2C_pri20",
-"project":"empty template",
-"issued":"09.06.2023 01.01",
-"styl":"size 10"
-
-}
-
-
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -0,0 +1,27 @@
+"title":"DC2C_pri22",
+"project":"DBM Szeged StartParking",
+"styl":"size 00",
+"text":"Automata száma: ",
+"vari":"manu",
+"feed":"nl",
+"text":"Igazoló sz. sorsz: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Az igazolo szelvény",
+"feed":"nl"
+"text":"a nyugtával együtt érvényes. ",
+"feed":"nl",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"text":"Zrínyi utca 4-8",
+"feed":"nl",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"feed":"nl",
+"feed":"nl"
+}
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -0,0 +1,29 @@
+{
+"title":"DC2C_pri25",
+"project":"DBM Szeged StopParking",
+"text":"érvényes.",
+"feed":"nl",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:"
+"feed":"nl",
+"text":"    Zrínyi utca 4-8",
+"styl":"size 00",
+"feed":"nl",
+"text":"  H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"   Tel: (80) 820-500",
+"feed":"nl",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"   6720 Szeged ",
+"feed":"nl",
+"text":" Zrínyi utca 4-8.",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06",
+"feed":"nl",
+"text":"  A jegy ára az ÁFA-t",
+"feed":"nl",
+"text":"     tartalmazza!",
+"feed":"nl"
+}
--- a/etc/psa_config/DC2C_print28.json
+++ b/etc/psa_config/DC2C_print28.json
@@ -0,0 +1,34 @@
+{
+"title":"DC2C_pri28",
+"project":"DBM Szeged Error",
+"styl":"size 00",
+"text":" Üf. szolg nyitvatartás:",
+"feed":"nl",
+"text":"  Zrínyi utca 4-8 ",
+"feed":"nl",
+"text":"  H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"   Tel: (80) 820-500",
+"feed":"nl",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"     6720",
+"text":" Szeged ",
+"feed":"nl",
+"text":"  Zrínyi utca 4-8",
+"feed":"nl",
+"text":"Adósz: ", 
+"text":"11092612-2-06", 
+"feed":"nl",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel.",
+"feed":"nl",
+"text":"Használja bankkártyáját",
+"feed":"nl",
+"text":"  automatáinknál",
+"text":" is!",
+"feed":"nl",
+"feed":"eject"
+
+}
--- a/etc/psa_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_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_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": 2400
+      "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
@@ -3,18 +3,16 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-# opkg prefix will be added inside evaluating script
-#
-# 2023-06-30: test-1
-# 2023-06-30: test-2
-# 2023-06-30: return to usual workflow
-# 2023-06-30: test update atbqt in Szeged
-# 2023-06-30: 2. test update atbqt in Szeged
-# 2023-06-30: 4. test update atbqt in Szeged
-opkg info ptu5-gitinstaller
-opkg info atbqt
-opkg update
-opkg install ptu5-gitinstaller
-opkg install atbqt
-opkg info ptu5-gitinstaller
-opkg info atbqt
+##
+# 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"
Author	SHA1	Message	Date
Gerhard Hoffmann	6f3a997762	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:06:44 +02:00
Gerhard Hoffmann	d54b6da3c5	restore tariff files after special day at 17th of May	2025-05-20 10:09:18 +02:00
Gerhard Hoffmann	27fdf1c51c	comment all opkg lines	2025-05-12 09:48:36 +02:00
Gerhard Hoffmann	43e81f7d37	special saturday 2025/05/17	2025-05-12 08:54:33 +02:00
Gerhard Hoffmann	da069ba4ea	set service fridays: 8-18	2025-01-07 10:46:48 +01:00
Gerhard Hoffmann	1fc3c49288	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:50:08 +01:00
Gerhard Hoffmann	3f9bb85be9	additional holidays 2024/2025	2024-12-03 13:49:08 +01:00
Gerhard Hoffmann	951c42123d	Adapt for Saturday 07/12	2024-12-02 17:12:18 +01:00
Gerhard Hoffmann	7abf1ddefe	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:32:42 +01:00
Gerhard Hoffmann	8888fcd395	Revert to original versions	2024-08-08 12:24:01 +02:00
Gerhard Hoffmann	a481f892b6	set 8:00-18:00 for 03.08	2024-08-01 12:39:15 +02:00
Gerhard Hoffmann	db5e5f9ecc	Activate opkg_commands	2024-07-15 08:55:18 +02:00
Gerhard Hoffmann	215863270c	opkg: none	2024-07-08 13:38:30 +02:00
Gerhard Hoffmann	cfc571f591	Set ex.rate to 365.	2024-07-05 10:01:02 +02:00
Gnemeth	1953ead089	euro exchange rate update	2024-06-30 19:10:15 +02:00
Gerhard Hoffmann	4a9818c0fb	re-commit: change of ISMAS settings	2024-06-25 08:37:22 +02:00
Gerhard Hoffmann	904024453f	ZoneId in tariff-files	2024-06-24 11:33:17 +02:00
Siegfried Siegert	fa2a3e336e	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:12:12 +02:00
Gerhard Hoffmann	0cd48239af	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:33:54 +02:00
Gerhard Hoffmann	41e59fceb0	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:51:28 +02:00
Gerhard Hoffmann	12e266fbdf	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:11:20 +02:00
Gerhard Hoffmann	1ebe2a16b9	Use empty file.	2024-04-18 16:10:31 +02:00
Gerhard Hoffmann	d6d86bd5f1	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:10:06 +01:00
Gerhard Hoffmann	d9b5661a0f	added empty lines to restart download	2024-03-28 11:57:38 +01:00
Gerhard Hoffmann	baf0dba915	even remove opkg update	2024-03-26 10:06:38 +01:00
Gerhard Hoffmann	2e0e69d3ec	only install prepare-update script	2024-03-26 09:52:01 +01:00
Gerhard Hoffmann	79564c1eff	Removed all holidays except thos for 2024	2024-03-26 09:40:36 +01:00
Gerhard Hoffmann	d25dda1187	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:30:48 +01:00
Gerhard Hoffmann	b926387993	tariff01.json: set min-price: 165 / 4 -> 45 tariff02.json: set min-price: 260 / 4 -> 65 tariff03.json: set min-price: 360 / 4 -> 90 tariff04.json: set min-price: 650 / 4 -> 165 tariff05.json: set min-price: 360 / 4 -> 90 tariff06.json: set min-price: 650 / 4 -> 165	2024-02-15 14:27:14 +01:00
Gerhard Hoffmann	9034218e2d	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:45:36 +01:00
Gerhard Hoffmann	8b8ba69a92	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:43:58 +01:00
Gerhard Hoffmann	c2206fdb49	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 10:59:41 +01:00
Gerhard Hoffmann	0f5fbb497c	Update exchange rate to 352.	2023-12-31 08:17:33 +01:00
Gerhard Hoffmann	4377307430	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:08:30 +01:00
Gerhard Hoffmann	4f660ee640	switch back to previous prices until 01.01.2024	2023-12-23 08:34:00 +01:00
Gerhard Hoffmann	57dd5a5364	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:25:18 +01:00
Gerhard Hoffmann	d806c84f95	Remove dc-files (to be used later)	2023-12-20 13:56:20 +01:00
Gerhard Hoffmann	520daa4d0c	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:51:39 +01:00
Gerhard Hoffmann	d8ec03f03f	Reset to previous prices keeping current holidays	2023-12-20 12:51:29 +01:00
Gerhard Hoffmann	34d3201a29	Updated to use new prices.	2023-12-19 16:49:38 +01:00
Gerhard Hoffmann	242de9080f	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:57:41 +01:00
Gerhard Hoffmann	4c219d4aad	delete all json files	2023-12-19 13:54:39 +01:00
Gerhard Hoffmann	020e8eb32b	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:57:04 +01:00
Gerhard Hoffmann	717239b1e6	switch back to previous prices, but keeping current holidays	2023-12-19 11:17:56 +01:00
Gerhard Hoffmann	4cf3a97576	tariff01: new price: 165 new daily price: 990 tariff02: new price: 260 new daily price: 1560 tariff03: new price: 360 new daily price: 2160 tariff04: new price: 650 Set new holidays starting from Dec. 2023.	2023-12-18 14:43:41 +01:00
Gerhard Hoffmann	fc69c5259f	Fixed wrong comma after exchange rate	2023-10-11 14:14:22 +02:00
Gerhard Hoffmann	08a7586026	set exchange rate to 360	2023-10-10 16:30:17 +02:00
Gerhard Hoffmann	98a1322722	Install ptu5-gitinstaller, atbupdatetool and atbqt.# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,	2023-08-11 12:41:50 +02:00
Gerhard Hoffmann	32720ad250	remove absolete file	2023-08-11 12:41:23 +02:00
Gerhard Hoffmann	77045d85c0	set daily cardprice to 2400	2023-08-03 15:44:26 +02:00
Gerhard Hoffmann	4384d17c80	add json files for zones 5 and 6	2023-08-03 15:31:46 +02:00
Gerhard Hoffmann	467cdeee18	use same tariff-file as branch for zone4	2023-07-26 14:48:38 +02:00
Gerhard Hoffmann	503a8a5f19	Set max_time to 240	2023-07-25 10:15:36 +02:00
Gerhard Hoffmann	b82c876ece	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:31 +02:00
Gerhard Hoffmann	5257ec6b2b	Update json-printer-files (provided by Dennis)	2023-07-06 15:11:43 +02:00
Gerhard Hoffmann	4fe11fae51	remove handling og checkout_history file	2023-07-04 14:01:10 +02:00
Gerhard Hoffmann	0133e505a1	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:36 +02:00
Gerhard Hoffmann	52b5e76257	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:14:50 +02:00
Siegfried Siegert	90e66b5be6	prevent any opkg command	2023-07-02 16:30:11 +02:00
Gerhard Hoffmann	0a16863267	return to normal workflow after testing	2023-06-30 10:51:49 +02:00
Gerhard Hoffmann	62b617e136	Provide opkg commands for zone3	2023-06-29 14:31:34 +02:00
Gerhard Hoffmann	835cbeae0b	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:23:52 +02:00
Gerhard Hoffmann	423c0bec8a	Adding device-controller firmware version 4.35	2023-06-27 16:23:16 +02:00
Gerhard Hoffmann	a6cec85e46	remove obsolete file	2023-06-27 16:22:42 +02:00
Gerhard Hoffmann	8592f044d8	sync tariff-files with zg1/zone1	2023-06-27 14:42:01 +02:00
Gerhard Hoffmann	36894ae00b	remove unued tariff-files	2023-06-27 14:40:27 +02:00
Gerhard Hoffmann	9519a6555e	install same post-merge-hook as in branch zg1/zone1	2023-06-27 14:36:36 +02:00
Gerhard Hoffmann	28f597898e	install same post-checkout-hook as in branch zg1/zone1	2023-06-27 14:35:27 +02:00
Gerhard Hoffmann	3643c06c19	Set daily_card_price to 2400 for zone4	2023-06-27 14:20:58 +02:00
Gerhard Hoffmann	98a69bc779	check for existence of opkg_commands-file (2)	2023-06-05 15:58:27 +02:00
Gerhard Hoffmann	14b49b4b21	check for existence of opkg_commands-file	2023-06-05 15:52:45 +02:00
Gerhard Hoffmann	a08d654c26	adding post-checkout hook ad for zone1	2023-06-05 15:46:58 +02:00
Gerhard Hoffmann	101d6b8071	Add device controller version 4.22	2023-05-31 08:59:01 +02:00
Gerhard Hoffmann	4371fdd8f1	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:21:30 +02:00
Gerhard Hoffmann	f821294816	Add DC-version 4.21	2023-05-24 16:21:24 +02:00
Gerhard Hoffmann	a06c333894	Updating print templates as of May 11, 2023.	2023-05-18 12:16:32 +02:00
Gerhard Hoffmann	bddb6a1a84	Add tariff-file for zone 4	2023-05-04 10:56:09 +02:00
Gerhard Hoffmann	8dea72e22b	Update as for branch zg1/zone1	2023-04-25 11:54:03 +02:00
Gerhard Hoffmann	10f95e328a	Removed *.ini-Files.	2023-03-31 11:47:16 +02:00
Gerhard Hoffmann	fcd6301141	Add .gitignore	2023-03-31 09:51:54 +02:00
Gerhard Hoffmann	bfff914e1d	Add handling for binary dc-files	2023-03-30 12:49:45 +02:00
				`@@ -1 +0,0 @@`
				`"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"`