4 files changed, 23 insertions(+), 26 deletions(-)

M module-apps/application-calendar/windows/EventReminderWindow.cpp
M module-db/Tables/EventsTable.cpp
M module-db/Tables/EventsTable.hpp
M module-services/service-time/timeEvents/CalendarTimeEvents.cpp

@@ 115,7 115,7 @@ namespace gui
             return false;
         }
 
-        eventRecord    = item->getData();
+        eventRecord = item->getData();
         dateLabel->setText(TimePointToLocalizedDateString(eventRecord->date_from));
         timeLabel->setText(TimePointToLocalizedTimeString(eventRecord->date_from));
         descriptionLabel->setText(eventRecord->title);

@@ 347,17 347,15 @@ bool EventsTable::addCustom(EventsTableRow entry)
     for (uint32_t i = 1; i <= numberOfWeeks; i++) {
         for (auto option : weekDayOptions) {
             if (option) {
-                result =
-                    result &&
-                    db->execute("INSERT or IGNORE INTO events "
-                                "(title, date_from, date_till, reminder, repeat, reminder_fired) VALUES"
-                                "('%q', '%q','%q', %u, %u);",
-                                entry.title.c_str(),
-                                TimePointToString(dateFrom + date::days{incrementation}).c_str(),
-                                TimePointToString(dateTill + date::days{incrementation}).c_str(),
-                                entry.reminder,
-                                entry.repeat,
-                                TimePointToString(entry.reminder_fired).c_str());
+                result = result && db->execute("INSERT or IGNORE INTO events "
+                                               "(title, date_from, date_till, reminder, repeat, reminder_fired) VALUES"
+                                               "('%q', '%q','%q', %u, %u);",
+                                               entry.title.c_str(),
+                                               TimePointToString(dateFrom + date::days{incrementation}).c_str(),
+                                               TimePointToString(dateTill + date::days{incrementation}).c_str(),
+                                               entry.reminder,
+                                               entry.repeat,
+                                               TimePointToString(entry.reminder_fired).c_str());
             }
             ++incrementation;
         }


@@ 537,16 535,15 @@ uint32_t EventsTable::countByFieldId(const char *field, uint32_t id)
 
 std::vector<EventsTableRow> EventsTable::SelectFirstUpcoming(TimePoint filter_from, TimePoint filter_till)
 {
-    auto retQuery =
-        db->query("SELECT DATETIME(date_from, '-' || reminder || ' minutes') AS calc_dt, * "
-                  "FROM events "
-                  "WHERE calc_dt >= '%q' "
-                  "AND reminder_fired = '%q' "
-                  "AND reminder <> -1 "
-                  "ORDER BY calc_dt "
-                  "LIMIT 1 ",
-                  TimePointToString(filter_from).c_str(),
-                  TimePointToString(TIME_POINT_INVALID).c_str());
+    auto retQuery = db->query("SELECT DATETIME(date_from, '-' || reminder || ' minutes') AS calc_dt, * "
+                              "FROM events "
+                              "WHERE calc_dt >= '%q' "
+                              "AND reminder_fired = '%q' "
+                              "AND reminder <> -1 "
+                              "ORDER BY calc_dt "
+                              "LIMIT 1 ",
+                              TimePointToString(filter_from).c_str(),
+                              TimePointToString(TIME_POINT_INVALID).c_str());
 
     if ((retQuery == nullptr) || (retQuery->getRowCount() == 0)) {
         return std::vector<EventsTableRow>();

@@ 12,8 12,8 @@ struct EventsTableRow : public Record
     std::string title;
     TimePoint date_from = TIME_POINT_INVALID;
     TimePoint date_till = TIME_POINT_INVALID;
-    uint32_t reminder  = 0;
-    uint32_t repeat    = 0;
+    uint32_t reminder        = 0;
+    uint32_t repeat          = 0;
     TimePoint reminder_fired = TIME_POINT_INVALID;
 };
 

@@ 44,8 44,8 @@ namespace stm
             return 0;
         }
 
-        eventRecord = records->at(0);
-        startTP     = eventRecord.date_from - minutes{eventRecord.reminder};
+        eventRecord   = records->at(0);
+        startTP       = eventRecord.date_from - minutes{eventRecord.reminder};
         auto duration = eventRecord.date_from - std::chrono::minutes{eventRecord.reminder} - TimePointNow();
         if (duration.count() <= 0) {
             duration = std::chrono::milliseconds(eventTimerMinSkipInterval);