GerhardHoffmann/customer_335
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: GerhardHoffmann:vorbereitung-sommer-tariffe
Branches Tags
GerhardHoffmann:master GerhardHoffmann:zg1/zone5 GerhardHoffmann:zg1/zone4 GerhardHoffmann:zg1/zone3 GerhardHoffmann:zg1/zone2 GerhardHoffmann:zg1/zone1 GerhardHoffmann:zg1/zone6 GerhardHoffmann:vorbereitung-sommer-tariffe
..
compare: GerhardHoffmann:22fe56c6230d19d3025d4fe5d2ae0dfd05f07117
Branches Tags
GerhardHoffmann:zg1/zone5 GerhardHoffmann:zg1/zone4 GerhardHoffmann:zg1/zone3 GerhardHoffmann:zg1/zone2 GerhardHoffmann:zg1/zone1 GerhardHoffmann:master GerhardHoffmann:zg1/zone6 GerhardHoffmann:vorbereitung-sommer-tariffe

47 Commits
vorbereitu ... 22fe56c623

Author SHA1 Message Date
Gerhard Hoffmann
22fe56c623 fixed typo: cach -> cache 2024-12-18 12:01:00 +01:00
Gerhard Hoffmann
3ed3e9d10e Zone5 to be used as update-help: machines in zone5: 10, 11, 31 2024-12-16 13:36:03 +01:00
Gerhard Hoffmann
7c97a54d1c set terminalPowerOnOffHours: 6:00-22:00 2024-12-13 13:02:24 +01:00
Gerhard Hoffmann
ec16ab2bcc Add special handling for 2025-01-01: 2 hours are free of charge. 2024-12-13 13:02:17 +01:00
Siegfried Siegert
b78fc48657 opkg upgrade ptu5-sysconfig 2024-12-11 07:49:37 +01:00
Siegfried Siegert
779913347d opkg: install ptu-package-versions ... 
... upgrade does not work for packages which are not installed
 2024-12-09 17:34:30 +01:00
Siegfried Siegert
0c6127cec2 Systemcontrol: switch on suspendcontroller 2024-12-09 12:47:05 +01:00
Siegfried Siegert
0c41f5ae31 SystemControl: inputBrightness = 30 2024-12-04 12:53:39 +01:00
Siegfried Siegert
163ef2f272 opkg fix: install wbdw 2024-12-03 16:37:56 +01:00
Siegfried Siegert
ed161e53a6 Merge branch 'zg1/zone4' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone4 2024-12-03 16:09:52 +01:00
Siegfried Siegert
a6e73b5b51 opkg: install wbdw 2024-12-03 16:07:37 +01:00
Gerhard Hoffmann
abeeed77c1 Copied from Palanga (336) 2024-11-15 12:46:30 +01:00
Siegfried Siegert
1a9dd6bfe1 Update opkg-commands: install ptu5-systemcontroller 2024-11-13 16:46:39 +01:00
Siegfried Siegert
84d6bc4be0 Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:45:25 +01:00
Siegfried Siegert
d3b73a209d Text: Fix typo 2024-11-05 16:44:54 +01:00
Siegfried Siegert
ec30c26296 Selling process / Card payment: ask for printing receipt 2024-11-05 16:44:49 +01:00
Gerhard Hoffmann
ca2f5966f9 Update files (provided by Thomas) 2024-10-31 12:07:47 +01:00
Gerhard Hoffmann
0d9e763246 Add libmobilisis for download/update 2024-10-08 12:46:08 +02:00
Gerhard Hoffmann
91443c0af8 Update tariff-files for winter term 2024-10-02 16:03:32 +02:00
Gerhard Hoffmann
9671d5129f First step for new tariffs: adapt carry-over-times 2024-09-13 10:26:36 +02:00
Gerhard Hoffmann
a2c8e782d8 Change tariff files according to new settings sent from Eugenijus 2024-09-12 15:41:39 +02:00
Gerhard Hoffmann
771a01b8ae Update as provided by T.Sax. 2024-09-05 08:05:30 +02:00
Gerhard Hoffmann
454d665d94 Add atb-plugin-calculateprice-mobilisis 2024-08-30 11:29:27 +02:00
Gerhard Hoffmann
2d21e7c28b Update jsons as provided by T.Sax 2024-08-27 16:19:20 +02:00
Gerhard Hoffmann
84aa822885 Set DorPrint=0. 2024-08-27 08:42:45 +02:00
Gerhard Hoffmann
e12fb8c591 updated by th.sax 2024-08-22 15:28:17 +02:00
Gerhard Hoffmann
f91f50e7ff new file provided by th.sax 2024-08-22 13:28:16 +02:00
Gerhard Hoffmann
f887e12076 smd 08-20 only with CP1257 2024-08-22 08:20:31 +02:00
Gerhard Hoffmann
d677c12ad9 Add settinge time-step-config and pop-allow-overpay 2024-08-21 18:02:48 +02:00
Gerhard Hoffmann
ff78bf1411 Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2 2024-08-21 17:54:37 +02:00
Gerhard Hoffmann
21512f927e Add settings: 
+      "pop_time_step_config": 1	-> STATIC
+      "pop_allow_overpay": false
 2024-08-21 17:52:58 +02:00
