From: Elena Mamontova Date: Tue, 1 Nov 2016 07:50:28 +0000 (+0200) Subject: Ticket. The line for the change-policy-timeout adding to the vector X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/2ecac495e165f5247a5e33669588a4ca8c2e8266?ds=sidebyside;hp=1487578f4887f49661320e24e311074a9af36f80 Ticket. The line for the change-policy-timeout adding to the vector params added in the GetTariffParams(). The line for the changePolicyTimeout output added in the PrintTariffConf(). --- diff --git a/projects/sgconf/tariffs.cpp b/projects/sgconf/tariffs.cpp index c384df1f..87d07d1a 100644 --- a/projects/sgconf/tariffs.cpp +++ b/projects/sgconf/tariffs.cpp @@ -242,7 +242,8 @@ std::cout << Indent(level, true) << "name: " << conf.name << "\n" << Indent(level) << "passive cost: " << conf.passiveCost << "\n" << Indent(level) << "traff type: " << TraffTypeToString(conf.traffType) << "\n" << Indent(level) << "period: " << PeriodToString(conf.period) << "\n" - << Indent(level) << "change policy: " << ChangePolicyToString(conf.changePolicy) << "\n"; + << Indent(level) << "change policy: " << ChangePolicyToString(conf.changePolicy) << "\n" + << Indent(level) << "change policy timeout: " << formatTime(conf.changePolicyTimeout) << "\n"; } void PrintTariff(const STG::GET_TARIFF::INFO & info, size_t level = 0) @@ -262,6 +263,7 @@ params.push_back(SGCONF::API_ACTION::PARAM("passive-cost", "", "\tpassive params.push_back(SGCONF::API_ACTION::PARAM("traff-type", "", "\ttraffic type (up, down, up+down, max)")); params.push_back(SGCONF::API_ACTION::PARAM("period", "", "\ttarification period (daily, monthly)")); params.push_back(SGCONF::API_ACTION::PARAM("change-policy", "", "tariff change policy (allow, to_cheap, to_expensive, deny)")); +params.push_back(SGCONF::API_ACTION::PARAM("change-policy-timeout", "", "tariff change policy timeout")); params.push_back(SGCONF::API_ACTION::PARAM("times", "", "coma-separated day time-spans for each direction")); params.push_back(SGCONF::API_ACTION::PARAM("day-prices", "", "coma-separated day prices for each direction")); params.push_back(SGCONF::API_ACTION::PARAM("night-prices", "", "coma-separated night prices for each direction"));