From 088453c179e744f18e0e073b783a080d8fb68d6a Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 30 Jan 2024 10:52:49 +0100
Subject: [PATCH] current tariff-file for naz

---
 tariffs/tariff_naz.json | 111 +++++++++++++++++++++++++---------------
 1 file changed, 71 insertions(+), 40 deletions(-)

diff --git a/tariffs/tariff_naz.json b/tariffs/tariff_naz.json
index 5507c40..53d5b36 100644
--- a/tariffs/tariff_naz.json
+++ b/tariffs/tariff_naz.json
@@ -43,16 +43,39 @@
       "tbase_label": "relative time"
     }
   ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "00:00:00",
+      "time_range_to": "00:01:00",
+      "time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
+    }
+  ],
+  "TimeStepConfig" : [
+    {	
+      "tsconfig_id" : 1,
+      "tsconfig_label" : "static",
+      "tsconfig_comment" : "read time steps as given in jsonfiles"		
+    },
+    {
+      "tsconfig_id" : 2,
+      "tsconfig_label" : "dynamic",
+      "tsconfig_comment" : "determine timesteps at runtime"		
+    }
+  ],
   "Customer": [
     {
+      "cust_id": 1,
       "cust_type": 1000,
       "cust_label": "Adult"
     },
     {
+      "cust_id": 2,
       "cust_type": 1001,
       "cust_label": "Child"
     },
     {
+      "cust_id": 3,
       "cust_type": 1002,
       "cust_label": "Teen"
     }
@@ -62,64 +85,72 @@
       "pop_id": 1049,
       "pop_label": "Zone 1",
       "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_end_time": "08:00:00",
+      "pop_day_night_end_time": "20:00:00",
       "pop_price_night": 0,
       "pop_min_time": 1,
-      "pop_max_time": 2,
-      "pop_min_price": 900,
+      "pop_max_time": 720,
+      "pop_min_price": 400,
       "pop_carry_over": 0,
       "pop_daily_card_price": 0,
-      "pop_business_hours": 2 
+      "pop_business_hours": 128
+    },
+    {
+      "pop_id": 1050,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "08:00:00",
+      "pop_day_night_end_time": "20:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 1,
+      "pop_max_time": 720,
+      "pop_min_price": 800,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 128 
     }
   ],
   "PaymentRate": [
     {
-      "pop_comment":"Unused"
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 400
+    },
+    {
+      "pra_payment_option_id": 1050,
+      "pra_payment_unit_id": 2,
+      "pra_price": 800
     }
   ],
   "DailyTicket": [
     {
       "daily_ticket_payment_option_id": 1049,
-      "daily_ticket_unit_id": 1,
-      "daily_ticket_price": 400,
-
-      "daily_ticket_tbase_type": 0,
-      "daily_ticket_tbase_type_comment": "absolute or relative to offset",
-
-      "daily_ticket_clearance_customer_type": 1002,
-      "daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
-
-      "daily_ticket_weekday_range" : 1,
-      "daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
-      "daily_ticket_special_day_range": 0
+      "daily_ticket_id": 1,
+      "daily_ticket_price_id": 1,
+      "daily_ticket_tb_id": 1,
+      "daily_ticket_clearance_customer_ids": [3],
+      "daily_ticket_from_min": "08:00:00",
+      "daily_ticket_to_max": "20:00:00",
+      "daily_ticket_from_offset_min": 0,
+      "daily_ticket_to_offset_max": 0
     },
     {
-      "daily_ticket_payment_option_id": 1049,
-      "daily_ticket_unit_id": 2,
-      "daily_ticket_price": 800,
-
-      "daily_ticket_tbase_type": 0,
-      "daily_ticket_tbase_type_comment": "absolute or relative to offset",
-
-      "daily_ticket_clearance_customer_type": 1000,
-      "daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
-
-      "daily_ticket_weekday_ranges" : 1,
-      "daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
-      "daily_ticket_special_day_ranges": 0
+      "daily_ticket_payment_option_id": 1050,
+      "daily_ticket_id": 2,
+      "daily_ticket_price_id": 2,
+      "daily_ticket_tb_id": 1,
+      "daily_ticket_clearance_customer_ids": [1],
+      "daily_ticket_from_min": "08:00:00",
+      "daily_ticket_to_max": "20:00:00",
+      "daily_ticket_from_offset_min": 0,
+      "daily_ticket_to_offset_max": 0
     }
   ],
   "Duration": [
     {
-      "pun_comment":"Unused"
-    }
-  ],
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
+      "pun_id": 1,
+      "pun_label": "Tagesticket",
+      "pun_duration": 720
     }
   ],
   "WeekDaysWorktime": [
@@ -168,7 +199,7 @@
     {
       "pwd_id": 627,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
+      "pwd_period_day_in_week_id": 7,
       "pwd_time_from": "08:00:00",
       "pwd_time_to": "20:00:00"
     }