Siegfried Siegert
1b85f4ac03 HMI: Textupdate 2024-08-09 14:00:32 +02:00
Siegfried Siegert
7e6f5e8283 Textupdate: screen Overpaid 2024-08-09 13:46:02 +02:00
Siegfried Siegert
4dbe681477 ATBAPP: states: request for overpayment 2024-08-09 11:47:50 +02:00
Siegfried Siegert
690f60b63d Update text: "Wait for card terminal" 2024-08-08 17:03:21 +02:00
Siegfried Siegert
ad23378439 Merge branch 'zg1/zone2' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone2 2024-08-08 17:03:09 +02:00
Gerhard Hoffmann
5d51847b24 Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2 2024-08-08 10:30:22 +02:00
Gerhard Hoffmann
f78e84624a Update jsons-files as provided by Thomas 2024-08-08 10:29:14 +02:00
Siegfried Siegert
88468a9d2a Setup opkg-commands 2024-08-07 17:16:46 +02:00
Siegfried Siegert
8a3ed1ff11 ATBAPP: states: skip printing bank receipt 2024-08-07 16:45:44 +02:00
Siegfried Siegert
59e020c60b ATBAPP: add current states 2024-08-07 16:45:40 +02:00
Siegfried Siegert
ce6053f435 ATBAPP: setPrinterEncoding and printerLocale 2024-08-07 16:40:28 +02:00
Gerhard Hoffmann
079d0f4e7e Tariff for Zone 2 (Yellow) in Kleipeda 2024-08-01 17:22:10 +02:00
Gerhard Hoffmann
f21099f036 Tariff for Zone 1 (Red) in Kleipeda 2024-08-01 17:08:12 +02:00
Gerhard Hoffmann
0085494514 Add atbapp to sync with zone1 branch 2024-07-19 10:36:01 +02:00
Gerhard Hoffmann
f050c5657e Add JSON files as saved on ATB server 2024-07-19 10:29:11 +02:00
Gerhard Hoffmann
a01f7b6647 Added Red-Zone as Info 2024-07-19 10:07:06 +02:00
17 changed files with 148 additions and 24819 deletions
Expand all files Collapse all files

210
etc/atbapp/ATBAPP.ini
View File

