diff --git a/library/src/configuration.cpp b/library/src/configuration.cpp index 40c9a61..dc86eca 100644 --- a/library/src/configuration.cpp +++ b/library/src/configuration.cpp @@ -1,6 +1,7 @@ #include "configuration.h" #include "tariff_timebase.h" #include "time_range_header.h" +#include "tariff_timestep_config.h" #include #include @@ -22,6 +23,7 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name) if (strcmp(member_name, "TimeBase") == 0) return MemberType::TimeBaseType; if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType; if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType; + if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType; else return MemberType::UnknownType; } @@ -91,6 +93,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) ATBTimeBase TimeBase; ATBCustomer Customer; ATBTimeRange TimeRange; + ATBTimeStepConfig TimeStepConfig; MemberType mb_type = MemberType::UnknownType; @@ -188,6 +191,18 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) } } break; + case MemberType::TimeStepConfigType: + if (QString(inner_obj_name) == QString("tsconfig_id")) { + if (k->value.IsInt()) { + TimeStepConfig.tsconfig_id = k->value.GetInt(); + } + } else + if (QString(inner_obj_name) == QString("tsconfig_label")) { + if (k->value.IsString()) { + TimeStepConfig.tsconfig_label = QString::fromStdString(k->value.GetString()); + } + } + break; case MemberType::DailyTicketType: if (QString(inner_obj_name) == QString("daily_ticket_payment_option_id")) { if (k->value.IsInt()) { @@ -396,6 +411,11 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) break; case MemberType::TimeRangeType: qCritical() << TimeRange; + cfg->TimeRange.insert(pair(TimeRange.time_range_id, TimeRange)); + break; + case MemberType::TimeStepConfigType: + qCritical() << TimeStepConfig; + cfg->TimeStepConfig.insert(pair(TimeStepConfig.tsconfig_id, TimeStepConfig)); break; default: break; diff --git a/vue/Become_a_ninja_with_Vue_sample.pdf b/vue/Become_a_ninja_with_Vue_sample.pdf deleted file mode 100644 index d5edfe6..0000000 Binary files a/vue/Become_a_ninja_with_Vue_sample.pdf and /dev/null differ diff --git a/vue/JavaScript-The-Definitive-Guide-6th-Edition.pdf b/vue/JavaScript-The-Definitive-Guide-6th-Edition.pdf deleted file mode 100644 index 1bef08c..0000000 Binary files a/vue/JavaScript-The-Definitive-Guide-6th-Edition.pdf and /dev/null differ diff --git a/vue/Vue.js in Action.Pdf b/vue/Vue.js in Action.Pdf deleted file mode 100644 index 020a88e..0000000 Binary files a/vue/Vue.js in Action.Pdf and /dev/null differ