2 files changed, 39 insertions(+), 39 deletions(-)

M module-apps/application-calendar/data/dateCommon.hpp
M module-db/tests/EventsTable_tests.cpp

@@ 180,12 180,12 @@ inline std::string TimePointToString(const TimePoint &tp, date::months months)
         std::chrono::time_point_cast<std::chrono::seconds>(timePoint + time_of_day.hours() + time_of_day.minutes()));
 }
 
-inline std::string TimePointToString(const calendar::TimePoint &tp, date::years years)
+inline std::string TimePointToString(const TimePoint &tp, date::years years)
 {
     auto yearMonthDay     = date::year_month_day{date::floor<date::days>(tp)};
     auto yearMonthDayLast = (yearMonthDay.year() + date::years(years)) / yearMonthDay.month() / date::last;
 
-    calendar::TimePoint timePoint =
+    TimePoint timePoint =
         date::sys_days{yearMonthDayLast.year() / yearMonthDayLast.month() /
                        ((yearMonthDayLast.day() == yearMonthDay.day()) ? yearMonthDayLast.day() : yearMonthDay.day())};
 

@@ 166,8 166,8 @@ TEST_CASE("Events Table tests")
         CHECK(eventsTbl.count() == 0);
 
         uint32_t numberOfEvents       = 7;
-        calendar::TimePoint startDate = TimePointFromString("2019-10-20 14:30:00");
-        calendar::TimePoint endDate   = TimePointFromString("2019-10-20 15:30:00");
+        TimePoint startDate           = TimePointFromString("2019-10-20 14:30:00");
+        TimePoint endDate             = TimePointFromString("2019-10-20 15:30:00");
         testRow1.date_from            = startDate;
         testRow1.date_till            = endDate;
         CHECK(eventsTbl.addDaily(testRow1));


@@ 201,8 201,8 @@ TEST_CASE("Events Table tests")
         CHECK(eventsTbl.count() == 0);
 
         uint32_t numberOfEvents       = 4;
-        calendar::TimePoint startDate = TimePointFromString("2019-10-20 14:30:00");
-        calendar::TimePoint endDate   = TimePointFromString("2019-10-20 15:30:00");
+        TimePoint startDate           = TimePointFromString("2019-10-20 14:30:00");
+        TimePoint endDate             = TimePointFromString("2019-10-20 15:30:00");
         testRow1.date_from            = startDate;
         testRow1.date_till            = endDate;
         CHECK(eventsTbl.addWeekly(testRow1));


@@ 236,8 236,8 @@ TEST_CASE("Events Table tests")
         CHECK(eventsTbl.count() == 0);
 
         uint32_t numberOfEvents       = 4;
-        calendar::TimePoint startDate = TimePointFromString("2019-10-20 14:30:00");
-        calendar::TimePoint endDate   = TimePointFromString("2019-10-20 15:30:00");
+        TimePoint startDate           = TimePointFromString("2019-10-20 14:30:00");
+        TimePoint endDate             = TimePointFromString("2019-10-20 15:30:00");
         testRow1.date_from            = startDate;
         testRow1.date_till            = endDate;
         CHECK(eventsTbl.addTwoWeeks(testRow1));


@@ 271,7 271,7 @@ TEST_CASE("Events Table tests")
         CHECK(eventsTbl.count() == 0);
 
         uint32_t numberOfEvents = 12;
-        const std::array<calendar::TimePoint, 24> dates{
+        const std::array<TimePoint, 24> dates{
             TimePointFromString("2019-01-20 14:30:00"), TimePointFromString("2019-01-20 15:30:00"),
             TimePointFromString("2019-02-20 14:30:00"), TimePointFromString("2019-02-20 15:30:00"),
             TimePointFromString("2019-03-20 14:30:00"), TimePointFromString("2019-03-20 15:30:00"),


@@ 318,14 318,14 @@ TEST_CASE("Events Table tests")
         REQUIRE(eventsTbl.count() == 0);
 
         uint32_t numberOfEvents = 4;
-        std::array<calendar::TimePoint, 8> dates{TimePointFromString("2019-02-20 14:30:00"),
-                                                 TimePointFromString("2019-02-20 15:30:00"),
-                                                 TimePointFromString("2020-02-20 14:30:00"),
-                                                 TimePointFromString("2020-02-20 15:30:00"),
-                                                 TimePointFromString("2021-02-20 14:30:00"),
-                                                 TimePointFromString("2021-02-20 15:30:00"),
-                                                 TimePointFromString("2022-02-20 14:30:00"),
-                                                 TimePointFromString("2022-02-20 15:30:00")};
+        std::array<TimePoint, 8> dates{TimePointFromString("2019-02-20 14:30:00"),
+                                       TimePointFromString("2019-02-20 15:30:00"),
+                                       TimePointFromString("2020-02-20 14:30:00"),
+                                       TimePointFromString("2020-02-20 15:30:00"),
+                                       TimePointFromString("2021-02-20 14:30:00"),
+                                       TimePointFromString("2021-02-20 15:30:00"),
+                                       TimePointFromString("2022-02-20 14:30:00"),
+                                       TimePointFromString("2022-02-20 15:30:00")};
 
         testRow1.date_from = dates[0];
         testRow1.date_till = dates[1];


@@ 367,8 367,8 @@ TEST_CASE("Events Table tests")
     {
         auto check_custom_repeat = [&](uint32_t customRepeatOption,
                                        uint32_t numberOfEvents,
-                                       calendar::TimePoint originalStartDate,
-                                       calendar::TimePoint originalEndDate) {
+                                       TimePoint originalStartDate,
+                                       TimePoint originalEndDate) {
             if (eventsTbl.count() > 0) {
                 REQUIRE(remove_events(eventsDb));
             }


@@ 396,8 396,8 @@ TEST_CASE("Events Table tests")
                 }
             }
 
-            calendar::TimePoint expectedStartDate = TimePointFromString("2020-12-07 14:30:00"); // monday
-            calendar::TimePoint expectedEndDate   = TimePointFromString("2020-12-07 15:30:00"); // monday
+            TimePoint expectedStartDate = TimePointFromString("2020-12-07 14:30:00"); // monday
+            TimePoint expectedEndDate   = TimePointFromString("2020-12-07 15:30:00"); // monday
 
             uint32_t i = 0;
             for (uint32_t l = 0; l < numberOfWeeks; l++) {


@@ 439,8 439,8 @@ TEST_CASE("Events Table tests")
             uint32_t customRepeatOption =
                 static_cast<uint32_t>(weekDayOption::monday) + static_cast<uint32_t>(weekDayOption::wednesday);
             uint32_t numberOfEvents               = 9;
-            calendar::TimePoint originalStartDate = TimePointFromString("2020-12-10 14:30:00"); // thursday
-            calendar::TimePoint originalEndDate   = TimePointFromString("2020-12-10 15:30:00"); // thursday
+            TimePoint originalStartDate           = TimePointFromString("2020-12-10 14:30:00"); // thursday
+            TimePoint originalEndDate             = TimePointFromString("2020-12-10 15:30:00"); // thursday
 
             check_custom_repeat(customRepeatOption, numberOfEvents, originalStartDate, originalEndDate);
         }


@@ 451,8 451,8 @@ TEST_CASE("Events Table tests")
                 static_cast<uint32_t>(weekDayOption::monday) + static_cast<uint32_t>(weekDayOption::wednesday) +
                 static_cast<uint32_t>(weekDayOption::tuesday) + static_cast<uint32_t>(weekDayOption::sunday);
             uint32_t numberOfEvents               = 17;
-            calendar::TimePoint originalStartDate = TimePointFromString("2020-12-10 14:30:00"); // thursday
-            calendar::TimePoint originalEndDate   = TimePointFromString("2020-12-10 15:30:00"); // thursday
+            TimePoint originalStartDate           = TimePointFromString("2020-12-10 14:30:00"); // thursday
+            TimePoint originalEndDate             = TimePointFromString("2020-12-10 15:30:00"); // thursday
 
             check_custom_repeat(customRepeatOption, numberOfEvents, originalStartDate, originalEndDate);
         }


@@ 461,8 461,8 @@ TEST_CASE("Events Table tests")
         {
             uint32_t customRepeatOption           = static_cast<uint32_t>(weekDayOption::saturday);
             uint32_t numberOfEvents               = 5;
-            calendar::TimePoint originalStartDate = TimePointFromString("2020-12-10 14:30:00"); // thursday
-            calendar::TimePoint originalEndDate   = TimePointFromString("2020-12-10 15:30:00"); // thursday
+            TimePoint originalStartDate           = TimePointFromString("2020-12-10 14:30:00"); // thursday
+            TimePoint originalEndDate             = TimePointFromString("2020-12-10 15:30:00"); // thursday
 
             check_custom_repeat(customRepeatOption, numberOfEvents, originalStartDate, originalEndDate);
         }


@@ 470,8 470,8 @@ TEST_CASE("Events Table tests")
 
     SECTION("Check count from filter")
     {
-        calendar::TimePoint from = TimePointFromString("2019-10-20 14:30:00");
-        calendar::TimePoint till = TimePointFromString("2019-10-24 14:20:00");
+        TimePoint from = TimePointFromString("2019-10-20 14:30:00");
+        TimePoint till = TimePointFromString("2019-10-24 14:20:00");
 
         CHECK(eventsTbl.countFromFilter(from, till) == 4);
     }


@@ 516,8 516,8 @@ TEST_CASE("Events Table tests")
         CHECK(eventsTbl.count() == 6);
 
         std::string newTitle = "Updated Title", newProviderID = "PurePhoneUpdated";
-        calendar::TimePoint newDateFrom = TimePointFromString("2020-10-20 15:00:00"),
-                            newDateTill = TimePointFromString("2020-10-20 16:00:00");
+        TimePoint newDateFrom           = TimePointFromString("2020-10-20 15:00:00"),
+                  newDateTill           = TimePointFromString("2020-10-20 16:00:00");
         uint32_t newReminder            = static_cast<uint32_t>(Reminder::one_week_before);
         uint32_t newRepeatOption        = static_cast<uint32_t>(Repeat::biweekly);
 


@@ 572,8 572,8 @@ TEST_CASE("Events Table tests")
 
         std::string newTitle = "Updated Title", newProviderType = "PurePhoneUpdate", newProviderID = "newID",
                     newProvideriCalUid  = "new iCalUid";
-        calendar::TimePoint newDateFrom = TimePointFromString("2020-10-20 15:00:00"),
-                            newDateTill = TimePointFromString("2020-10-20 16:00:00");
+        TimePoint newDateFrom           = TimePointFromString("2020-10-20 15:00:00"),
+                  newDateTill           = TimePointFromString("2020-10-20 16:00:00");
         uint32_t newReminder            = static_cast<uint32_t>(Reminder::one_week_before);
         uint32_t newRepeatOption        = static_cast<uint32_t>(Repeat::biweekly);
 


@@ 630,8 630,8 @@ TEST_CASE("Events Table tests")
 
         std::string newTitle = "Updated Title", newProviderType = "PurePhoneUpdate", newProviderID = "newID",
                     newProvideriCalUid  = "new iCalUid";
-        calendar::TimePoint newDateFrom = TimePointFromString("2020-10-20 15:00:00"),
-                            newDateTill = TimePointFromString("2020-10-20 16:00:00");
+        TimePoint newDateFrom           = TimePointFromString("2020-10-20 15:00:00"),
+                  newDateTill           = TimePointFromString("2020-10-20 16:00:00");
         uint32_t newReminder            = static_cast<uint32_t>(Reminder::one_week_before);
         uint32_t newRepeatOption        = static_cast<uint32_t>(Repeat::biweekly);
 


@@ 729,11 729,11 @@ TEST_CASE("Events Table tests")
         }
         CHECK(eventsTbl.count() == 0);
 
-        calendar::TimePoint startDate1 = TimePointFromString("2018-10-20 14:24:00");
-        calendar::TimePoint startDate2 = TimePointFromString("2020-10-20 14:24:00");
+        TimePoint startDate1 = TimePointFromString("2018-10-20 14:24:00");
+        TimePoint startDate2 = TimePointFromString("2020-10-20 14:24:00");
 
-        calendar::TimePoint tillDate  = TimePointFromString("2030-10-20 15:24:00");
-        calendar::TimePoint firedDate = TimePointFromString("2018-10-20 14:24:00");
+        TimePoint tillDate  = TimePointFromString("2030-10-20 15:24:00");
+        TimePoint firedDate = TimePointFromString("2018-10-20 14:24:00");
 
         EventsTableRow testEvent1 = {{1},
                                      .UID              = "test1",