@@ -1,115 +1,7 @@
[COMMON]
com_port_name=/dev/ttyS1
com_baud_rate=9600
lang1=lt_LT
lang2=en_GB
lang3=de_DE
lang4=ru_RU
lang5=
defaultLanguage=1
CharacterSet="ISO 8859-13"
showInfoButton=false
showHelpButton=false
#useLanguage=[128+][64+][32+][16]
useLanguage=240
#usePayment=[128+][64+][32+][16]
usePayment=96
#useVehicle=[128+][64+][32+][16+][8]
useVehicle=192
#useProduct=[128+][64+][32+][16+][8]
useProduct=192
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
logfile=/var/log/atbqt.log
alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
feature_Log=off
feature_TouchFeedback=off
feature_StartButton=on
feature_selfOOO=off
feature_ShowParkingTime=off
suspend_methode=sysfs
suspend_program=
suspend_time=8
touch_feedback_gpio=121
touch_feedback_on_value=1
touch_feedback_off_value=0
#ooo_mode={useDisk|otherMachine}
ooo_mode=otherMachine
sellTimeout_time=60
showInfoButton=false
showHelpButton=false
useAppStates=1
statefile=/opt/app/ATBAPP/states/APP_States.xml
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,0"
sc_35="0,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[PLUGINS]
CCPlugin=AsyncPOS_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[IngenicoISelf_CCPlugin]
debug=1
PortName=/dev/ttymxc0
ZVT=DE
sleep=1
sleepExtended=1
Currency=HUF
[TCP_CONTROL]
enable=1
[PAYMENT]
currencySymbol=€
currencyISOCode=EUR
cashVariant=CoinsAndNotes
paymentPointInTime=poa
useDecimal=yes
[MOBILISIS_CalculatePricePlugin]
useDebug=1
tariffFileName=/etc/psa_tariff/tariff01.json
[ATBDeviceControllerPlugin] [ATBDeviceControllerPlugin]
printerEncoding=Windows-1257
printerLocale=lt_LT
serialPort=ttymxc2 serialPort=ttymxc2
printerEncoding="Windows-1257"
printerLocale="lt_LT"
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
debug=1
IP=192.168.6.242
Port=22000
SSL=0
ZVT=DE
sleep=1
printIntermediateStatus=1
Password=277296
NumberOfChars=37
dcHours="0"
[AsyncPOS_CCPlugin] [AsyncPOS_CCPlugin]
APAK=8AC304380E0E476BA2558B75DB9E2516 APAK=8AC304380E0E476BA2558B75DB9E2516
@@ -123,3 +15,101 @@ parity=0
sleep=0 sleep=0
stopBits=1 stopBits=1
terminalPowerOnOffHours="06:00:00,22:00:00" terminalPowerOnOffHours="06:00:00,22:00:00"
[COMMON]
%23ooo_mode={useDisk|otherMachine}
%23useLanguage=[128+][64+][32+][16]
%23usePayment=[128+][64+][32+][16]
%23useProduct=[128+][64+][32+][16+][8]
%23useVehicle=[128+][64+][32+][16+][8]
CharacterSet=ISO 8859-13
alternativeLogoFile=/opt/app/ATBAPP/logo/logo_Palanga.png
com_baud_rate=9600
com_port_name=/dev/ttyS1
defaultLanguage=1
feature_DBusDisplayControl=on
feature_DBusDisplayDimLow=off
feature_DBusSuspendControl=off
feature_Log=off
feature_ShowParkingTime=off
feature_StartButton=on
feature_TouchFeedback=off
feature_selfOOO=off
lang1=lt_LT
lang2=en_GB
lang3=de_DE
lang4=ru_RU
lang5=
logfile=/var/log/atbqt.log
ooo_alternativeLocation=
ooo_mode=otherMachine
ooo_serviceEmail=
ooo_serviceNumber=
sellTimeout_time=60
showHelpButton=false
showInfoButton=false
statefile=/etc/atbapp/states/APP_States.xml
suspend_methode=sysfs
suspend_program=
suspend_time=8
textfile=/etc/atbapp/text/HMI_Texte.xml
touch_feedback_gpio=121
touch_feedback_off_value=0
touch_feedback_on_value=1
useAppStates=1
useLanguage=240
usePayment=96
useProduct=192
useVehicle=192
[IngenicoISelf_CCPlugin]
Currency=HUF
PortName=/dev/ttymxc0
ZVT=DE
debug=1
sleep=1
sleepExtended=1
[MOBILISIS_CalculatePricePlugin]
tariffFileName=/etc/psa_tariff/tariff01.json
useDebug=1
[PAYMENT]
cashVariant=CoinsAndNotes
currencyISOCode=EUR
currencySymbol=€
paymentPointInTime=poa
useDecimal=yes
useHonestPayment=on
[PLUGINS]
CCPlugin=AsyncPOS_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_35="0,0,0"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[TCP_CONTROL]
enable=1
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
IP=192.168.6.242
NumberOfChars=37
Password=277296
Port=22000
SSL=0
ZVT=DE
dcHours=0
debug=1
printIntermediateStatus=1
sleep=1

