Merge lp:~mzanetti/reminders-app/reminders-sorting into lp:reminders-app

[Michael Zanetti]

Implement reminders sorting by sections

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:67
http://91.189.93.70:8080/job/reminders-app-ci/212/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1347
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/212
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/212

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/212/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

 + if (m_reminderOrder == 0) {
29 + return QString();
30 + }
31 +
32 + if (m_reminderTime < QDateTime::currentDateTime().addDays(1)) {
33 + return QStringLiteral("today");
34 + }

Need to add an if for reminders in the past.
Now a past reminder is under 'today' section.

To reproduce create a reminder and set it to a date in 2013.

review: Needs Fixing

[lp:~mzanetti/reminders-app/reminders-sorting]

68. By Michael Zanetti on 2014-02-17

fix calculation of dates for group header

[Michael Zanetti (mzanetti)]

> + if (m_reminderOrder == 0) {
> 29 + return QString();
> 30 + }
> 31 +
> 32 + if (m_reminderTime < QDateTime::currentDateTime().addDays(1)) {
> 33 + return QStringLiteral("today");
> 34 + }
>
> Need to add an if for reminders in the past.
> Now a past reminder is under 'today' section.
>
> To reproduce create a reminder and set it to a date in 2013.

fixed. Good catch!

[Riccardo Padovani (rpadovani)]

Now works as expected;
Good work!

review: Approve

=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml	2014-01-28 11:57:01 +0000
+++ src/app/qml/components/RemindersDelegate.qml	2014-02-17 23:32:59 +0000
@@ -34,7 +34,7 @@
     onExpandedChanged: {
         if (expanded) {
             if (note.hasReminderTime) {
-                date.setDate(note.reminderTime.getDate())
+                datePicker.date.setDate(note.reminderTime.getDate())
             }
         } else {
             note.save();

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2014-02-12 15:44:02 +0000
+++ src/app/qml/ui/RemindersPage.qml	2014-02-17 23:32:59 +0000
@@ -67,6 +67,13 @@
         }
 
         model: notes
+
+        section.criteria: ViewSection.FullString
+        section.property: "reminderTimeString"
+        section.delegate: Standard {
+            height: units.gu(3)
+            text: section
+        }
     }
 
 }

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-02-05 17:26:54 +0000
+++ src/plugin/Evernote/note.cpp	2014-02-17 23:32:59 +0000
@@ -189,6 +189,32 @@
     }
 }
 
+QString Note::reminderTimeString() const
+{
+    if (m_reminderOrder == 0) {
+        return QString();
+    }
+
+    QDate reminderDate = m_reminderTime.date();
+    QDate today = QDate::currentDate();
+    if (reminderDate < today) {
+        return QStringLiteral("missed");
+    }
+    if (reminderDate == today) {
+        return QStringLiteral("today");
+    }
+    if (reminderDate == today.addDays(1)) {
+        return QStringLiteral("tomorrow");
+    }
+    if (reminderDate <= today.addDays(7)) {
+        return QStringLiteral("next week");
+    }
+    if (reminderDate <= today.addDays(14)) {
+        return QStringLiteral("two weeks");
+    }
+    return QStringLiteral("more than two weeks");
+}
+
 QDateTime Note::reminderDoneTime() const
 {
     return m_reminderDoneTime;

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2014-02-05 17:26:54 +0000
+++ src/plugin/Evernote/note.h	2014-02-17 23:32:59 +0000
@@ -47,6 +47,7 @@
     Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
     Q_PROPERTY(bool hasReminderTime READ hasReminderTime WRITE setHasReminderTime NOTIFY reminderTimeChanged)
     Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
+    Q_PROPERTY(QString reminderTimeString READ reminderTimeString NOTIFY reminderTimeChanged)
     Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
     Q_PROPERTY(QDateTime reminderDoneTime READ reminderDoneTime WRITE setReminderDoneTime NOTIFY reminderDoneChanged)
     Q_PROPERTY(bool isSearchResult READ isSearchResult NOTIFY isSearchResultChanged)
@@ -98,6 +99,8 @@
     bool reminderDone() const;
     void setReminderDone(bool reminderDone);
 
+    QString reminderTimeString() const;
+
     QDateTime reminderDoneTime() const;
     void setReminderDoneTime(const QDateTime &reminderDoneTime);
 

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2014-02-05 17:26:54 +0000
+++ src/plugin/Evernote/notes.cpp	2014-02-17 23:32:59 +0000
@@ -56,6 +56,13 @@
     if (m_onlyReminders != onlyReminders) {
         m_onlyReminders = onlyReminders;
         emit onlyRemindersChanged();
+        if (onlyReminders) {
+            setSortRole(NotesStore::RoleReminderTime);
+        } else {
+            setSortRole(NotesStore::RoleCreated);
+        }
+        sort(0, Qt::AscendingOrder);
+
         invalidateFilter();
     }
 }

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-02-07 14:31:28 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-02-17 23:32:59 +0000
@@ -80,6 +80,8 @@
         return m_notes.at(index.row())->reminder();
     case RoleReminderTime:
         return m_notes.at(index.row())->reminderTime();
+    case RoleReminderTimeString:
+        return m_notes.at(index.row())->reminderTimeString();
     case RoleReminderDone:
         return m_notes.at(index.row())->reminderDone();
     case RoleReminderDoneTime:
@@ -107,6 +109,7 @@
     roles.insert(RoleTitle, "title");
     roles.insert(RoleReminder, "reminder");
     roles.insert(RoleReminderTime, "reminderTime");
+    roles.insert(RoleReminderTimeString, "reminderTimeString");
     roles.insert(RoleReminderDone, "reminderDone");
     roles.insert(RoleReminderDoneTime, "reminderDoneTime");
     roles.insert(RoleEnmlContent, "enmlContent");

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-01-27 13:00:41 +0000
+++ src/plugin/Evernote/notesstore.h	2014-02-17 23:32:59 +0000
@@ -56,6 +56,7 @@
         RoleTitle,
         RoleReminder,
         RoleReminderTime,
+        RoleReminderTimeString,
         RoleReminderDone,
         RoleReminderDoneTime,
         RoleIsSearchResult,