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

Compare commits

base: GerhardHoffmann:e4de0c8c379f9fe7327314a0f3a98e15f1f1ba44
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone2
..
compare: GerhardHoffmann:44e5c944d050fdd214852b286ddee8647316a454
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone2

No commits in common. "e4de0c8c379f9fe7327314a0f3a98e15f1f1ba44" and "44e5c944d050fdd214852b286ddee8647316a454" have entirely different histories.
e4de0c8c37 ... 44e5c944d0

1 changed files with 55 additions and 28 deletions
Show Stats Expand all files Collapse all files

83
etc/psa_tariff/tariff01.json
View File

@ -1,6 +1,6 @@
{ {
"Project" : "Kirchdorf", "Project" : "Kirchdorf",
"Version" : "1.1.0", "Version" : "1.0.0",
"Info" : "", "Info" : "",
"Currency": [ "Currency": [
{ {
@ -49,19 +49,59 @@
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 2, "time_range_payment_rate_id": 2,
"time_range_from": 0, "time_range_from": 0,
"time_range_to": 30, "time_range_to": 5,
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 2, "time_range_id": 2,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 2,
"time_range_from": 5,
"time_range_to": 10,
"time_range_comment": "[from, to[ in minutes"
},
{
"time_range_id": 3,
"time_range_tbase_id": 1,
"time_range_payment_rate_id": 2,
"time_range_from": 10,
"time_range_to": 15,
"time_range_comment": "[from, to[ in minutes"
},
{
"time_range_id": 4,
"time_range_tbase_id": 1,
"time_range_payment_rate_id": 2,
"time_range_from": 15,
"time_range_to": 20,
"time_range_comment": "[from, to[ in minutes"
},
{
"time_range_id": 5,
"time_range_tbase_id": 1,
"time_range_payment_rate_id": 2,
"time_range_from": 20,
"time_range_to": 25,
"time_range_comment": "[from, to[ in minutes"
},
{
"time_range_id": 6,
"time_range_tbase_id": 1,
"time_range_payment_rate_id": 2,
"time_range_from": 25,
"time_range_to": 30,
"time_range_comment": "[from, to[ in minutes"
},
{
"time_range_id": 7,
"time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 30, "time_range_from": 30,
"time_range_to": 35, "time_range_to": 35,
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 3, "time_range_id": 8,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 35, "time_range_from": 35,
@ -69,7 +109,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 4, "time_range_id": 9,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 40, "time_range_from": 40,
@ -77,7 +117,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 5, "time_range_id": 10,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 45, "time_range_from": 45,
@ -85,7 +125,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 6, "time_range_id": 11,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 50, "time_range_from": 50,
@ -93,7 +133,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 7, "time_range_id": 12,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 55, "time_range_from": 55,
@ -101,7 +141,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 8, "time_range_id": 13,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 60, "time_range_from": 60,
@ -109,7 +149,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 9, "time_range_id": 14,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 65, "time_range_from": 65,
@ -117,7 +157,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 10, "time_range_id": 15,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 70, "time_range_from": 70,
@ -125,7 +165,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 11, "time_range_id": 16,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 75, "time_range_from": 75,
@ -133,7 +173,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 12, "time_range_id": 17,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 80, "time_range_from": 80,
@ -141,7 +181,7 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
}, },
{ {
"time_range_id": 13, "time_range_id": 18,
"time_range_tbase_id": 1, "time_range_tbase_id": 1,
"time_range_payment_rate_id": 1, "time_range_payment_rate_id": 1,
"time_range_from": 85, "time_range_from": 85,
@ -149,18 +189,6 @@
"time_range_comment": "[from, to[ in minutes" "time_range_comment": "[from, to[ in minutes"
} }
], ],
"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"
}
],
"PaymentOption": [ "PaymentOption": [
{ {
"pop_id": 1049, "pop_id": 1049,
@ -174,8 +202,7 @@
"pop_min_price": 30, "pop_min_price": 30,
"pop_max_price": 150, "pop_max_price": 150,
"pop_carry_over": 0, "pop_carry_over": 0,
"pop_daily_card_price": 0, "pop_daily_card_price": 0
"pop_time_step_config": 2
} }
], ],
"PaymentRate": [ "PaymentRate": [
@ -187,7 +214,7 @@
{ {
"pra_payment_option_id": 1049, "pra_payment_option_id": 1049,
"pra_payment_unit_id": 2, "pra_payment_unit_id": 2,
"pra_price": 30 "pra_price": 5
} }
], ],
"Duration": [ "Duration": [