126
etc/atbapp/text/HMI_Texte.xml
View File

@@ -940,74 +940,6 @@
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
</Text> </Text>
</Screen> </Screen>
<Screen name="OVERPAID" screennr="0xB1">
<Text textnr="0x30">
<lt_LT>Stovėjimo laiko pabaiga:</lt_LT>
<en_GB>End of Parking time:</en_GB>
<de_DE>Parkende:</de_DE>
<ru_RU>Окончание времени парковки:</ru_RU>
</Text>
<Text textnr="0x31">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x32">
<lt_LT>Suma:</lt_LT>
<en_GB>Amount:</en_GB>
<de_DE>Betrag:</de_DE>
<ru_RU>Сумма:</ru_RU>
</Text>
<Text textnr="0x33">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x34">
<lt_LT>Spausdinti kvitą?</lt_LT>
<en_GB>Print receipt?</en_GB>
<de_DE>Quittung drucken?</de_DE>
<ru_RU>Распечатать квитанцию?</ru_RU>
</Text>
<Text textnr="0x35">
<lt_LT>ATŠAUKTI</lt_LT>
<en_GB>NO</en_GB>
<de_DE>NEIN</de_DE>
<ru_RU>НЕТ</ru_RU>
</Text>
<Text textnr="0x36">
<lt_LT>TĘSTI</lt_LT>
<en_GB>YES</en_GB>
<de_DE>JA</de_DE>
<ru_RU>ДА</ru_RU>
</Text>
<Text textnr="0x37">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="user_message_01" textnr="0x81">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid</en_GB>
<de_DE>Überbezahlt</de_DE>
<ru_RU>Переплата!</ru_RU>
</Text>
<Text name="user_message_02" textnr="0x82">
<lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
<en_GB>Reached maximum number of coins.!</en_GB>
<de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
</Text>
</Screen>
<Screen name="Welcome2" screennr="0x3d"> <Screen name="Welcome2" screennr="0x3d">
<Text textnr="0x30"> <Text textnr="0x30">
<lt_LT>Sveiki!</lt_LT> <lt_LT>Sveiki!</lt_LT>
@@ -2568,61 +2500,5 @@
<de_DE>880012344</de_DE> <de_DE>880012344</de_DE>
<ru_RU>880012344</ru_RU> <ru_RU>880012344</ru_RU>
</Text> </Text>
</Screen> </Screen>
<Screen name="COMMON_USER_MESSAGES" screennr="0xF3">
<Text name="PAY_MORE" textnr="0x30">
<lt_LT>Mokėti daugiau</lt_LT>
<en_GB>pay more…</en_GB>
<de_DE>mehr zahlen…</de_DE>
<ru_RU>платить больше</ru_RU>
</Text>
<Text name="PAY_APPROPRIATELY" textnr="0x31">
<lt_LT>suteikite tikslią sumą…</lt_LT>
<en_GB>give the exact money…</en_GB>
<de_DE>passend zahlen…</de_DE>
<ru_RU>предоставьте точную сумму…</ru_RU>
</Text>
<Text name="NO_CANGE" textnr="0x32">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="MINIMUM_PRICE" textnr="0x33">
<lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
</Text>
<Text name="MAXIMUM_PRICE" textnr="0x34">
<lt_LT>Maksimali bilieto suma</lt_LT>
<en_GB>Max. Ticket amount</en_GB>
<de_DE>Höchstparkdauer erreicht</de_DE>
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="CARDPAYMENT_ONLY" textnr="0x35">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="CASHPAYMENT_ONLY" textnr="0x36">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="OVERPAID" textnr="0x37">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid</en_GB>
<de_DE>Überbezahlt</de_DE>
<ru_RU>Переплата!</ru_RU>
</Text>
<Text name="MAXIMUM_NUM_OF_COINS" textnr="0x38">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
</Screen>
</ATB_Text> </ATB_Text>

