Ticket 37. The messages is changed for TARIFF::TO_CHEAP and

[stg.git] / include / stg / tariff_conf.h

diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h
index fe94b6e533b54b2b9bc2e0a3520591d473214fda..9de3083042cd5f55ddc839c6174590d655c4d066 100644 (file)
--- a/include/stg/tariff_conf.h
+++ b/include/stg/tariff_conf.h
@@ -148,6 +148,7 @@ struct TARIFF_CONF
     double             passiveCost;
     std::string        name;
     TARIFF::PERIOD     period;
     double             passiveCost;
     std::string        name;
     TARIFF::PERIOD     period;

+    TARIFF::CHANGE_POLICY changePolicy;

 
     TARIFF_CONF()
         : fee(0),
 
     TARIFF_CONF()
         : fee(0),


@@ -155,7 +156,8 @@ struct TARIFF_CONF
           traffType(TARIFF::TRAFF_UP_DOWN),
           passiveCost(0),
           name(),
           traffType(TARIFF::TRAFF_UP_DOWN),
           passiveCost(0),
           name(),

-          period(TARIFF::MONTH)
+          period(TARIFF::MONTH),
+          changePolicy(TARIFF::ALLOW)

         {}
 
     TARIFF_CONF(const std::string & n)
         {}
 
     TARIFF_CONF(const std::string & n)


@@ -164,7 +166,8 @@ struct TARIFF_CONF
           traffType(TARIFF::TRAFF_UP_DOWN),
           passiveCost(0),
           name(n),
           traffType(TARIFF::TRAFF_UP_DOWN),
           passiveCost(0),
           name(n),

-          period(TARIFF::MONTH)
+          period(TARIFF::MONTH),
+          changePolicy(TARIFF::ALLOW)

         {}
 };
 //-----------------------------------------------------------------------------
         {}
 };
 //-----------------------------------------------------------------------------


@@ -176,7 +179,8 @@ struct TARIFF_CONF_RES
           traffType(),
           passiveCost(),
           name(),
           traffType(),
           passiveCost(),
           name(),

-          period()
+          period(),
+          changePolicy()

         {}
 
     TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)
         {}
 
     TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)


@@ -187,6 +191,7 @@ struct TARIFF_CONF_RES
         passiveCost = tc.passiveCost;
         name        = tc.name;
         period      = tc.period;
         passiveCost = tc.passiveCost;
         name        = tc.name;
         period      = tc.period;

+        changePolicy = tc.changePolicy;

         return *this;
         }
 
         return *this;
         }
 


@@ -199,6 +204,7 @@ struct TARIFF_CONF_RES
         passiveCost.maybeSet(tc.passiveCost);
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);
         passiveCost.maybeSet(tc.passiveCost);
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);

+        changePolicy.maybeSet(tc.changePolicy);

         return tc;
         }
 
         return tc;
         }
 


@@ -208,6 +214,7 @@ struct TARIFF_CONF_RES
     RESETABLE<double>             passiveCost;
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;
     RESETABLE<double>             passiveCost;
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;

+    RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;

 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA
 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA


@@ -248,6 +255,12 @@ struct TARIFF_DATA_RES
           dirPrice(DIR_NUM)
         {}
 
           dirPrice(DIR_NUM)
         {}
 

+    TARIFF_DATA_RES & operator=(const TARIFF_DATA & td)
+        {
+        tariffConf = td.tariffConf;
+        return *this;
+        }
+

     TARIFF_DATA GetData() const
         {
         TARIFF_DATA td;
     TARIFF_DATA GetData() const
         {
         TARIFF_DATA td;