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

restore tariff files after special day at 17th of May
comment all opkg lines
2025-05-22 11:06:14 +02:00 · 2025-05-20 10:08:37 +02:00 · 2025-05-12 09:47:54 +02:00 · 2025-05-12 08:52:51 +02:00 · 2025-01-07 10:42:11 +01:00 · 2024-12-16 15:49:08 +01:00
4 changed files with 3 additions and 28 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,28 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	symlinks = true
-[remote "origin"]
-	url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
-	remote = origin
-	merge = refs/heads/master
-[branch "zg1/zone1"]
-	remote = origin
-	merge = refs/heads/zg1/zone1
-[branch "zg1/zone2"]
-	remote = origin
-	merge = refs/heads/zg1/zone2
-[branch "zg1/zone3"]
-	remote = origin
-	merge = refs/heads/zg1/zone3
-[branch "zg1/zone4"]
-	remote = origin
-	merge = refs/heads/zg1/zone4
-[pull]
-	rebase = false
-[push]
-	autoSetupRemote = true
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,8 +11,10 @@ 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
@@ -27,6 +29,7 @@ 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/README.md
+++ b/README.md
--- a/etc/psa_tariff/.tariff04.json.swp
+++ b/etc/psa_tariff/.tariff04.json.swp
Author	SHA1	Message	Date
Gerhard Hoffmann	de4775b25b	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:06:14 +02:00
Gerhard Hoffmann	ad69e5d3d9	restore tariff files after special day at 17th of May	2025-05-20 10:08:37 +02:00
Gerhard Hoffmann	e271588861	comment all opkg lines	2025-05-12 09:47:54 +02:00
Gerhard Hoffmann	2008f023d3	special saturday 2025/05/17	2025-05-12 08:52:51 +02:00
Gerhard Hoffmann	a04cb8c3b2	set service fridays: 8-18	2025-01-07 10:42:11 +01:00
Gerhard Hoffmann	3b45a157a7	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:49:08 +01:00
Gerhard Hoffmann	36b3c0a7f1	additional holidays 2024/2025	2024-12-03 13:48:20 +01:00
Gerhard Hoffmann	4e4274bb95	Adapt for Saturday 07/12	2024-12-02 17:08:31 +01:00
Gerhard Hoffmann	c53504b14d	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:32:19 +01:00
Gerhard Hoffmann	1a6c5836bc	Revert to original versions	2024-08-08 12:23:14 +02:00
Gerhard Hoffmann	4e64df50d7	set 8:00-18:00 for 03.08	2024-08-01 12:38:27 +02:00
Gerhard Hoffmann	c4dd836ee3	Activate opkg_commands	2024-07-15 08:54:40 +02:00
Gerhard Hoffmann	cab404e238	opkg: none	2024-07-08 13:37:38 +02:00
Gerhard Hoffmann	84b2b1ca27	Set ex.rate to 365.	2024-07-05 09:40:22 +02:00
Gerhard Hoffmann	e245ae27a0	Set ex.rate to 365.	2024-07-05 09:31:39 +02:00
Gerhard Hoffmann	4f5fcfe7b5	re-commit: change of ISMAS settings	2024-06-25 08:36:21 +02:00
Gerhard Hoffmann	caa7030a97	ZoneId in tariff-files	2024-06-24 11:31:03 +02:00
Siegfried Siegert	3657e299b3	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2024-06-07 08:15:14 +02:00
Siegfried Siegert	bad9bb1103	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:11:51 +02:00
Gerhard Hoffmann	acc80f2c04	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:33:33 +02:00
Gerhard Hoffmann	503e355667	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:51:06 +02:00
Gerhard Hoffmann	6cad56650b	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:10:20 +02:00
Gerhard Hoffmann	6318b15756	Use empty file.	2024-04-18 16:09:50 +02:00
Gerhard Hoffmann	a523fe72c3	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:09:45 +01:00
Gerhard Hoffmann	8fde0a4f4d	added empty lines to restart download	2024-03-28 11:57:17 +01:00
Gerhard Hoffmann	cb7a17cdad	even remove opkg update	2024-03-26 10:06:16 +01:00
Gerhard Hoffmann	2702208167	only install prepare-update script	2024-03-26 09:51:41 +01:00
Gerhard Hoffmann	2c0fd877ab	Removed all holidays except thos for 2024	2024-03-26 09:40:11 +01:00
Gerhard Hoffmann	59cd4bfb7e	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:29:34 +01:00
Gerhard Hoffmann	0cfd6b7071	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:26:37 +01:00
Gerhard Hoffmann	443961ca5d	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:45:05 +01:00
Gerhard Hoffmann	c2c21df05a	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:43:35 +01:00
Gerhard Hoffmann	053d554c45	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 10:59:14 +01:00
Gerhard Hoffmann	048ef21538	Update exchange rate to 352.	2023-12-31 08:16:57 +01:00
Gerhard Hoffmann	19b8b6ba28	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:08:07 +01:00
Gerhard Hoffmann	1e2b4bcc7d	switch back to previous prices until 01.01.2024	2023-12-23 08:33:34 +01:00
Gerhard Hoffmann	aa32676431	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:24:51 +01:00
Gerhard Hoffmann	a9b9fd75bf	Remove dc-files (to be used later)	2023-12-20 13:55:56 +01:00
Gerhard Hoffmann	60a375a773	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:50:58 +01:00
Gerhard Hoffmann	b4c50748ba	Reset to previous prices keeping current holidays	2023-12-20 12:50:39 +01:00
Gerhard Hoffmann	c3c07329b6	Updated to use new prices.	2023-12-19 16:49:12 +01:00
Gerhard Hoffmann	d14dc38340	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:57:18 +01:00
Gerhard Hoffmann	ecabc589d8	delete all json files	2023-12-19 13:54:09 +01:00
Gerhard Hoffmann	6e756202d7	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:56:39 +01:00
Gerhard Hoffmann	d478ce44ab	switch back to previous prices, but keeping current holidays	2023-12-19 11:17:30 +01:00
Gerhard Hoffmann	1746b94678	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:42:54 +01:00
Gerhard Hoffmann	1f54b1ec90	Fixed wrong comma after exchange rate	2023-10-11 14:13:59 +02:00
Gerhard Hoffmann	e1c39f1df6	set exchange rate to 360	2023-10-10 16:29:38 +02:00
Siegfried Siegert	2d65b9ba14	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-09-18 17:18:26 +02:00
Siegfried Siegert	38386d7aed	Update test 20230811113644-00281	2023-09-18 17:16:56 +02:00
Gerhard Hoffmann	e9dc8f6e10	Remove ini-file (used for testing) and obsolete tariff.current file.	2023-08-11 12:44:07 +02:00
Gerhard Hoffmann	2cc7ec9dc7	Install ptu5-gitinstaller, atbupdatetool and atbqt.	2023-08-11 12:43:10 +02:00
Gerhard Hoffmann	25e9e014de	set useLanguage 240 -> 248	2023-08-10 16:37:45 +02:00
Gerhard Hoffmann	0657b3ea27	install apism via opkg	2023-08-09 16:21:48 +02:00
Gerhard Hoffmann	5629444870	Appended a dateline. Set useLanguage 248 -> 240	2023-08-09 16:20:08 +02:00
Gerhard Hoffmann	9461dfafb0	add another line for testing	2023-08-09 10:20:38 +02:00
Gerhard Hoffmann	5a25611a39	240 -> 248	2023-08-09 10:16:51 +02:00
Gerhard Hoffmann	73f5bfd568	add another line for testing	2023-08-09 10:13:42 +02:00
Gerhard Hoffmann	4331c32dc5	Add file for testing. 248 -> 240 for useLanguage	2023-08-09 09:58:28 +02:00
Gerhard Hoffmann	23e5e1339e	appended datelien for testing	2023-08-09 09:54:41 +02:00
Gerhard Hoffmann	5d9882c569	set daily cardprice to 2400	2023-08-03 15:44:06 +02:00
Gerhard Hoffmann	6ed893f3fc	add json files for zones 5 and 6	2023-08-03 15:30:58 +02:00
Gerhard Hoffmann	69e3fbe55a	use same tariff-file as branch for zone4	2023-07-26 14:48:20 +02:00
Gerhard Hoffmann	d72bafb8d7	Set max_time to 240	2023-07-25 10:15:11 +02:00
Gerhard Hoffmann	0b7614c2d9	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:17 +02:00
Gerhard Hoffmann	de0b5a3e70	Update json-printer-files (provided by Dennis)	2023-07-06 15:10:50 +02:00
Gerhard Hoffmann	e9fa1e6dd5	remove file in wrong localtion	2023-07-06 15:10:14 +02:00
Gerhard Hoffmann	ee0a06ba0b	remove handling og checkout_history file	2023-07-04 14:00:48 +02:00
Gerhard Hoffmann	96a1db1fba	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:23 +02:00
Gerhard Hoffmann	1071e8e762	Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone2	2023-07-04 12:14:20 +02:00
Gerhard Hoffmann	794c26ee97	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:14:13 +02:00
Siegfried Siegert	8211505d34	Revert last ATBQT.ini change	2023-06-30 15:42:20 +02:00
Siegfried Siegert	1c08df6da1	Fix: filename	2023-06-30 15:33:45 +02:00
Siegfried Siegert	031c9653f1	Update Test for ATBQT.ini	2023-06-30 15:28:33 +02:00
Siegfried Siegert	9643f36c1d	Add dc2c.4.33.bin for test	2023-06-30 15:13:31 +02:00
Siegfried Siegert	d6ef0ac4a6	Prevent updating atbqt	2023-06-30 15:12:13 +02:00
Siegfried Siegert	bf5bce2be8	DC Update Test	2023-06-30 15:10:13 +02:00
Siegfried Siegert	ef12748e72	Szeged Test	2023-06-30 14:37:52 +02:00
Siegfried Siegert	6a47b52c24	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-30 14:36:47 +02:00
Gerhard Hoffmann	cebda53e85	return to normal workflow after testing	2023-06-30 10:51:32 +02:00
Gerhard Hoffmann	8b5f310464	Provide opkg commands for zone2	2023-06-29 14:30:39 +02:00
Gerhard Hoffmann	db54f86be9	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:21:37 +02:00
Gerhard Hoffmann	cf5b677bfe	Adding device-controller firmware version 4.35	2023-06-27 16:21:28 +02:00
Gerhard Hoffmann	d25e6232e0	install same post-merge-hook as in branch zg1/zone1	2023-06-27 14:32:34 +02:00
Gerhard Hoffmann	8949d1850c	install same post-checkout-hook as in branch zg1/zone1	2023-06-27 14:31:17 +02:00
Gerhard Hoffmann	22d1a9f8a1	Set daily_card_price to 2400 for zone4	2023-06-27 14:17:37 +02:00
Siegfried Siegert	ee70081ab3	Remove old deviceController firmware	2023-06-26 14:37:00 +02:00
Siegfried Siegert	a5f76131ff	Add correct tariff config files	2023-06-25 15:04:58 +02:00
Siegfried Siegert	7ed84450e2	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-25 14:57:42 +02:00
Siegfried Siegert	8b58d78cd8	Remove invalid config files	2023-06-25 14:57:13 +02:00
Siegfried Siegert	fe7c8bf282	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-19 10:37:27 +02:00
Siegfried Siegert	8fdb94ac90	Merge branch 'zg1/zone1' into zg1/zone2	2023-06-19 10:32:20 +02:00
Gerhard Hoffmann	1e629e5fea	check for existence of opkg_commands-file (2)	2023-06-05 15:58:15 +02:00
Gerhard Hoffmann	7939f576a0	check for existence of opkg_commands-file	2023-06-05 15:52:30 +02:00
Gerhard Hoffmann	bbd39fbccb	adding post-checkout hook ad for zone1	2023-06-05 15:46:25 +02:00
Gerhard Hoffmann	8d8cc811c6	Add device controller version 4.22	2023-05-31 08:58:21 +02:00
Gerhard Hoffmann	4d698ffb79	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:20:16 +02:00
Gerhard Hoffmann	e83e1589fb	Adding dc-version 4.21	2023-05-24 16:19:39 +02:00
Gerhard Hoffmann	4bf9efcf3a	Updating print templates as of 11 May, 2023.	2023-05-18 12:15:37 +02:00
Siegfried Siegert	be84634d62	Update ATBQT.ini SysetemControl.ini for Szeged Test	2023-05-05 10:59:31 +02:00
Gerhard Hoffmann	64937d6fb4	Add tariff-file for zone 4	2023-05-04 10:55:28 +02:00
Gerhard Hoffmann	6acc53275d	Update as for branch zg1/zone1	2023-04-25 11:53:41 +02:00
Gerhard Hoffmann	87af143cbd	Removed *.ini-Files.	2023-03-31 11:46:54 +02:00
Gerhard Hoffmann	e46c1f272b	Add .gitignore	2023-03-31 09:51:38 +02:00
Gerhard Hoffmann	73fbc3d5ad	Add handling for binary dc-files	2023-03-30 12:48:33 +02:00