diff --git a/DataStorage/Timespan.cpp b/DataStorage/Timespan.cpp index 02cae9b..258ce28 100644 --- a/DataStorage/Timespan.cpp +++ b/DataStorage/Timespan.cpp @@ -16,6 +16,10 @@ Timespan::type Timespan(const std::string& timespan) return Timespan::Month; else if (StringAlgorithm::iequals(timespan, "Year")) return Timespan::Year; + else if (StringAlgorithm::iequals(timespan, "2_Year")) + return Timespan::_2_Year; + else if (StringAlgorithm::iequals(timespan, "5_Year")) + return Timespan::_5_Year; else return Timespan::Unknown; } @@ -32,6 +36,10 @@ std::string Timespan(Timespan::type timespan) return "Month"; case Timespan::Year: return "Year"; + case Timespan::_2_Year: + return "2_Year"; + case Timespan::_5_Year: + return "5_Year"; default: case Timespan::Unknown: return "Unknown"; diff --git a/include/Timespan.h b/include/Timespan.h index c99ef7e..369696b 100644 --- a/include/Timespan.h +++ b/include/Timespan.h @@ -14,6 +14,8 @@ struct Timespan Week = 7 * 24 * 60 * 60, Month = 31 * 24 * 60 * 60, Year = 365 * 24 * 60 * 60, + _2_Year = 2 * 365 * 24 * 60 * 60, + _5_Year = 5 * 365 * 24 * 60 * 60, Unknown }; };