From 794c26ee97e373cae80cda8b387692c46a86cd84 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 4 Jul 2023 12:14:13 +0200 Subject: [PATCH 01/20] use opgk_commands-file in repository rather than in global file-system --- .githooks/post-checkout | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 8b86380..66c1399 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -1,13 +1,13 @@ #!/bin/bash - -# echo "POST-CHECKOUT" +# echo "POST-CHECKOUT $PWD" > "/tmp/post_checkout.txt" # 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" - +readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands" + write_log_file () { if [ -f $CHECKOUT_HISTORY_FILE ]; then # repo: customer_281 From 96a1db1fbacfd0b667f3ebc10f4e5b72235487ee Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 4 Jul 2023 12:17:23 +0200 Subject: [PATCH 02/20] populate opkg_commands-file with valid opkg instructions --- etc/psa_update/opkg_commands | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index c5c87f4..93c86d4 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -5,10 +5,16 @@ ############################################################################### # 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 -#opkg info ptu5-gitinstaller +# 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 update +opkg install ptu5-gitinstaller +opkg install atbqt +opkg info ptu5-gitinstaller opkg info atbqt From ee0a06ba0bdd9d72cb622961d85fe376bfaf2931 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 4 Jul 2023 14:00:48 +0200 Subject: [PATCH 03/20] remove handling og checkout_history file --- .githooks/post-checkout | 103 +++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 59 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 66c1399..4e0526f 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -1,73 +1,58 @@ #!/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 + 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 } From e9fa1e6dd5fbcf151a455b7c64b61db71cc83336 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 6 Jul 2023 15:10:14 +0200 Subject: [PATCH 04/20] remove file in wrong localtion --- etc/psa_config/tariff01.json | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 etc/psa_config/tariff01.json diff --git a/etc/psa_config/tariff01.json b/etc/psa_config/tariff01.json deleted file mode 100644 index a4f50e6..0000000 --- a/etc/psa_config/tariff01.json +++ /dev/null @@ -1,2 +0,0 @@ -{"version":"0.1.0","project":"szeged","zone":2,"info":"summer sale","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":22,"pop_label":"Zone 2","pop_payment_method_id":3,"pop_day_end_time":"00:00:00","pop_day_night_end_time":"00:00:00","pop_price_night":0,"pop_min_time":15,"pop_max_time":240,"pop_min_price":120,"pop_carry_over":1}],"PaymentRate":[{"pra_payment_option_id":22,"pra_payment_unit_id":3,"pra_price":480}],"Duration":[{"pun_id":1,"pun_label":"1h","pun_duration":60},{"pun_id":2,"pun_label":"1 min","pun_duration":1},{"pun_id":3,"pun_label":"15 min","pun_duration":15},{"pun_id":4,"pun_label":"1d","pun_duration":1440},{"pun_id":6,"pun_label":"2h","pun_duration":120},{"pun_id":7,"pun_label":"3h","pun_duration":180},{"pun_id":11,"pun_label":"4h","pun_duration":240},{"pun_id":17,"pun_label":"30 min","pun_duration":30},{"pun_id":18,"pun_label":"1.5h","pun_duration":90},{"pun_id":20,"pun_label":"10min","pun_duration":10}],"WeekDaysWorktime":[{"pwd_id":540,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":1,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":541,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":2,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":542,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":3,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":543,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":4,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":544,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":5,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"}],"PeriodYear":[{"pye_id":1,"pye_label":"Summer","pye_start_month":6,"pye_start_day":1,"pye_end_month":9,"pye_end_day":30},{"pye_id":2,"pye_label":"Winter","pye_start_month":10,"pye_start_day":1,"pye_end_month":5,"pye_end_day":31},{"pye_id":8,"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":2180,"pedwt_period_exc_day_id":2017,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2181,"pedwt_period_exc_day_id":2018,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2182,"pedwt_period_exc_day_id":2019,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2183,"pedwt_period_exc_day_id":2020,"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":2185,"pedwt_period_exc_day_id":2023,"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":2196,"pedwt_period_exc_day_id":2035,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2198,"pedwt_period_exc_day_id":2036,"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":2219,"pedwt_period_exc_day_id":2041,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2220,"pedwt_period_exc_day_id":2042,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2221,"pedwt_period_exc_day_id":2043,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2222,"pedwt_period_exc_day_id":2044,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2223,"pedwt_period_exc_day_id":2045,"pedwt_time_from":"00:00:00","pedwt_time_to":"01:00:00","pedwt_price":0},{"pedwt_id":2224,"pedwt_period_exc_day_id":2046,"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}],"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_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":2017,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-27","ped_date_end":"2022-12-27","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2018,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-28","ped_date_end":"2022-12-28","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2019,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-29","ped_date_end":"2022-12-29","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2020,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-30","ped_date_end":"2022-12-30","ped_period_special_day_id":1,"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_period_special_day_id":2,"ped_year":0},{"ped_id":2023,"ped_label":"Holiday (Hungary)","ped_date_start":"2023-01-02","ped_date_end":"2023-01-02","ped_period_special_day_id":1,"ped_year":2024},{"ped_id":2024,"ped_label":"Good Friday","ped_date_start":"2023-04-07","ped_date_end":"2023-04-07","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2025,"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":2026,"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":2027,"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":2028,"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":2029,"ped_label":"Revolution Day (Hungary)","ped_date_start":"2023-03-15","ped_date_end":"2023-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_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_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_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":0},{"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":0},{"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":2041,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-27","ped_date_end":"2024-12-27","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2042,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-28","ped_date_end":"2024-12-28","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2043,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-29","ped_date_end":"2024-12-29","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2044,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-30","ped_date_end":"2024-12-30","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2045,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-31","ped_date_end":"2024-12-31","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2046,"ped_label":"Holiday (Hungary)","ped_date_start":"2025-01-02","ped_date_end":"2025-01-02","ped_period_special_day_id":1,"ped_year":2025}]} - From de0b5a3e702e9476cc5d49cdb9e261053eb9be8b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 6 Jul 2023 15:10:50 +0200 Subject: [PATCH 05/20] Update json-printer-files (provided by Dennis) --- etc/psa_config/DC2C_print01.json | 11 +++++--- etc/psa_config/DC2C_print02.json | 5 ++-- etc/psa_config/DC2C_print04.json | 7 ++--- etc/psa_config/DC2C_print05.json | 46 ++++++++++++++++++++++++++++---- etc/psa_config/DC2C_print06.json | 41 ++++++++++++++++++++++++---- etc/psa_config/DC2C_print07.json | 27 +++++++++++++++---- etc/psa_config/DC2C_print08.json | 13 +++++---- etc/psa_config/DC2C_print09.json | 46 ++++++++++++++++++++++++++++---- etc/psa_config/DC2C_print10.json | 45 +++++++++++++++++++++++++++---- etc/psa_config/DC2C_print11.json | 27 +++++++++++++++---- etc/psa_config/DC2C_print12.json | 14 ++++++---- etc/psa_config/DC2C_print13.json | 46 ++++++++++++++++++++++++++++---- etc/psa_config/DC2C_print14.json | 45 +++++++++++++++++++++++++++---- etc/psa_config/DC2C_print15.json | 27 +++++++++++++++---- etc/psa_config/DC2C_print16.json | 13 +++++---- etc/psa_config/DC2C_print17.json | 30 +++++++++++++++++---- etc/psa_config/DC2C_print18.json | 23 ++++++++++++---- etc/psa_config/DC2C_print19.json | 18 +++++++++---- etc/psa_config/DC2C_print20.json | 33 +++++++++++++++++++---- etc/psa_config/DC2C_print21.json | 45 +++++++++++++++++++++++++++---- etc/psa_config/DC2C_print22.json | 34 +++++++++++++++++++---- etc/psa_config/DC2C_print23.json | 39 +++++++++++++++++++++++---- etc/psa_config/DC2C_print24.json | 44 ++++++++++++++++++++++++++---- etc/psa_config/DC2C_print25.json | 36 +++++++++++++++++++++---- etc/psa_config/DC2C_print26.json | 22 +++++++++++---- etc/psa_config/DC2C_print27.json | 41 ++++++++++++++++++++++++---- etc/psa_config/DC2C_print28.json | 40 +++++++++++++++++++++++---- 27 files changed, 688 insertions(+), 130 deletions(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index bd160c8..699e451 100644 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,7 +1,5 @@ { "title":"DC2C_pri01", -"project":"DBM Szeged park_coins", -"issued":"13.04.2023 01.02", "styl":"font 08", "styl":"size 10", "feed":"margin02", @@ -9,8 +7,6 @@ "text":"PARKOLÓJEGY", "styl":"size 00", "feed":"nl", -"text":" Nyugta", -"feed":"nl", "text":"Kérjük az elsö szélvédö", "feed":"nl", "text":"mögé jól láthatóan", @@ -19,6 +15,11 @@ "feed":"nl", "text":"A PARKOLÓ NEM ÕRZÖTT", "feed":"nl", +"text":"Please place it clearly visible", +"feed":"nl", +"text":"behind the", +"text":" front windshield!", +"feed":"nl", "feed":"nl", "text":"Rendszám: ", "vari":"Dynamic01", @@ -33,6 +34,8 @@ "text":"Parkolás helye: ", "feed":"nl", "vari":"location", +"feed":"nl", +"feed":"nl", } diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 39c031d..3fd6231 100644 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,8 +1,5 @@ { "title":"DC2C_pri02", -"project":"DBM Szeged park_coins", -"issued":"13.04.2023 01.01", - "text":"Összeg: ", "styl":"size 01", "vari":"Dynamic02", @@ -32,6 +29,8 @@ "feed":"nl", "text":"Üf. szolg nyitvatartás:", "feed":"nl", +"feed":"nl", +"feed":"nl", } diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index a7a91fa..1e44623 100644 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -1,8 +1,9 @@ { "title":"DC2C_pri04", -"project":"empty", -"issued":"24.05.2023 01.00", -"text":"" +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 00" + } diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index e16952d..b7e78d8 100644 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -1,5 +1,41 @@ -{ -"title":"DC2C_pri05", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri05", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"text":"PARKOLÓJEGY", +"styl":"size 00", +"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", +"text":"Please place it clearly visible", +"feed":"nl", +"text":"behind the", +"text":" front windshield!", +"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", +} + + diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index de75f30..3de6e90 100644 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -1,5 +1,36 @@ -{ -"title":"DC2C_pri06", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri06", +"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", +} + + diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index e175462..9f425b0 100644 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -1,5 +1,22 @@ -{ -"title":"DC2C_pri07", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"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", +} + + diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index f85d23f..9568011 100644 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -1,5 +1,8 @@ -{ -"title":"DC2C_pri08", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri08", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 00" +} + + diff --git a/etc/psa_config/DC2C_print09.json b/etc/psa_config/DC2C_print09.json index d98dc90..7206cd7 100644 --- a/etc/psa_config/DC2C_print09.json +++ b/etc/psa_config/DC2C_print09.json @@ -1,5 +1,41 @@ -{ -"title":"DC2C_pri09", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri09", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"text":"PARKOLÓJEGY", +"styl":"size 00", +"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", +"text":"Please place it clearly visible", +"feed":"nl", +"text":"behind the", +"text":" front windshield!", +"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", +} + + diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index a6e6c16..495a1db 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,40 @@ -{ -"title":"DC2C_pri10", -"version":"27.02.2023 12:20 00001", -"test":"" -} +{ +"title":"DC2C_pri10", +"styl":"size 01", +"text":"Napijegy K", +"styl":"size 00", +"feed":"nl", +"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", +} + + diff --git a/etc/psa_config/DC2C_print11.json b/etc/psa_config/DC2C_print11.json index b48b5d2..2e5cc48 100644 --- a/etc/psa_config/DC2C_print11.json +++ b/etc/psa_config/DC2C_print11.json @@ -1,5 +1,22 @@ -{ -"title":"DC2C_pri11", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"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":"nl" +} + + diff --git a/etc/psa_config/DC2C_print12.json b/etc/psa_config/DC2C_print12.json index b05d835..bef43b3 100644 --- a/etc/psa_config/DC2C_print12.json +++ b/etc/psa_config/DC2C_print12.json @@ -1,5 +1,9 @@ -{ -"title":"DC2C_pri12", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri12", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 00" + +} + + diff --git a/etc/psa_config/DC2C_print13.json b/etc/psa_config/DC2C_print13.json index 8f3bf7c..a670fee 100644 --- a/etc/psa_config/DC2C_print13.json +++ b/etc/psa_config/DC2C_print13.json @@ -1,5 +1,41 @@ -{ -"title":"DC2C_pri13", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri13", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"text":"PARKOLÓJEGY", +"styl":"size 00", +"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", +"text":"Please place it clearly visible", +"feed":"nl", +"text":"behind the", +"text":" front windshield!", +"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", +} + + diff --git a/etc/psa_config/DC2C_print14.json b/etc/psa_config/DC2C_print14.json index 32628fa..af22030 100644 --- a/etc/psa_config/DC2C_print14.json +++ b/etc/psa_config/DC2C_print14.json @@ -1,5 +1,40 @@ -{ -"title":"DC2C_pri14", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri14", +"styl":"size 01", +"text":"Napijegy K", +"styl":"size 00", +"feed":"nl", +"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", +} + + diff --git a/etc/psa_config/DC2C_print15.json b/etc/psa_config/DC2C_print15.json index 3782788..80cff00 100644 --- a/etc/psa_config/DC2C_print15.json +++ b/etc/psa_config/DC2C_print15.json @@ -1,5 +1,22 @@ -{ -"title":"DC2C_pri15", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"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":"nl" +} + + diff --git a/etc/psa_config/DC2C_print16.json b/etc/psa_config/DC2C_print16.json index 4f4ce0a..16f9154 100644 --- a/etc/psa_config/DC2C_print16.json +++ b/etc/psa_config/DC2C_print16.json @@ -1,5 +1,8 @@ -{ -"title":"DC2C_pri16", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri16", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 00" +} + + diff --git a/etc/psa_config/DC2C_print17.json b/etc/psa_config/DC2C_print17.json index 0adf0ac..7724bdc 100644 --- a/etc/psa_config/DC2C_print17.json +++ b/etc/psa_config/DC2C_print17.json @@ -1,5 +1,25 @@ -{ -"title":"DC2C_pri17", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri17", +"styl":"align l", +"feed":"margin01", +"feed":"nl", +"feed":"nl", +"feed":"nl", +"feed":"part", +"text":"Utazzon tovább közösségi közle-", +"feed":"nl", +"text":"kedéssel! Ehhez a leválasztható", +"feed":"nl", +"text":" szelvényhez a közösségi közle- ", +"feed":"nl", +"text":"kedési járművek (villamos, helyi-", +"feed":"nl", +"text":"járatos busz,trolibusz,vasútvilla-", +"feed":"nl", +"text":"mos) bankkártyás fedélzeti jegy-", +"feed":"nl", +"text":"kiadó automatáiból,illetve a jegy-", +"feed":"nl", +"feed":"nl" +} + diff --git a/etc/psa_config/DC2C_print18.json b/etc/psa_config/DC2C_print18.json index f2ade62..7b64a6d 100644 --- a/etc/psa_config/DC2C_print18.json +++ b/etc/psa_config/DC2C_print18.json @@ -1,5 +1,18 @@ -{ -"title":"DC2C_pri18", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +"title":"DC2C_pri18", +"styl":"align l", +"feed":"margin01", + +"text":"árusító applikációkból Közterületi", +"feed":"nl", +"text":"fizető parkolás napijegyhez vál-", +"feed":"nl", +"text":"tott kiegészítő Körút napijegy vá-", +"feed":"nl", +"text":"sárolható (ára 440,-Ft)1 fő részé-", +"feed":"nl", +"text":"re. Ez a napijegy Szeged, Nagy-", +"feed":"nl", +"text":" körútig bezárólag illetve a Nagy-", +"feed":"nl", +"feed":"nl" +} diff --git a/etc/psa_config/DC2C_print19.json b/etc/psa_config/DC2C_print19.json index 6a27189..6bfea6c 100644 --- a/etc/psa_config/DC2C_print19.json +++ b/etc/psa_config/DC2C_print19.json @@ -1,5 +1,13 @@ -{ -"title":"DC2C_pri19", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri19", +"styl":"align l", +"feed":"margin01", + +"text":"körúton túli első megállóhelytől", +"feed":"nl", +"text":"vagy megállóhelyig korlátlan uta-", +"feed":"nl", +"text":"zásra érvényes a parkolás nap-", +"feed":"nl", +"text":"ján." +} diff --git a/etc/psa_config/DC2C_print20.json b/etc/psa_config/DC2C_print20.json index b1a1a6c..3856417 100644 --- a/etc/psa_config/DC2C_print20.json +++ b/etc/psa_config/DC2C_print20.json @@ -1,5 +1,28 @@ -{ -"title":"DC2C_pri20", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri20", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 00" + +"text":"Ellenőrzéshez ezt a szelvényt", +"feed":"nl", +"text":"és az utazásra jogosító papírt" , +"feed":"nl", +"text":"vagy elektronikus napijegyet ", +"feed":"nl", +"text":"együttesen kell bemutatni.", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Parkolás kezdete:", +"text":"(Kék Zóna)", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl", +"feed":"eject" + +} + + diff --git a/etc/psa_config/DC2C_print21.json b/etc/psa_config/DC2C_print21.json index f54f36a..6609b64 100644 --- a/etc/psa_config/DC2C_print21.json +++ b/etc/psa_config/DC2C_print21.json @@ -1,5 +1,40 @@ -{ -"title":"DC2C_pri21", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri21", +"project":"DBM Szeged StartParking", +"styl":"size 10", +"text":"Igazoló ", +"text":"szelvény", +"styl":"size 00", +"feed":"nl", +"feed":"nl", +"text":" Bizonylat ", +"feed":"nl", +"text":"Szélvédõ mögé NEM", +"feed":"nl", +"text":"kell kihelyezni!", +"feed":"nl", +"text":"A PARKOLÓ NEM ÕRZÖTT!", +"feed":"nl", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Parkolás helye: ", +"feed":"nl", +"styl":"size 10", +"vari":"location", +"styl":"size 00", +"feed":"nl", +"text":"Zárolt összeg/Ft.: ", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic02", +"styl":"size 00", +"feed":"nl", +"text":"Kiadás idõpontja:", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl" +} + diff --git a/etc/psa_config/DC2C_print22.json b/etc/psa_config/DC2C_print22.json index 60285ba..cbc5fc0 100644 --- a/etc/psa_config/DC2C_print22.json +++ b/etc/psa_config/DC2C_print22.json @@ -1,5 +1,29 @@ -{ -"title":"DC2C_pri22", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +"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":"Deák Ferenc u. 31.", +"feed":"nl", +"text":"H - P: 7:45 - 17:00", +"feed":"nl", +"text":"Tel: (80) 820-500", +"feed":"nl", +"feed":"nl" +} + + diff --git a/etc/psa_config/DC2C_print23.json b/etc/psa_config/DC2C_print23.json index 905bd39..8cf6dc4 100644 --- a/etc/psa_config/DC2C_print23.json +++ b/etc/psa_config/DC2C_print23.json @@ -1,5 +1,34 @@ -{ -"title":"DC2C_pri23", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +"title":"DC2C_pri23", +"project":"DBM Szeged StartParking", +"styl":"size 00", +"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", +"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", +"text":"Leállító KÓD:", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic07", +"feed":"nl", +"vari":"Dynamic08", +"styl":"size 00", +"feed":"nl", +"text":"Õrizze meg, tartsa magánál!", +"feed":"nl", +"feed":"eject" +} + + diff --git a/etc/psa_config/DC2C_print24.json b/etc/psa_config/DC2C_print24.json index bac985c..5cf438c 100644 --- a/etc/psa_config/DC2C_print24.json +++ b/etc/psa_config/DC2C_print24.json @@ -1,5 +1,39 @@ -{ -"title":"DC2C_pri24", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri24", +"project":"DBM Szeged StopParking", +"styl":"size 10" +"text":"Parkolójegy", +"styl":"size 00" +"feed":"nl", +"feed":"nl", +"text":"Nyugta : ", +"feed":"nl", +"vari":"Dynamic07", +"feed":"nl", +"vari":"Dynamic08", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Leállítás helye:", +"feed":"nl", +"styl":"size 10" +"vari":"location", +"styl":"size 00", +"text":"Leállítás idõpontja:", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl", +"text":"Automata száma: ", +"vari":"manu", +"feed":"nl", +"text":"Terhelt Összeg: ", +"vari":"Dynamic02", +"text":"Ft. (BK)", +"feed":"nl", +"text":"A nyugta az igazoló", +"feed":"nl", +"text":"szelvénnyel együtt" +} + diff --git a/etc/psa_config/DC2C_print25.json b/etc/psa_config/DC2C_print25.json index 7f21d88..24ab60c 100644 --- a/etc/psa_config/DC2C_print25.json +++ b/etc/psa_config/DC2C_print25.json @@ -1,5 +1,31 @@ -{ -"title":"DC2C_pri25", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri25", +"project":"DBM Szeged StopParking", +"text":"érvényes.", +"feed":"nl", +"feed":"nl", +"text":"Üf. szolg nyitvatartás:" +"feed":"nl", +"text":" Arany Janos u. 5", +"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" +} + + diff --git a/etc/psa_config/DC2C_print26.json b/etc/psa_config/DC2C_print26.json index 93880b7..d58182c 100644 --- a/etc/psa_config/DC2C_print26.json +++ b/etc/psa_config/DC2C_print26.json @@ -1,5 +1,17 @@ -{ -"title":"DC2C_pri26", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri26", +"project":"DBM Szeged StopParking", +"feed":"nl", +"text":"Start azonosító:", +"styl":"size 00", +"feed":"nl", +"vari":"Dynamic07", +"feed":"nl", +"vari":"Dynamic08", +"feed":"nl", +"text":"Õrizze meg, tartsa magánál!", +"feed":"nl", +"feed":"eject" +} + + diff --git a/etc/psa_config/DC2C_print27.json b/etc/psa_config/DC2C_print27.json index aa74d57..3a88351 100644 --- a/etc/psa_config/DC2C_print27.json +++ b/etc/psa_config/DC2C_print27.json @@ -1,5 +1,36 @@ -{ -"title":"DC2C_pri27", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri27", +"project":"DBM Szeged Error", +"styl":"size 00", +"feed":"nl", +"text":"TRANZAKCIÓ ELUTASÍTVA!", +"feed":"nl", +"feed":"nl", +"text":" Bizonylat", +"feed":"nl", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Indítás helye:", +"feed":"nl", +"vari":"location", +"feed":"nl", +"text":"Kiadás idõpontja:", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl", +"text":"Automata száma: ", +"vari":"manu", +"text":"Bizonylat sorsz.: ", +"feed":"nl", +"vari":"Dynamic07", +"feed":"nl", +"vari":"Dynamic08", +"feed":"nl", +"text":"Hibaüzenet: ", +"vari":"Dynamic06", +"feed":"nl" +} + diff --git a/etc/psa_config/DC2C_print28.json b/etc/psa_config/DC2C_print28.json index 706eaa9..8279c24 100644 --- a/etc/psa_config/DC2C_print28.json +++ b/etc/psa_config/DC2C_print28.json @@ -1,5 +1,35 @@ -{ -"title":"DC2C_pri28", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri28", +"project":"DBM Szeged Error", +"styl":"size 00", +"text":" Üf. szolg nyitvatartás:", +"feed":"nl", +"text":" Deák Ferenc u. 31. ", +"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" + +} + From 0b7614c2d9b7eba66d17f8ca0004220eea8e214e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 6 Jul 2023 15:44:17 +0200 Subject: [PATCH 06/20] Do not download anything. Only execute opkg-commands --- .githooks/post-checkout | 60 +++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 4e0526f..debc464 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -9,39 +9,41 @@ readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands" write_log_file () { # repo: customer_281 - readonly repo=$(basename $(git rev-parse --show-toplevel)) + # 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 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 + # 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 ' From d72bafb8d7035694ff11f7f0aba5aa326be4f066 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Jul 2023 10:15:11 +0200 Subject: [PATCH 07/20] Set max_time to 240 --- etc/psa_tariff/tariff04.json | 328 ++++++++++++++++++++++++++++++++++- 1 file changed, 325 insertions(+), 3 deletions(-) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 9e77830..086f7e4 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -35,10 +35,11 @@ "pop_day_night_end_time": "16:30:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 600, + "pop_max_time": 240, "pop_min_price": 0, - "pop_carry_over": 1, - "pop_daily_card_price": 2400 + "pop_carry_over": 0, + "pop_daily_card_price": 0, + "pop_multi_hour_price": 0 } ], "PaymentRate": [ @@ -63,6 +64,11 @@ "pun_id": 4, "pun_label": "1 min", "pun_duration": 1 + }, + { + "pun_id": 5, + "pun_label": "Voller Tag", + "pun_duration": 1441 } ], "WeekDaysWorktime": [ @@ -166,6 +172,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,6 +484,146 @@ "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": [ @@ -800,6 +962,166 @@ "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, "ped_year": 2024 + }, + { + "ped_id": 2072, + "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": 2073, + "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": 2074, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2075, + "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": 2076, + "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": 2077, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2078, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2079, + "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": 2080, + "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": 2081, + "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": 2082, + "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": 2083, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2084, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2085, + "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": 2086, + "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": 2087, + "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": 2088, + "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": 2089, + "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": 2090, + "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": 2091, + "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 } ] } From 69e3fbe55adc1b1134edc4067d3f6213be7dcd1e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 26 Jul 2023 14:48:20 +0200 Subject: [PATCH 08/20] use same tariff-file as branch for zone4 --- etc/psa_tariff/tariff04.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 086f7e4..bcdc392 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -37,8 +37,8 @@ "pop_min_time": 15, "pop_max_time": 240, "pop_min_price": 0, - "pop_carry_over": 0, - "pop_daily_card_price": 0, + "pop_carry_over": 1, + "pop_daily_card_price": 2400, "pop_multi_hour_price": 0 } ], @@ -1125,3 +1125,5 @@ } ] } + + From 6ed893f3fc177c5d314a2aadd46096c02f727044 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 3 Aug 2023 15:30:58 +0200 Subject: [PATCH 09/20] add json files for zones 5 and 6 --- etc/psa_tariff/tariff05.json | 1134 ++++++++++++++++++++++++++++++++++ etc/psa_tariff/tariff06.json | 1134 ++++++++++++++++++++++++++++++++++ 2 files changed, 2268 insertions(+) create mode 100644 etc/psa_tariff/tariff05.json create mode 100644 etc/psa_tariff/tariff06.json diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json new file mode 100644 index 0000000..d29637b --- /dev/null +++ b/etc/psa_tariff/tariff05.json @@ -0,0 +1,1134 @@ +{ + "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": 0, + "pop_carry_over": 1, + "pop_daily_card_price": 1980, + "pop_multi_hour_price": 0 + } + ], + "PaymentRate": [ + { + "pra_payment_option_id": 1081, + "pra_payment_unit_id": 1, + "pra_price": 330 + } + ], + "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": 8, + "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": 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_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_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_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2025, + "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": 2026, + "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": 2027, + "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": 2028, + "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": 2029, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-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_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_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_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_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_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_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_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_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_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "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_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_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 + }, + { + "ped_id": 2072, + "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": 2073, + "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": 2074, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2075, + "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": 2076, + "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": 2077, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2078, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2079, + "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": 2080, + "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": 2081, + "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": 2082, + "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": 2083, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2084, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2085, + "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": 2086, + "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": 2087, + "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": 2088, + "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": 2089, + "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": 2090, + "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": 2091, + "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 + } + ] +} diff --git a/etc/psa_tariff/tariff06.json b/etc/psa_tariff/tariff06.json new file mode 100644 index 0000000..9736077 --- /dev/null +++ b/etc/psa_tariff/tariff06.json @@ -0,0 +1,1134 @@ +{ + "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": 0, + "pop_carry_over": 1, + "pop_daily_card_price": 0, + "pop_multi_hour_price": 0 + } + ], + "PaymentRate": [ + { + "pra_payment_option_id": 1082, + "pra_payment_unit_id": 1, + "pra_price": 600 + } + ], + "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": 8, + "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": 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_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_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_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2025, + "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": 2026, + "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": 2027, + "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": 2028, + "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": 2029, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-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_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_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_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_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_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_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_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_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_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "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_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_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 + }, + { + "ped_id": 2072, + "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": 2073, + "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": 2074, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2075, + "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": 2076, + "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": 2077, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2078, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2079, + "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": 2080, + "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": 2081, + "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": 2082, + "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": 2083, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2084, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2085, + "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": 2086, + "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": 2087, + "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": 2088, + "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": 2089, + "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": 2090, + "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": 2091, + "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 + } + ] +} From 5d9882c5692bb834a57e69dedfbae276275cb4af Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 3 Aug 2023 15:44:06 +0200 Subject: [PATCH 10/20] set daily cardprice to 2400 --- etc/psa_tariff/tariff06.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_tariff/tariff06.json b/etc/psa_tariff/tariff06.json index 9736077..7aa4ef9 100644 --- a/etc/psa_tariff/tariff06.json +++ b/etc/psa_tariff/tariff06.json @@ -38,7 +38,7 @@ "pop_max_time": 240, "pop_min_price": 0, "pop_carry_over": 1, - "pop_daily_card_price": 0, + "pop_daily_card_price": 2400, "pop_multi_hour_price": 0 } ], From 23e5e1339ecf936db3047a0fb84dacb89c043425 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 09:54:41 +0200 Subject: [PATCH 11/20] appended datelien for testing --- etc/psa_update/opkg_commands | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 93c86d4..edd0d77 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -18,3 +18,4 @@ opkg install ptu5-gitinstaller opkg install atbqt opkg info ptu5-gitinstaller opkg info atbqt +# Wed Aug 9 09:54:03 AM CEST 2023 From 4331c32dc5909de4207809a20f5240d10819e040 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 09:58:28 +0200 Subject: [PATCH 12/20] Add file for testing. 248 -> 240 for useLanguage --- opt/app/ATBAPP/ATBQT.ini | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 opt/app/ATBAPP/ATBQT.ini diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini new file mode 100644 index 0000000..4644181 --- /dev/null +++ b/opt/app/ATBAPP/ATBQT.ini @@ -0,0 +1,91 @@ +[ATBDeviceControllerPlugin] +serialPort=ttymxc2 + +[COMMON] +%23ooo_mode={useDisk|otherMachine} +%23useLanguage=[128+][64+][32+][16] +%23usePayment=[128+][64+][32+][16] +%23useProduct=[128+][64+][32+][16+][8] +%23useVehicle=[128+][64+][32+][16+][8] +CharacterSet=ISO 8859-2 +alternativeLogoFile= +com_baud_rate=9600 +com_port_name=/dev/ttyS1 +defaultLanguage=1 +feature_DBusDisplayControl=on +feature_DBusDisplayDimLow=off +feature_DBusSuspendControl=on +feature_DisplayControl=off +feature_Log=off +feature_ShowParkingTime=off +feature_StartButton=on +feature_SystemSuspend=off +feature_TouchFeedback=off +feature_selfOOO=off +lang1=hu_HU +lang2=en_GB +lang3=de_DE +lang4=sr +lang5=ro_RO +logfile=/var/log/atbqt.log +ooo_alternativeLocation= +ooo_mode=otherMachine +ooo_serviceEmail= +ooo_serviceNumber= +sellTimeout_time=60 +showHelpButton=false +showInfoButton=false +statefile=/opt/app/ATBAPP/states/APP_States.xml +suspend_methode=sysfs +suspend_program= +suspend_time=8 +textfile=/opt/app/ATBAPP/text/HMI_Texte.xml +touch_feedback_gpio=121 +touch_feedback_off_value=0 +touch_feedback_on_value=1 +useAppStates=1 +useLanguage=240 +usePayment=96 +useProduct=248 +useVehicle=240 + +[IngenicoISelf_CCPlugin] +Currency=HUF +PortName=/dev/ttymxc0 +ZVT=DE +debug=1 +sleep=1 +sleepExtended=1 + +[MOBILISIS_CalculatePricePlugin] +tariffFileName=/etc/psa_tariff/tariff01.json +useDebug=1 + +[PAYMENT] +cashVariant=CoinsOnly +currencyISOCode=HUF +currencySymbol=Ft +paymentPointInTime=poa +useHonestPayment=on + +[PLUGINS] +CCPlugin=IngenicoISelf_CCPlugin +CalculatePricePlugin=MOBILISIS_CalculatePricePlugin +DeviceControllerPlugin=ATBDeviceControllerPlugin + +[SCREENCONFIG] +sc_31="1,1,0" +sc_33="1,0,1" +sc_35="0,0,0" +sc_3F="1,0,0" +sc_40="1,0,1" +sc_41="1,0,1" +sc_51="1,0,1" +sc_52="1,0,0" +sc_53="1,0,0" + +[TCP_CONTROL] +enable=1 + + +# Wed Aug 9 09:56:41 AM CEST 2023 From 73f5bfd5682a67877fc97f2bc4d9f848a207edc0 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 10:13:42 +0200 Subject: [PATCH 13/20] add another line for testing --- opt/app/ATBAPP/ATBQT.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini index 4644181..be9231a 100644 --- a/opt/app/ATBAPP/ATBQT.ini +++ b/opt/app/ATBAPP/ATBQT.ini @@ -89,3 +89,4 @@ enable=1 # Wed Aug 9 09:56:41 AM CEST 2023 +# Wed Aug 9 10:12:41 AM CEST 2023 From 5a25611a390ccb76d8dbdae31d8a0a5eb2956408 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 10:16:51 +0200 Subject: [PATCH 14/20] 240 -> 248 --- opt/app/ATBAPP/ATBQT.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini index be9231a..aa71de5 100644 --- a/opt/app/ATBAPP/ATBQT.ini +++ b/opt/app/ATBAPP/ATBQT.ini @@ -44,7 +44,7 @@ touch_feedback_gpio=121 touch_feedback_off_value=0 touch_feedback_on_value=1 useAppStates=1 -useLanguage=240 +useLanguage=248 usePayment=96 useProduct=248 useVehicle=240 From 9461dfafb0e41bffa291227b424d3a6f1d55d9f9 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 10:20:38 +0200 Subject: [PATCH 15/20] add another line for testing --- opt/app/ATBAPP/ATBQT.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini index aa71de5..e6d3d81 100644 --- a/opt/app/ATBAPP/ATBQT.ini +++ b/opt/app/ATBAPP/ATBQT.ini @@ -90,3 +90,4 @@ enable=1 # Wed Aug 9 09:56:41 AM CEST 2023 # Wed Aug 9 10:12:41 AM CEST 2023 +# Wed Aug 9 10:12:41 AM CEST 2023 From 5629444870aedd6723fc135d7a6b393ac9cc5224 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 16:20:08 +0200 Subject: [PATCH 16/20] Appended a dateline. Set useLanguage 248 -> 240 --- opt/app/ATBAPP/ATBQT.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini index e6d3d81..46d8432 100644 --- a/opt/app/ATBAPP/ATBQT.ini +++ b/opt/app/ATBAPP/ATBQT.ini @@ -44,7 +44,7 @@ touch_feedback_gpio=121 touch_feedback_off_value=0 touch_feedback_on_value=1 useAppStates=1 -useLanguage=248 +useLanguage=240 usePayment=96 useProduct=248 useVehicle=240 @@ -91,3 +91,4 @@ enable=1 # Wed Aug 9 09:56:41 AM CEST 2023 # Wed Aug 9 10:12:41 AM CEST 2023 # Wed Aug 9 10:12:41 AM CEST 2023 +# Wed Aug 9 04:18:56 PM CEST 2023 From 0657b3ea27d861115cc9dc6109beb6a0bf8c861e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 9 Aug 2023 16:21:48 +0200 Subject: [PATCH 17/20] install apism via opkg --- etc/psa_update/opkg_commands | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index edd0d77..ebbdce3 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -11,11 +11,12 @@ # 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 info ptu5-gitinstaller +# opkg info atbqt opkg update -opkg install ptu5-gitinstaller -opkg install atbqt -opkg info ptu5-gitinstaller -opkg info atbqt +opkg install apism +# opkg install ptu5-gitinstaller +# opkg install atbqt +# opkg info ptu5-gitinstaller +# opkg info atbqt # Wed Aug 9 09:54:03 AM CEST 2023 From 25e9e014de9857ca1f355dd276f6f35859746993 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 10 Aug 2023 16:37:45 +0200 Subject: [PATCH 18/20] set useLanguage 240 -> 248 --- opt/app/ATBAPP/ATBQT.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini index 46d8432..5a141f6 100644 --- a/opt/app/ATBAPP/ATBQT.ini +++ b/opt/app/ATBAPP/ATBQT.ini @@ -44,7 +44,7 @@ touch_feedback_gpio=121 touch_feedback_off_value=0 touch_feedback_on_value=1 useAppStates=1 -useLanguage=240 +useLanguage=248 usePayment=96 useProduct=248 useVehicle=240 From 2cc7ec9dc7acf710f722fd4f49ff6ee336f4f073 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 11 Aug 2023 12:43:10 +0200 Subject: [PATCH 19/20] Install ptu5-gitinstaller, atbupdatetool and atbqt. --- etc/psa_update/opkg_commands | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index ebbdce3..766a151 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -5,18 +5,13 @@ ############################################################################### # 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 info ptu5-gitinstaller +opkg info atbqt +opkg info atbupdatetool opkg update -opkg install apism -# opkg install ptu5-gitinstaller -# opkg install atbqt -# opkg info ptu5-gitinstaller -# opkg info atbqt -# Wed Aug 9 09:54:03 AM CEST 2023 +opkg install ptu5-gitinstaller +opkg install atbupdatetool +opkg install atbqt +opkg info ptu5-gitinstaller +opkg info atbqt +opkg info atbupdatetool From e9dc8f6e10f5cef71f8fb44bfffedb46999449f5 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 11 Aug 2023 12:44:07 +0200 Subject: [PATCH 20/20] Remove ini-file (used for testing) and obsolete tariff.current file. --- opt/app/ATBAPP/ATBQT.ini | 94 ----------------------------------- opt/app/ATBAPP/tariff.current | 1 - 2 files changed, 95 deletions(-) delete mode 100644 opt/app/ATBAPP/ATBQT.ini delete mode 100644 opt/app/ATBAPP/tariff.current diff --git a/opt/app/ATBAPP/ATBQT.ini b/opt/app/ATBAPP/ATBQT.ini deleted file mode 100644 index 5a141f6..0000000 --- a/opt/app/ATBAPP/ATBQT.ini +++ /dev/null @@ -1,94 +0,0 @@ -[ATBDeviceControllerPlugin] -serialPort=ttymxc2 - -[COMMON] -%23ooo_mode={useDisk|otherMachine} -%23useLanguage=[128+][64+][32+][16] -%23usePayment=[128+][64+][32+][16] -%23useProduct=[128+][64+][32+][16+][8] -%23useVehicle=[128+][64+][32+][16+][8] -CharacterSet=ISO 8859-2 -alternativeLogoFile= -com_baud_rate=9600 -com_port_name=/dev/ttyS1 -defaultLanguage=1 -feature_DBusDisplayControl=on -feature_DBusDisplayDimLow=off -feature_DBusSuspendControl=on -feature_DisplayControl=off -feature_Log=off -feature_ShowParkingTime=off -feature_StartButton=on -feature_SystemSuspend=off -feature_TouchFeedback=off -feature_selfOOO=off -lang1=hu_HU -lang2=en_GB -lang3=de_DE -lang4=sr -lang5=ro_RO -logfile=/var/log/atbqt.log -ooo_alternativeLocation= -ooo_mode=otherMachine -ooo_serviceEmail= -ooo_serviceNumber= -sellTimeout_time=60 -showHelpButton=false -showInfoButton=false -statefile=/opt/app/ATBAPP/states/APP_States.xml -suspend_methode=sysfs -suspend_program= -suspend_time=8 -textfile=/opt/app/ATBAPP/text/HMI_Texte.xml -touch_feedback_gpio=121 -touch_feedback_off_value=0 -touch_feedback_on_value=1 -useAppStates=1 -useLanguage=248 -usePayment=96 -useProduct=248 -useVehicle=240 - -[IngenicoISelf_CCPlugin] -Currency=HUF -PortName=/dev/ttymxc0 -ZVT=DE -debug=1 -sleep=1 -sleepExtended=1 - -[MOBILISIS_CalculatePricePlugin] -tariffFileName=/etc/psa_tariff/tariff01.json -useDebug=1 - -[PAYMENT] -cashVariant=CoinsOnly -currencyISOCode=HUF -currencySymbol=Ft -paymentPointInTime=poa -useHonestPayment=on - -[PLUGINS] -CCPlugin=IngenicoISelf_CCPlugin -CalculatePricePlugin=MOBILISIS_CalculatePricePlugin -DeviceControllerPlugin=ATBDeviceControllerPlugin - -[SCREENCONFIG] -sc_31="1,1,0" -sc_33="1,0,1" -sc_35="0,0,0" -sc_3F="1,0,0" -sc_40="1,0,1" -sc_41="1,0,1" -sc_51="1,0,1" -sc_52="1,0,0" -sc_53="1,0,0" - -[TCP_CONTROL] -enable=1 - - -# Wed Aug 9 09:56:41 AM CEST 2023 -# Wed Aug 9 10:12:41 AM CEST 2023 -# Wed Aug 9 10:12:41 AM CEST 2023 -# Wed Aug 9 04:18:56 PM CEST 2023 diff --git a/opt/app/ATBAPP/tariff.current b/opt/app/ATBAPP/tariff.current deleted file mode 100644 index 3258144..0000000 --- a/opt/app/ATBAPP/tariff.current +++ /dev/null @@ -1 +0,0 @@ -"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"