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

[Michael Zanetti]

Implement more reminders functionality

This makes the Remidners page look like in the wireframe and enables marking it as done and setting a reminder time.

There is one issue:
You can only edit reminders where you have fetched the content first, otherwise the enml validation will fail when trying to save the note. I need to fix that in a separate, long overdue branch where we only save stuff that has actually changed instead of always setting the whole note, regardless if there are changes or not.

So when testing this, please only test on notes which you have once opened first or it will fail.

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

FAILED: Continuous integration, rev:37
http://91.189.93.70:8080/job/reminders-app-ci/84/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/842/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/84

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

anyone can review this?

[Riccardo Padovani (rpadovani)]

Works as expected!
Good work :-)

review: Approve

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

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

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

review: Approve (continuous-integration)

=== added file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/RemindersDelegate.qml	2014-01-28 12:02:41 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Pickers 0.1
+
+Empty {
+    id: root
+    height: expanded ? mainColumn.height : implicitHeight
+    clip: true
+
+    property var note
+
+    property bool expanded: false
+
+    onExpandedChanged: {
+        if (expanded) {
+            if (note.hasReminderTime) {
+                date.setDate(note.reminderTime.getDate())
+            }
+        } else {
+            note.save();
+        }
+    }
+
+    Behavior on height {
+        UbuntuNumberAnimation {}
+    }
+
+    Column {
+        id: mainColumn
+        anchors { left: parent.left; right: parent.right; top: parent.top; leftMargin: units.gu(2); rightMargin: units.gu(2) }
+        spacing: units.gu(2)
+        height: implicitHeight + units.gu(1)
+
+        Row {
+            anchors { left: parent.left; right: parent.right }
+            height: root.implicitHeight
+            spacing: units.gu(1)
+
+            CheckBox {
+                id: checkBox
+                anchors.verticalCenter: parent.verticalCenter
+                checked: note.reminderDone
+                onClicked: {
+                    note.reminderDone = checked;
+                    note.save();
+                }
+            }
+
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
+                text: note.title
+                width: parent.width - checkBox.width - reminderTimeRow.width - parent.spacing * 2
+            }
+            Row {
+                id: reminderTimeRow
+                anchors { top: parent.top; bottom: parent.bottom }
+                spacing: units.gu(2)
+
+                Label {
+                    id: timeLabel
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: Qt.formatDate(note.reminderTime)
+                    visible: note.hasReminderTime
+                    Component.onCompleted: print("Got reminder time", note.reminderTime)
+                }
+                Icon {
+                    id: alarmIcon
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: units.gu(4)
+                    height: width
+                    name: "alarm-clock"
+
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: root.expanded = !root.expanded;
+                    }
+                }
+            }
+        }
+
+
+        Row {
+            id: datePicker
+            width: childrenRect.width
+            height: monthPicker.height
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: units.gu(1)
+
+            property var date: new Date()
+            property int minYear: 2010
+            property bool editing: false
+
+            Picker {
+                id: dayPicker
+                model: getDays(monthPicker.selectedIndex, yearPicker.selectedIndex + 2010)
+                function getDays(month, year) {
+                    switch(month) {
+                    case 1:
+                        if (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)) {
+                            return 29;
+                        }
+                        return 28;
+                    case 3:
+                    case 5:
+                    case 8:
+                    case 10:
+                        return 30;
+                    default:
+                        return 31;
+                    }
+                }
+                delegate: PickerDelegate {
+                    Label {
+                        anchors.centerIn: parent
+                        text: modelData + 1
+                    }
+                }
+                selectedIndex: datePicker.date.getDate() - 1
+                onSelectedIndexChanged: {
+                    datePicker.date.setDate(selectedIndex + 1)
+                }
+            }
+            Picker {
+                id: monthPicker
+                model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"]
+                delegate: PickerDelegate {
+                    Label {
+                        anchors.centerIn: parent
+                        text: modelData
+                    }
+                }
+                selectedIndex: datePicker.date.getMonth()
+                onSelectedIndexChanged: {
+                    var selectedDay = dayPicker.selectedIndex;
+                    datePicker.date.setMonth(selectedIndex)
+                    dayPicker.selectedIndex = selectedDay;
+                }
+            }
+            Picker {
+                id: yearPicker
+                model: 100
+                circular: false
+                delegate: PickerDelegate {
+                    Label {
+                        anchors.centerIn: parent
+                        text: datePicker.minYear + modelData
+                    }
+                }
+                selectedIndex: datePicker.date.getFullYear() - datePicker.minYear
+                onSelectedIndexChanged: {
+                    var selectedDay = dayPicker.selectedIndex;
+                    datePicker.date.setFullYear(selectedIndex + datePicker.minYear)
+                    dayPicker.selectedIndex = selectedDay;
+                }
+            }
+        }
+
+        Row {
+            spacing: units.gu(2)
+            anchors { left: parent.left; right: parent.right }
+            height: childrenRect.height
+
+            Button {
+                text: "Clear"
+                width: (parent.width - parent.spacing) / 2
+                onClicked: {
+                    note.hasReminderTime = false;
+                    root.expanded = false;
+                }
+            }
+            Button {
+                text: "OK"
+                width: (parent.width - parent.spacing) / 2
+                onClicked: {
+                    print("setting date to ", datePicker.date)
+                    note.reminderTime = datePicker.date
+                    root.expanded = false;
+                }
+            }
+        }
+    }
+}

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2013-12-15 02:48:04 +0000
+++ src/app/qml/ui/RemindersPage.qml	2014-01-28 12:02:41 +0000
@@ -53,10 +53,8 @@
 
         anchors.fill: parent
 
