Sync with version in master.

This commit is contained in:
Gerhard Hoffmann 2024-01-31 11:47:12 +01:00
parent 1b871caef7
commit 949b915137

View File

@ -29,27 +29,54 @@
"pme_label": "steps"
}
],
"TimeBasis": [
"TimeBase": [
{
"tb_id": 1,
"tb_label": "absolute time"
"tbase_id": 0,
"tbase_type": 0,
"tbase_type_comment": "time is given as starting from some wall-clock-time",
"tbase_label": "absolute time"
},
{
"tb_id": 2,
"tb_label": "relative time"
"tbase_id": 1,
"tbase_type": 1,
"tbase_type_comment": "time is given as starting from 0 minutes",
"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"
}
],
@ -58,54 +85,63 @@
"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": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 900
"pra_price": 400
},
{
"pra_payment_option_id": 1049,
"pra_payment_option_id": 1050,
"pra_payment_unit_id": 2,
"pra_price": 1500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 3,
"pra_price": 3000
"pra_price": 800
}
],
"DailyTicket": [
{
"daily_ticket_payment_option_id": 1049,
"daily_ticket_unit_id": 1,
"daily_ticket_price": 400,
"daily_ticket_id": 1,
"daily_ticket_price_id": 1,
"daily_ticket_tb_id": 1,
"daily_ticket_clearance_id": [3],
"daily_ticket_from_min": "00:00:00",
"daily_ticket_to_max": "00:00:00",
"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_payment_option_id": 1050,
"daily_ticket_id": 2,
"daily_ticket_price_id": 2,
"daily_ticket_tb_id": 1,
"daily_ticket_clearance_id": [1],
"daily_ticket_from_min": "00:00:00",
"daily_ticket_to_max": "00:00:00",
"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
}
@ -163,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"
}