set service fridays: 8-18

Add holiday 2024-12-28. Switch back to normal handling of Saturdays.
additional holidays 2024/2025
2025-01-07 10:48:33 +01:00 · 2024-12-16 15:53:37 +01:00 · 2024-12-03 13:50:38 +01:00 · 2024-12-02 17:13:36 +01:00 · 2024-10-29 15:34:00 +01:00 · 2024-08-08 12:25:40 +02:00
10 changed files with 34 additions and 144 deletions
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,10 +11,8 @@ if [ -z $IFS ]; then
    IFS=$'\n'
 fi
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
 #TODO: use in UpdateController
 get_blob () {   # get the blob of the file(name) passed as $1
@@ -29,7 +27,6 @@ get_commit_for_blob () {
           grep -q $1 && echo -n {} && head -n 1")
 }
 write_log_file () {
    local now=$(date +"%Y-%m-%dT%T")
    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,16 @@
 # First, ignore everything
 *
 # Now, whitelist anything that's a directory
 !*/
 # And all the file types you're interested in
 !.gitignore
 !.githooks/post-merge
 !.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
 !**/.githooks/post-checkout
 ## Except
-!etc/atb/*
+!**/.gitignore
-!etc/psa_config/*
+!**/.githooks/post-merge
-!etc/psa_update/*
+!/etc/*.ini
-!etc/psa_tariff/*
+!/etc/atb/*.ini
-!etc/dc/*.hex
+!/etc/psa_config/*
-!etc/dc/*.bin
+!/etc/psa_update/*
-!*/etc/*.ini
+!/etc/psa_tariff/*
-!*/etc/atb/*
+!/etc/dc/dc2c.hex
-!*/etc/psa_config/*
+
-!*/etc/psa_update/*
+!/opt/app/ATBAPP/*.ini
-!*/etc/psa_tariff/*
+!/opt/app/sysconfig/*.ini
-!*/etc/dc/*.hex
+!/opt/app/ISMASMgr/*.ini
 !*/etc/dc/*.bin
--- a/etc/psa_tariff/.tariff04.json.swp
+++ b/etc/psa_tariff/.tariff04.json.swp
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -249,13 +249,6 @@
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
      "pedwt_period_exc_day_id": 2021,
@@ -483,14 +476,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -248,13 +248,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -482,14 +475,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },    
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -103,6 +103,13 @@
      "pwd_period_day_in_week_id": 5,
      "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": 6,
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "12:00:00"
    }
  ],
  "PeriodYear": [
@@ -248,13 +255,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -482,14 +482,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -270,13 +270,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -646,14 +639,7 @@
      "ped_year": 0
    },
    {
-      "ped_id": 15,
+      "ped_id": 2022,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {"ped_id": 2022,
      "ped_label": "NewYear",
      "ped_date_start": "2025-01-01",
      "ped_date_end": "2025-01-01",
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -277,20 +277,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 16,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -658,14 +644,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
@@ -748,8 +726,8 @@
      "ped_year": 0
    },
    {
-      "ped_id": 16,
+      "ped_id": 2032,
-      "ped_label": "Saints Day",
+      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -277,20 +277,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },    
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 16,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -658,14 +644,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
@@ -748,8 +726,8 @@
      "ped_year": 0
    },
    {
-      "ped_id": 16,
+      "ped_id": 2032,
-      "ped_label": "Saints Day",
+      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -5,14 +5,14 @@
 ###############################################################################
 ##
 opkg update
-# opkg install prepare-update
+opkg install prepare-update
 # download packages
-# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
+opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
-# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
-# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
-opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.9+git0+fa9d02636f-r0
+opkg --cache /var/cache/opkg --download-only upgrade atbqt
 # install packages
-# opkg --cache /var/cache/opkg upgrade tariff-config-281
+opkg --cache /var/cache/opkg upgrade tariff-config-281
-# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
-# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
-opkg --cache /var/cache/opkg upgrade atbqt=4.99.9+git0+fa9d02636f-r0
+opkg --cache /var/cache/opkg upgrade atbqt
Author	SHA1	Message	Date
Gerhard Hoffmann	c39fd73850	set service fridays: 8-18	2025-01-07 10:48:33 +01:00
Gerhard Hoffmann	a683bc6eda	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:53:37 +01:00
Gerhard Hoffmann	d66865093b	additional holidays 2024/2025	2024-12-03 13:50:38 +01:00
Gerhard Hoffmann	f21f024612	Adapt for Saturday 07/12	2024-12-02 17:13:36 +01:00
Gerhard Hoffmann	18ef7c4a76	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:34:00 +01:00
Gerhard Hoffmann	7bcf969ecf	Revert to original versions	2024-08-08 12:25:40 +02:00
Gerhard Hoffmann	f911cfd283	set 8:00-18:00 for 03.08	2024-08-01 12:40:43 +02:00
Gerhard Hoffmann	e6b37d798e	Activate opkg_commands	2024-07-15 08:56:51 +02:00
Gerhard Hoffmann	6842fe7416	opkg: none	2024-07-08 13:40:02 +02:00
Gerhard Hoffmann	6a268783e5	Set ex.rate to 365.	2024-07-05 10:04:45 +02:00
Gerhard Hoffmann	9ce4a1e25c	changed version date for testing	2024-07-01 14:44:28 +02:00
Gnemeth	c5d9ad6493	euro exchange rate update	2024-06-30 19:13:35 +02:00
Gerhard Hoffmann	bac6f5d7b5	re-commit: change of ISMAS settings	2024-06-25 08:39:09 +02:00
Gerhard Hoffmann	1cb16b14e0	ZoneId in tariff-files	2024-06-24 11:35:46 +02:00
Siegfried Siegert	1ed35086a8	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:12:55 +02:00
Gerhard Hoffmann	d58b9204d3	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:34:36 +02:00
Gerhard Hoffmann	a01b0a6f87	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:52:12 +02:00
Gerhard Hoffmann	3e41b2f809	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:12:19 +02:00
Gerhard Hoffmann	2763b42ff2	Use empty file.	2024-04-18 16:11:28 +02:00
Gerhard Hoffmann	8aabc564e3	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:10:49 +01:00
Gerhard Hoffmann	ddf0344d6f	added empty lines to restart download	2024-03-28 11:58:29 +01:00
Gerhard Hoffmann	a4b30b3121	even remove opkg update	2024-03-26 10:07:16 +01:00
Gerhard Hoffmann	95510b3181	only install prepare-update script	2024-03-26 09:52:49 +01:00
Gerhard Hoffmann	1af2ff388e	Removed all holidays except thos for 2024	2024-03-26 09:41:17 +01:00
Gerhard Hoffmann	76c4701618	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:32:02 +01:00
Gerhard Hoffmann	36c482cb43	tariff01.json: set min-price: 165 / 4 -> 45 tariff02.json: set min-price: 260 / 4 -> 65 tariff03.json: set min-price: 360 / 4 -> 90 tariff04.json: set min-price: 650 / 4 -> 165 tariff05.json: set min-price: 360 / 4 -> 90 tariff06.json: set min-price: 650 / 4 -> 165	2024-02-15 14:28:30 +01:00
Gerhard Hoffmann	034e39012c	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:46:15 +01:00
Gerhard Hoffmann	c203ac7d0f	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:44:43 +01:00
Gerhard Hoffmann	e6cc19e115	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 11:01:36 +01:00
Gerhard Hoffmann	6ea43413ce	Update exchange rate to 352.	2023-12-31 08:18:25 +01:00
Gerhard Hoffmann	af08704d6d	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:09:18 +01:00
Gerhard Hoffmann	95b7255ea7	switch back to previous prices until 01.01.2024	2023-12-23 08:34:41 +01:00
Gerhard Hoffmann	8016f87136	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:26:28 +01:00
Gerhard Hoffmann	33ddbd7ce0	Remove dc-files (to be used later)	2023-12-20 13:57:01 +01:00
Gerhard Hoffmann	91db42b4b2	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:52:57 +01:00
Gerhard Hoffmann	6a485e95de	Reset to previous prices keeping current holidays	2023-12-20 12:52:50 +01:00
Gerhard Hoffmann	75e167f96e	Updated to use new prices.	2023-12-19 16:50:36 +01:00
Gerhard Hoffmann	711bf8fb25	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:58:40 +01:00
Gerhard Hoffmann	36e6d8fc4f	delete all json files	2023-12-19 13:56:10 +01:00
Gerhard Hoffmann	2427928c3c	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:57:52 +01:00
Gerhard Hoffmann	f0a9aa44a4	switch back to previous prices, but keeping current holidays	2023-12-19 11:18:49 +01:00
Gerhard Hoffmann	ac9f4c86ca	tariff01: new price: 165 new daily price: 990 tariff02: new price: 260 new daily price: 1560 tariff03: new price: 360 new daily price: 2160 tariff04: new price: 650 Set new holidays starting from Dec. 2023.	2023-12-18 14:44:44 +01:00
Gerhard Hoffmann	18e2c5db94	Fixed wrong comma after exchange rate	2023-10-11 14:15:23 +02:00
Gerhard Hoffmann	7fd4352798	set exchange rate to 360	2023-10-10 16:31:14 +02:00
Gerhard Hoffmann	acf30adc5e	remove obsolete file	2023-08-11 12:38:36 +02:00
Gerhard Hoffmann	cb789aa34f	Install ptu5-gitinstaller, atbupdatetool and atbqt.	2023-08-11 12:37:17 +02:00
Gerhard Hoffmann	36a0d74ac1	set daily cardprice to 2400	2023-08-03 15:44:53 +02:00
Gerhard Hoffmann	89d2812724	add json files for zones 5 and 6	2023-08-03 15:32:38 +02:00
Gerhard Hoffmann	d23139f5af	add another empty line	2023-07-25 17:21:11 +02:00
Gerhard Hoffmann	d5425192b6	add empty line	2023-07-25 17:15:07 +02:00
Gerhard Hoffmann	8b25cd70b3	Set carry over to 1, daily_price to 2400	2023-07-25 16:07:54 +02:00
Gerhard Hoffmann	9f83afce3a	add another empty line	2023-07-25 14:07:30 +02:00
Gerhard Hoffmann	c958ed2632	add another empty line	2023-07-25 12:39:16 +02:00
Gerhard Hoffmann	583955df67	add 2 other lines	2023-07-25 12:15:18 +02:00
Gerhard Hoffmann	a6a8ad436a	add another testline	2023-07-25 11:50:10 +02:00
Gerhard Hoffmann	33e9f2a3f2	add another empty line for testing	2023-07-25 11:36:02 +02:00
Gerhard Hoffmann	6117764e42	add new line	2023-07-25 11:29:24 +02:00
Gerhard Hoffmann	55f23b4099	Set max_time to 240	2023-07-25 10:13:18 +02:00
Gerhard Hoffmann	9443f5c372	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:43 +02:00
Gerhard Hoffmann	1b9e55592f	Update json-printer-files (provided by Dennis)	2023-07-06 15:11:59 +02:00
Gerhard Hoffmann	92e8e0946d	remove handling og checkout_history file	2023-07-04 14:01:23 +02:00
Gerhard Hoffmann	c272d9013d	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:48 +02:00
Gerhard Hoffmann	1dd56a5084	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:15:07 +02:00
Gerhard Hoffmann	236c4ea33a	Add some debug output	2023-07-04 10:56:43 +02:00
Gerhard Hoffmann	c8dc474476	Add some debug output	2023-07-04 10:54:24 +02:00
Gerhard Hoffmann	8d87f21cce	Add some debug output	2023-07-04 10:52:24 +02:00
Gerhard Hoffmann	3c32455a12	Merge branch 'zg1/zone4' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone4	2023-07-04 10:44:59 +02:00
Gerhard Hoffmann	8679da9be4	Use OPKG_COMMANDS_FILE in repository, not in global file-system	2023-07-04 10:44:47 +02:00
Siegfried Siegert	f8178f1f7f	pr	2023-07-02 16:30:39 +02:00
Gerhard Hoffmann	2bc06c4027	return to normal workflow after testing	2023-06-30 10:52:03 +02:00
Gerhard Hoffmann	24a06b54f3	Provide opkg commands for zone4	2023-06-29 14:31:50 +02:00
Gerhard Hoffmann	0daa7cb254	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:25:34 +02:00
Gerhard Hoffmann	e40c1b54c8	Adding device-controller firmware version 4.35	2023-06-27 16:25:08 +02:00
Gerhard Hoffmann	f4771cb2be	remove obsolete file	2023-06-27 16:24:22 +02:00
Gerhard Hoffmann	760819d4e8	sync post-checkout/merge-hooks with zg/zone1	2023-06-27 14:45:43 +02:00
Gerhard Hoffmann	e4ce5cbd84	sync tariff-files with zg1/zone1	2023-06-27 14:44:33 +02:00
Gerhard Hoffmann	fa90fa90e9	remove unused tariff-files	2023-06-27 14:43:18 +02:00
Gerhard Hoffmann	9f2525e503	Set daily_card_price to 2400 for zone4	2023-06-27 14:22:09 +02:00
Gerhard Hoffmann	cc62a9b139	check for existence of opkg_commands-file (2)	2023-06-05 15:58:43 +02:00
Gerhard Hoffmann	2d27a8a6d4	check for existence of opkg_commands-file	2023-06-05 15:52:57 +02:00
Gerhard Hoffmann	2618ee154d	adding post-checkout hook ad for zone1	2023-06-05 15:47:26 +02:00
Gerhard Hoffmann	4f5a45f096	Add device controller version 4.22	2023-05-31 08:59:27 +02:00
Gerhard Hoffmann	3e7ae97312	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:22:03 +02:00
Gerhard Hoffmann	df2ca1901e	Add DC-version 4.21	2023-05-24 16:21:58 +02:00
Gerhard Hoffmann	bb812c882b	Updating print templates as of May 11, 2023.	2023-05-18 12:17:22 +02:00
Gerhard Hoffmann	044b9e6834	Add tariff-file for zone 4	2023-05-04 10:56:37 +02:00
Gerhard Hoffmann	8828b75917	Update as for branch zg1/zone1	2023-04-25 11:53:13 +02:00
Gerhard Hoffmann	4e4320c4a2	test	2022-07-08 14:55:05 +02:00
Gerhard Hoffmann	7013aeea3e	test	2022-07-08 14:52:35 +02:00
Gerhard Hoffmann	abc5bc57d4	Removed *.ini-Files.	2023-03-31 11:46:18 +02:00
Gerhard Hoffmann	d7168d096f	Add .gitignore	2023-03-31 09:51:11 +02:00