-        delegate: Subtitled {
-            text: '<b>Name:</b> ' + model.title
-            subText: '<b>Date:</b> ' + Qt.formatDateTime(model.created) +
-                     (model.reminderDone ? " - <b>Done:</b> " + Qt.formatDate(model.reminderDoneTime) : "")
+        delegate: RemindersDelegate {
+            note: notes.note(guid)
         }
 
         model: notes

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-01-23 09:46:02 +0000
+++ src/plugin/Evernote/note.cpp	2014-01-28 12:02:41 +0000
@@ -144,6 +144,22 @@
     }
 }
 
+bool Note::hasReminderTime() const
+{
+    return !m_reminderTime.isNull();
+}
+
+void Note::setHasReminderTime(bool hasReminderTime)
+{
+    if (hasReminderTime && m_reminderTime.isNull()) {
+        m_reminderTime = QDateTime::currentDateTime();
+        emit reminderTimeChanged();
+    } else if (!hasReminderTime && !m_reminderTime.isNull()) {
+        m_reminderTime = QDateTime();
+        emit reminderTimeChanged();
+    }
+}
+
 QDateTime Note::reminderTime() const
 {
     return m_reminderTime;
@@ -167,6 +183,9 @@
     if (reminderDone && m_reminderDoneTime.isNull()) {
         m_reminderDoneTime = QDateTime::currentDateTime();
         emit reminderDoneChanged();
+    } else if (!reminderDone && !m_reminderDoneTime.isNull()) {
+        m_reminderDoneTime = QDateTime();
+        emit reminderDoneChanged();
     }
 }
 

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2014-01-24 18:13:04 +0000
+++ src/plugin/Evernote/note.h	2014-01-28 12:02:41 +0000
@@ -44,6 +44,7 @@
     Q_PROPERTY(QString plaintextContent READ plaintextContent NOTIFY contentChanged)
     Q_PROPERTY(QStringList resourceUrls READ resourceUrls NOTIFY contentChanged)
     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(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
     Q_PROPERTY(QDateTime reminderDoneTime READ reminderDoneTime WRITE setReminderDoneTime NOTIFY reminderDoneChanged)
@@ -74,8 +75,7 @@
 
     QString plaintextContent() const;
 
-    // This is the QML representation as we don't want to deal with timestamps there.
-    // setting it to false will reset the reminderOrder to 0, setting it to true will
+    // setting reminder to false will reset the reminderOrder to 0, setting it to true will
     // create a new timestamp for it.
     bool reminder() const;
     void setReminder(bool reminder);
@@ -83,6 +83,11 @@
     qint64 reminderOrder() const;
     void setReminderOrder(qint64 reminderOrder);
 
+    // setting hasReminderTime to false will reset reminderTime to 0, setting it to true will
+    // create a new timestamp for it.
+    bool hasReminderTime() const;
+    void setHasReminderTime(bool hasReminderTime);
+
     QDateTime reminderTime() const;
     void setReminderTime(const QDateTime &reminderTime);
 

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2013-12-13 00:17:48 +0000
+++ src/plugin/Evernote/notes.cpp	2014-01-28 12:02:41 +0000
@@ -74,6 +74,11 @@
     }
 }
 
+Note *Notes::note(const QString &guid)
+{
+    return NotesStore::instance()->note(guid);
+}
+
 bool Notes::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);

=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2013-12-18 20:57:07 +0000
+++ src/plugin/Evernote/notes.h	2014-01-28 12:02:41 +0000
@@ -44,6 +44,8 @@
     bool onlySearchResults() const;
     void setOnlySearchResults(bool onlySearchResults);
 
+    Q_INVOKABLE Note* note(const QString &guid);
+
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-01-23 09:39:43 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-01-28 12:02:41 +0000
@@ -188,6 +188,11 @@
             note->setIsSearchResult(true);
         }
 
+        QDateTime reminderTime;
+        if (result.attributes.reminderTime > 0) {
+            reminderTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderTime);
+        }
+        note->setReminderTime(reminderTime);
         QDateTime reminderDoneTime;
         if (result.attributes.reminderDoneTime > 0) {
             reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);
@@ -241,6 +246,11 @@
 
     note->setEnmlContent(QString::fromStdString(result.content));
     note->setReminderOrder(result.attributes.reminderOrder);
+    QDateTime reminderTime;
+    if (result.attributes.reminderTime > 0) {
+        reminderTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderTime);
+    }
+    note->setReminderTime(reminderTime);
     QDateTime reminderDoneTime;
     if (result.attributes.reminderDoneTime > 0) {
         reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);