Add tariff change policy description.

[stg.git] / projects / stargazer / tariff_impl.cpp

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index a3084fbcd810c781fdd895be95c6148b797400f1..1fa2e82f624e2c06a155d068666ac09b537e6dea 100644 (file)
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -28,12 +28,13 @@
  $Author: faust $
  */
 
-#include <ctime>
-#include <algorithm> // std::max
-
-#include "stg/common.h"
 #include "tariff_impl.h"
+
 #include "stg_timer.h"
+#include "stg/common.h"
+
+#include <ctime>
+#include <algorithm> // std::max
 
 //-----------------------------------------------------------------------------
 TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_DATA & td)
@@ -42,12 +43,6 @@ tariffData = td;
 return *this;
 }
 //-----------------------------------------------------------------------------
-TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_IMPL & t)
-{
-tariffData = t.tariffData;
-return *this;
-}
-//-----------------------------------------------------------------------------
 double TARIFF_IMPL::GetPriceWithTraffType(uint64_t up,
                                      uint64_t down,
                                      int dir,
@@ -145,8 +140,11 @@ else
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
-std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to) const
+std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const
 {
+time_t timeout = GetChangePolicyTimeout();
+if (currentTime > timeout && timeout != 0)
+    return "";
 switch (GetChangePolicy())
     {
     case TARIFF::ALLOW:
@@ -164,5 +162,6 @@ switch (GetChangePolicy())
     case TARIFF::DENY:
         return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     }
+return "";
 }
 //-----------------------------------------------------------------------------