From 5c85a294d5f1e918d656cd2e4f91cfc9de6591d8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 12 Apr 2023 14:22:17 +0200 Subject: [PATCH 01/34] Adding git hook post-checkout. --- .githooks/post-checkout | 1 + 1 file changed, 1 insertion(+) create mode 100755 .githooks/post-checkout diff --git a/.githooks/post-checkout b/.githooks/post-checkout new file mode 100755 index 0000000..50dee13 --- /dev/null +++ b/.githooks/post-checkout @@ -0,0 +1 @@ +echo "POST-CHECKOUT" From 09633c3754936d302b629003e721ec895ae425cf Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 12 Apr 2023 14:49:55 +0200 Subject: [PATCH 02/34] Add hook post-checkout --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c15531e..efbcaa6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,10 @@ # And all the file types you're interested in !.gitignore !.githooks/post-merge +!.githooks/post-checkout !**/.gitignore !**/.githooks/post-merge +!**/.githooks/post-checkout ## Except !etc/atb/* From 9ca0a0076360c8fb409b9231792f89ee11c7eb23 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 12 Apr 2023 15:28:39 +0200 Subject: [PATCH 03/34] Adding get_blob, get_commit_for_blob, changed_file_names. --- .githooks/post-merge | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.githooks/post-merge b/.githooks/post-merge index 8ff70b3..52b4ebb 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -17,6 +17,27 @@ OPKG_CMDS_TMP=/tmp/opkg_commands rm -f $GIT_PULL_TMP rm -f $OPKG_CMDS_TMP +get_blob () { # get the blob of the file(name) passed as $1 + # note: this can be used for any file in the filesystem + echo $(git hash-object $1) +} + +get_commit_for_blob () { + blob=$(get_blob $1) + if [ ! -z $blob ]; then + # search for the blob in all commits for the file(name) $1 + echo $(echo $(git log --all --pretty=format:%H -- $1) | + xargs -I{} bash -c "git ls-tree {} -- $1 | + grep -q $blob && echo {}") + fi +} + +changed_file_names () { + for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do + CHANGED_FILE_NAMES+=($fn) + done +} + for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then fsize=0 From 621a8ac361f3ea43f49200ddc732598540be1f1f Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 12 Apr 2023 15:59:57 +0200 Subject: [PATCH 04/34] Print the values of the passed parameters. --- .githooks/post-checkout | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 50dee13..eee1e80 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -1 +1,4 @@ echo "POST-CHECKOUT" +echo "PREV-HEAD=$1" +echo "CURR-HEAD=$2" +echo "BRANCH-CHECKOUT=$3" From 59840c6db9ca0df79e4a03d140e456b82e48c52a Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 13 Apr 2023 16:38:41 +0200 Subject: [PATCH 05/34] Update for Hungarian format --- etc/psa_config/DC2C_print01.json | 46 +++++++++++++++++++------------- etc/psa_config/DC2C_print02.json | 35 ++++++++++++++++++++---- etc/psa_config/DC2C_print03.json | 25 +++++++++++++---- 3 files changed, 77 insertions(+), 29 deletions(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 5c1a028..e642699 100644 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,28 +1,36 @@ { "title":"DC2C_pri01", -"project":"DBM Szeged", -"version":"13.02.2023 12:20 00001", -"styl":"bold on", -"text":"Parkingticket ", -"styl":"bold off", +"project":"DBM Szeged park_coins", +"issued":"13.04.2023 01.01", +"styl":"size 01", +"text":"PARKOLÓJEGY", +"styl":"size 11", "feed":"nl", -"text":"Parkingticket ", -"styl":"under on", -"text":"Parkingticket ", -"styl":"under off", +"text":"Nyugta", +"styl":"size 00", "feed":"nl", -"text":"Parkingticket ", -"styl":"latin on", -"text":"Parkingticket ", -"styl":"latin off", "feed":"nl", -"text":"Parkingticket ", -"styl":"font 09", -"text":"Park ", -"styl":"font 16", -"text":"Park ", +"text":"mögé jól láthatóan", +"feed":"nl", +"text":"elhelyezni!", +"feed":"nl", +"text":"A PARKOLÓ NEM ŐRZÖTT!", +"feed":"nl", +"styl":"size 10", +"text":"Rendszám: ", +"styl":"size 00", +"feed":"nl", +"vari":"Dynamic01", +"feed":"nl", +"text":"Parkolási idõ vége:", +"vari":"Dynamic02", +"vari":"Dynamic03", +"feed":"nl", +"text":"Parkolás helye:", +"vari":"location", +"text":"Összeg: ", +"vari":"Dynamic04", "feed":"nl", -"":"" } diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 4f68fb3..2a7679f 100644 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,5 +1,30 @@ -{ -"title":"DC2C_pri02", -"version":"27.02.2023 12:20 00001", -"":"" -} +{ +"title":"DC2C_pri02", +"project":"DBM Szeged park_coins", +"issued":"13.04.2023 01.01", +"text":"Kiadás időpontja:", +"vari":"date us", +"vari":"time long", +"text":"Automata száma: ", +"vari":"manu", +"feed":"nl", +"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", +} + + diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 70d3229..f309da3 100644 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -1,5 +1,20 @@ -{ -"title":"DC2C_pri03", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri03", +"project":"DBM Szeged park_coins", +"issued":"13.04.2023 01.01", +"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", +} + + From 50c5549834fb37af9347fa4e0babff12a9c0928c Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 17 Apr 2023 12:40:32 +0200 Subject: [PATCH 06/34] Fixed JSON-typo --- etc/psa_config/DC2C_print01.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index e642699..2976a7d 100644 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -31,6 +31,6 @@ "text":"Összeg: ", "vari":"Dynamic04", "feed":"nl", +"":"" } - From ad110349d80f99d63061b3c3ae073daf45968e8e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 17 Apr 2023 12:41:33 +0200 Subject: [PATCH 07/34] Fixed JSON-typo --- etc/psa_config/DC2C_print02.json | 1 + etc/psa_config/DC2C_print03.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 2a7679f..307dfc8 100644 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -25,6 +25,7 @@ "feed":"nl", "text":"Üf. szolg nyitvatartás:", "feed":"nl", +"":"" } diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index f309da3..772428a 100644 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -14,7 +14,8 @@ "feed":"nl", "feed":"nl", "feed":"nl", -"feed":"eject", +"feed":"eject",i +"":"" } From ce9ecc509c02250f9ffac993a7ef2cce507fdaf2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 24 Apr 2023 12:43:46 +0200 Subject: [PATCH 08/34] Add tariff files for szeged --- etc/psa_tariff/tariff01.json | 4 +--- etc/psa_tariff/tariff02.json | 5 +---- etc/psa_tariff/tariff03.json | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index e684470..3500620 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -1,3 +1 @@ -{"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}]} - -\n\n +{"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":17,"pop_label":"Zone 1","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":55,"pop_carry_over":1}],"PaymentRate":[{"pra_payment_option_id":17,"pra_payment_unit_id":3,"pra_price":220}],"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}]} diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 09dcdc0..712a28b 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -1,4 +1 @@ -{ - - -} +{"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}]} diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index e69de29..b97a710 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -0,0 +1 @@ +{"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":23,"pop_label":"Zone 3","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":23,"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":550,"pwd_period_week_day_id":33,"pwd_period_day_in_week_id":1,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":551,"pwd_period_week_day_id":33,"pwd_period_day_in_week_id":2,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":552,"pwd_period_week_day_id":33,"pwd_period_day_in_week_id":3,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":553,"pwd_period_week_day_id":33,"pwd_period_day_in_week_id":4,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":554,"pwd_period_week_day_id":33,"pwd_period_day_in_week_id":5,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":555,"pwd_period_week_day_id":33,"pwd_period_day_in_week_id":6,"pwd_time_from":"08:00:00","pwd_time_to":"12: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}]} \ No newline at end of file From bbd65667720e7bf81da89cb3f134c2982c59594b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 14:57:07 +0200 Subject: [PATCH 09/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index e69de29..0967ef4 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -0,0 +1 @@ +{} From 26d3c61c7d272d98609b4493f1995200c05cff1d Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 15:02:42 +0200 Subject: [PATCH 10/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 0967ef4..311847d 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1 +1,2 @@ {} + From a668dfbe3f2e26b3703c1ca481df7ce0897dfcc2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 15:06:42 +0200 Subject: [PATCH 11/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 311847d..5cf32ec 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,2 +1,3 @@ {} + From 731dfcf961b891b73d941c051fb499f37ca24f79 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 15:07:34 +0200 Subject: [PATCH 12/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 5cf32ec..ce789d0 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,3 +1,4 @@ {} + From 80e38a84825ddbe54e0ba0b764aea99315d9a187 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 15:10:11 +0200 Subject: [PATCH 13/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index ce789d0..e3a63af 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -2,3 +2,4 @@ + From 040f15bc0ed643b058b7322523fd32fe87f39600 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 15:16:19 +0200 Subject: [PATCH 14/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index e3a63af..bcd6314 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -2,4 +2,5 @@ +dfasdf From 05fe40a2e635cdc3d2d8ea87e221169ac4212cde Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 8 Jul 2022 15:20:18 +0200 Subject: [PATCH 15/34] test --- etc/psa_tariff/tariff04.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index bcd6314..a0eae7f 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -3,4 +3,4 @@ dfasdf - +yyyyy From cd85b2c6e9dbc2407ab85eb56135fd3464a98135 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 10:34:17 +0200 Subject: [PATCH 16/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index a0eae7f..9c18b82 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -4,3 +4,4 @@ dfasdf yyyyy +rrrr From 93ba8215b92086067dbd802872bef559a8e5cdb8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 10:39:48 +0200 Subject: [PATCH 17/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 9c18b82..444c91f 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -5,3 +5,4 @@ dfasdf yyyyy rrrr +uuuu From f248f3f85f3dc388192cec09ceeb1310ed0f6d3e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 10:50:10 +0200 Subject: [PATCH 18/34] try to use blob and commit for changed file --- .githooks/post-merge | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index 52b4ebb..3dbb445 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -23,28 +23,34 @@ get_blob () { # get the blob of the file(name) passed as $1 } get_commit_for_blob () { - blob=$(get_blob $1) - if [ ! -z $blob ]; then + if [ ! -z $1 ]; then # search for the blob in all commits for the file(name) $1 echo $(echo $(git log --all --pretty=format:%H -- $1) | xargs -I{} bash -c "git ls-tree {} -- $1 | - grep -q $blob && echo {}") + grep -q $1 && echo {}") fi } changed_file_names () { for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do + # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json + # add '/' prefix + fn=$(echo $fn | awk '{ printf "/"$0 }') CHANGED_FILE_NAMES+=($fn) done } for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then - fsize=0 + # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json + # add '/' prefix + fn=$(echo $fn | awk '{ printf "/"$0 }') if [[ -f "$fn" ]]; then + blob=$(get_blob "$fn") + commit=$(get_commit_for_blob $blob) fsize=$(ls -l "$fn" | awk '{ print $5 }') + echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP fi - echo "$fn $fsize" >> $GIT_PULL_TMP fi if grep -E -q ".*opkg_commands" <<< $fn; then readarray opkg_commands < <(cat $fn) From dcc7397232ab72ed61bc639356296b8fb0cbf45f Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 10:56:43 +0200 Subject: [PATCH 19/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 444c91f..e5c42f4 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -6,3 +6,4 @@ dfasdf yyyyy rrrr uuuu +hhhhhhhhhhhhhhhhhh From b6a999e014c6c572cf51d7d111fb8a0263b8db8b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 10:59:55 +0200 Subject: [PATCH 20/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index e5c42f4..4598e01 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -7,3 +7,4 @@ yyyyy rrrr uuuu hhhhhhhhhhhhhhhhhh +uuuuuu From abf75d636b3919d5f21e6f067e0b6478610227ba Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:01:22 +0200 Subject: [PATCH 21/34] assum blob not empty --- .githooks/post-merge | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index 3dbb445..0b91abc 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -23,12 +23,10 @@ get_blob () { # get the blob of the file(name) passed as $1 } get_commit_for_blob () { - if [ ! -z $1 ]; then - # search for the blob in all commits for the file(name) $1 - echo $(echo $(git log --all --pretty=format:%H -- $1) | - xargs -I{} bash -c "git ls-tree {} -- $1 | - grep -q $1 && echo {}") - fi + # search for the blob in all commits for the file(name) $1 + echo $(echo $(git log --all --pretty=format:%H -- $1) | + xargs -I{} bash -c "git ls-tree {} -- $1 | + grep -q $1 && echo {}") } changed_file_names () { @@ -49,7 +47,7 @@ for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do blob=$(get_blob "$fn") commit=$(get_commit_for_blob $blob) fsize=$(ls -l "$fn" | awk '{ print $5 }') - echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP + echo "$fn $fsize b=$blob c=$commit" >> $GIT_PULL_TMP fi fi if grep -E -q ".*opkg_commands" <<< $fn; then From 22b1efd66eb5d4eeaaea6204c6de0eb511d20504 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:09:17 +0200 Subject: [PATCH 22/34] Try fo fix evaluating last-commit... --- .githooks/post-merge | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index 0b91abc..f02162e 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -24,9 +24,7 @@ get_blob () { # get the blob of the file(name) passed as $1 get_commit_for_blob () { # search for the blob in all commits for the file(name) $1 - echo $(echo $(git log --all --pretty=format:%H -- $1) | - xargs -I{} bash -c "git ls-tree {} -- $1 | - grep -q $1 && echo {}") + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1 | grep -q $1 && echo {}") } changed_file_names () { From fb2d0cf506214f2ab9b36925d19490f352b52c55 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:09:38 +0200 Subject: [PATCH 23/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 4598e01..1ef074a 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -8,3 +8,4 @@ rrrr uuuu hhhhhhhhhhhhhhhhhh uuuuuu +ooooo From 009b5c0170afe077470c2cc3d07c27d9bd7766bc Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:12:26 +0200 Subject: [PATCH 24/34] removed changed_file_names --- .githooks/post-merge | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index f02162e..993fe49 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -27,15 +27,6 @@ get_commit_for_blob () { echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1 | grep -q $1 && echo {}") } -changed_file_names () { - for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do - # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json - # add '/' prefix - fn=$(echo $fn | awk '{ printf "/"$0 }') - CHANGED_FILE_NAMES+=($fn) - done -} - for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json From 6de220b8ba19b6602f4b868a421e9a699f100241 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:14:34 +0200 Subject: [PATCH 25/34] test --- etc/psa_tariff/tariff04.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 1ef074a..0967ef4 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,11 +1 @@ {} - - - -dfasdf -yyyyy -rrrr -uuuu -hhhhhhhhhhhhhhhhhh -uuuuuu -ooooo From 13b3af1f9273c4361155eb6de12af9cdbb5f556e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:18:54 +0200 Subject: [PATCH 26/34] debugging ... --- .githooks/post-merge | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.githooks/post-merge b/.githooks/post-merge index 993fe49..8706448 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -24,6 +24,11 @@ get_blob () { # get the blob of the file(name) passed as $1 get_commit_for_blob () { # search for the blob in all commits for the file(name) $1 + echo $1 >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1) >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{}) >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1") >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1 | grep -q $1 && echo {}") } From 5beba99abba8c17b3b4f1cf62865a235b8f94f4a Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:19:29 +0200 Subject: [PATCH 27/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 0967ef4..311847d 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1 +1,2 @@ {} + From cca348425666081ac43bbe8e636370c7071b91a0 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:23:09 +0200 Subject: [PATCH 28/34] debugging ... --- .githooks/post-merge | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index 8706448..567511a 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -25,11 +25,11 @@ get_blob () { # get the blob of the file(name) passed as $1 get_commit_for_blob () { # search for the blob in all commits for the file(name) $1 echo $1 >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $1) >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $1 | xargs -I{}) >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1") >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $2) >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $2 | xargs -I{}) >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $2 | xargs -I{} bash -c "git ls-tree {} -- $2") >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1 | grep -q $1 && echo {}") + echo $(git log --all --pretty=format:%H -- $2 | xargs -I{} bash -c "git ls-tree {} -- $2 | grep -q $1 && echo {}") } for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do @@ -39,7 +39,7 @@ for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do fn=$(echo $fn | awk '{ printf "/"$0 }') if [[ -f "$fn" ]]; then blob=$(get_blob "$fn") - commit=$(get_commit_for_blob $blob) + commit=$(get_commit_for_blob $blob "$fn") fsize=$(ls -l "$fn" | awk '{ print $5 }') echo "$fn $fsize b=$blob c=$commit" >> $GIT_PULL_TMP fi From 123291a2c27f7a29bd8414ad6c70978bae3ae911 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:24:07 +0200 Subject: [PATCH 29/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 311847d..5cf32ec 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,2 +1,3 @@ {} + From 0fbea3a260aed9bb511678bfbb9ee9855908f170 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:41:49 +0200 Subject: [PATCH 30/34] use filename for getting commit, not the blob of the file --- .githooks/post-merge | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index 567511a..21eb6e6 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -24,12 +24,9 @@ get_blob () { # get the blob of the file(name) passed as $1 get_commit_for_blob () { # search for the blob in all commits for the file(name) $1 - echo $1 >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $2) >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $2 | xargs -I{}) >> /tmp/blob - echo $(git log --all --pretty=format:%H -- $2 | xargs -I{} bash -c "git ls-tree {} -- $2") >> /tmp/blob - - echo $(git log --all --pretty=format:%H -- $2 | xargs -I{} bash -c "git ls-tree {} -- $2 | grep -q $1 && echo {}") + echo $(git log --all --pretty=format:%H -- $2 | + xargs -I{} bash -c "git ls-tree {} -- $2 | + grep -q $1 && echo -n {} && head -n 1") } for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do @@ -41,7 +38,7 @@ for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do blob=$(get_blob "$fn") commit=$(get_commit_for_blob $blob "$fn") fsize=$(ls -l "$fn" | awk '{ print $5 }') - echo "$fn $fsize b=$blob c=$commit" >> $GIT_PULL_TMP + echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP fi fi if grep -E -q ".*opkg_commands" <<< $fn; then From 4a3ac3272421470580524d177a4a729c912ce38c Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:42:30 +0200 Subject: [PATCH 31/34] test --- etc/psa_tariff/tariff04.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 5cf32ec..b8116fa 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,3 +1 @@ -{} - - +{"":""} From 378de9200c6adbef8da0721ab02bf28282edda94 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 11:50:40 +0200 Subject: [PATCH 32/34] use a better name for file: git_changed_files_for_last_pull --- .githooks/post-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.githooks/post-merge b/.githooks/post-merge index 21eb6e6..8793b5d 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -11,7 +11,7 @@ if [ -z $IFS ]; then IFS=$'\n' fi -GIT_PULL_TMP=/tmp/git_pull +GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull OPKG_CMDS_TMP=/tmp/opkg_commands rm -f $GIT_PULL_TMP From 61c9253239025f0a840ba2075322602edce00509 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 25 Apr 2023 13:07:28 +0200 Subject: [PATCH 33/34] test --- etc/psa_tariff/tariff04.json | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index b8116fa..2528c0e 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1 +1,2 @@ {"":""} + From dc68633378820a8538349d04e247da32b1099d24 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 4 May 2023 10:54:08 +0200 Subject: [PATCH 34/34] Add tariff-file for zone 4 --- etc/psa_tariff/tariff04.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 2528c0e..3500620 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,2 +1 @@ -{"":""} - +{"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":17,"pop_label":"Zone 1","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":55,"pop_carry_over":1}],"PaymentRate":[{"pra_payment_option_id":17,"pra_payment_unit_id":3,"pra_price":220}],"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}]}