X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/64b687f8ec36a103865044613cb0f42f98aeda3a..a79cfb92e093d9c9c78e3ccbabcd45de1a283e56:/stglibs/srvconf.lib/parsers/chg_tariff.cpp diff --git a/stglibs/srvconf.lib/parsers/chg_tariff.cpp b/stglibs/srvconf.lib/parsers/chg_tariff.cpp index cb7d9475..8a1c56a4 100644 --- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp +++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp @@ -51,7 +51,7 @@ stream << "<" << name << " value=\"" << res << "\"/>"; } // namespace anonymous -std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data) +std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data, const std::string & /*encoding*/) { std::ostringstream stream; @@ -60,12 +60,13 @@ appendResetable(stream, "passiveCost", data.tariffConf.passiveCost); appendResetable(stream, "free", data.tariffConf.free); if (!data.tariffConf.traffType.empty()) - switch (data.tariffConf.traffType.data()) + stream << "<traffType value=\"" + TARIFF::TraffTypeToString(data.tariffConf.traffType.data()) + "\"/>"; + +if (!data.tariffConf.period.empty()) + switch (data.tariffConf.period.data()) { - case TRAFF_UP: stream << "<traffType value=\"up\"/>"; break; - case TRAFF_DOWN: stream << "<traffType value=\"down\"/>"; break; - case TRAFF_UP_DOWN: stream << "<traffType value=\"up+down\"/>"; break; - case TRAFF_MAX: stream << "<traffType value=\"max\"/>"; break; + case TARIFF::DAY: stream << "<period value=\"day\"/>"; break; + case TARIFF::MONTH: stream << "<period value=\"month\"/>"; break; } for (size_t i = 0; i < DIR_NUM; ++i)