5
etc/psa_config/DC2C_print03.json
View File

@@ -8,14 +8,13 @@
"styl":"align c", "styl":"align c",
"feed":"margin02", "feed":"margin02",
"feed":"rim02", "feed":"rim02",
"styl":"size 00",
"text":"Sumokėta grynais:", "text":"Sumokėta grynais:",
"vari":"Dynamic02", "vari":"Dynamic02",
"styl":"size 21", "styl":"size 21",
"text":"Raudonoji zona", "text":"Geltonoji zona",
"feed":"nl", "feed":"nl",
"styl":"size 10", "styl":"size 10",
"text":"tarifas 1,50Eur/h", "text":"tarifas 60 ct/h",
"feed":"nl", "feed":"nl",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",

6
etc/psa_config/DC2C_print07.json
View File

@@ -4,17 +4,17 @@
"Version":"1.1.3-2024-08-08", "Version":"1.1.3-2024-08-08",
"styl":"font 24", "styl":"font 24",
"styl":"csiz 08", "styl":"csiz 08",
"styl":"size 00",
"styl":"align c", "styl":"align c",
"feed":"margin02", "feed":"margin02",
"feed":"rim02", "feed":"rim02",
"styl":"size 00",
"text":"Sumokėta kortele:", "text":"Sumokėta kortele:",
"vari":"Dynamic02", "vari":"Dynamic02",
"styl":"size 21", "styl":"size 21",
"text":"Raudonoji zona", "text":"Geltonoji zona",
"feed":"nl", "feed":"nl",
"styl":"size 10", "styl":"size 10",
"text":"tarifas 1,50Eur/h", "text":"tarifas 60 ct/h",
"feed":"nl", "feed":"nl",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",

147
etc/psa_tariff/tariff01.json
View File

@@ -2206,12 +2206,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2232,13 +2226,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2251,14 +2238,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2289,12 +2270,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2315,13 +2290,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2334,14 +2302,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2453,12 +2415,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2479,13 +2435,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2498,14 +2447,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2536,12 +2479,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2562,13 +2499,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2581,14 +2511,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2619,12 +2543,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2645,13 +2563,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2664,14 +2575,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2702,12 +2607,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2728,13 +2627,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2747,14 +2639,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2785,12 +2671,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2811,13 +2691,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2830,14 +2703,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]

2850
etc/psa_tariff/tariff01_sommer.json
View File

File diff suppressed because it is too large Load Diff

2850
etc/psa_tariff/tariff01_winter.json
View File

File diff suppressed because it is too large Load Diff

105
etc/psa_tariff/tariff02.json
View File

@@ -1045,12 +1045,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1071,13 +1065,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1090,14 +1077,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1206,12 +1187,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1232,13 +1207,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1251,14 +1219,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1367,12 +1329,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1393,13 +1349,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1412,14 +1361,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1528,12 +1471,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1554,13 +1491,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1573,14 +1503,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1650,12 +1574,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1676,13 +1594,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1695,14 +1606,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]

1803
etc/psa_tariff/tariff02_sommer.json
View File

File diff suppressed because it is too large Load Diff

1953
etc/psa_tariff/tariff02_winter.json
View File

File diff suppressed because it is too large Load Diff

155
etc/psa_tariff/tariff03.json
View File

@@ -2245,14 +2245,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2271,15 +2265,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2290,15 +2277,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2406,14 +2387,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2432,15 +2407,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2451,15 +2419,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2567,14 +2529,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2593,15 +2549,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2612,15 +2561,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2728,14 +2671,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2754,15 +2691,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2773,15 +2703,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2850,14 +2774,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2876,15 +2794,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2895,15 +2806,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }

2850
etc/psa_tariff/tariff03_sommer.json
View File

File diff suppressed because it is too large Load Diff

3153
etc/psa_tariff/tariff03_winter.json
View File

File diff suppressed because it is too large Load Diff

1624
etc/psa_tariff/tariff04_sommer.json
View File

File diff suppressed because it is too large Load Diff

1858
etc/psa_tariff/tariff04_winter.json
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05_sommer.json
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05_winter.json
View File

File diff suppressed because it is too large Load Diff