#include <cstdio> // snprintf
#include <cstring>
+#include "stg/tariffs.h"
#include "parser.h"
-#include "tariffs.h"
const int pt_mega = 1024 * 1024;
//-----------------------------------------------------------------------------
break;
}
+ answerList->push_back("<Period value=\"" + TARIFF::PeriodToString(it->tariffConf.period) + "\"/>");
+
answerList->push_back("</tariff>");
}
answerList->push_back("</Tariffs>");
//answerList->clear();
answerList->erase(answerList->begin(), answerList->end());
-if (tariffs->Add(tariffToAdd, *currAdmin) == 0)
+if (tariffs->Add(tariffToAdd, currAdmin) == 0)
{
answerList->push_back("<AddTariff Result=\"Ok\"/>");
}
return;
}
-if (tariffs->Del(tariffToDel, *currAdmin) == 0)
+if (tariffs->Del(tariffToDel, currAdmin) == 0)
{
answerList->push_back("<DelTariff Result=\"Ok\"/>");
}
snprintf(st, 50, "Time%d", j);
if (strcasecmp(el, st) == 0)
{
- int h1, m1, h2, m2;
+ int h1 = 0;
+ int m1 = 0;
+ int h2 = 0;
+ int m2 = 0;
if (ParseTariffTimeStr(attr[1], h1, m1, h2, m2) == 0)
{
td.dirPrice[j].hDay = h1;
}
return 0;
}
+
+ if (strcasecmp(el, "Period") == 0)
+ {
+ td.tariffConf.period = TARIFF::StringToPeriod(attr[1]);
+ return 0;
+ }
}
return -1;
}
if (!td.tariffConf.name.data().empty())
{
TARIFF_DATA tariffData = td.GetData();
- if (tariffs->Chg(tariffData, *currAdmin) == 0)
+ if (tariffs->Chg(tariffData, currAdmin) == 0)
{
answerList->push_back("<SetTariff Result=\"ok\"/>");
return;