Merge lp:~rpadovani/ubuntu-calculator-app/fix-for-1156520 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Fixed bug 1156520:
- added label for date
- added function to convert timestamp in a string

Fixed bug 1156520:
- added label for date
- added function to convert timestamp in a string

[Dalius (dalius-sandbox)]

We will definitely have problems with l10n with this but we can address that later.

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/fix-for-1156520/+merge/154431/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

> FAILED: Autolanding.
> No commit message was specified in the merge proposal. Hit 'Add commit
> message' on the merge proposal web page or follow the link below. You can
> approve the merge proposal yourself to rerun.
> https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/fix-
> for-1156520/+merge/154431/+edit-commit-message

Done...

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

review: Approve (continuous-integration)

=== modified file 'Simple/Memory.qml'
--- Simple/Memory.qml	2013-03-19 09:51:33 +0000
+++ Simple/Memory.qml	2013-03-20 16:34:23 +0000
@@ -8,5 +8,6 @@
         isLastItem: true
         operators: []
         mainLabel: ''
+        dateText: ''
     }
 }

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-03-19 09:51:33 +0000
+++ Simple/Screen.qml	2013-03-20 16:34:23 +0000
@@ -13,12 +13,14 @@
     signal useAnswer(string answerToUse, string formulaData)
     signal labelTextUpdated(int idx, string newText)
     signal mainLabelUpdated(int idx, string newText)
+    signal dateUpdate(int idx)
     signal removeItem()
 
     Rectangle{
         id: _content
         width: parent.width
         height: inputs.height+units.gu(2)
+
         Column {
             id: inputs
             anchors.top: parent.top
@@ -26,6 +28,23 @@
             width: parent.width - units.gu(4)
             anchors.centerIn: parent
 
+            // Every five minutes update date label
+            Timer {
+                interval: 300000
+                repeat: true
+                running: true
+                onTriggered: root.dateUpdate(index)
+            }
+
+            Text {
+                id: dateLabel
+                width: parent.width
+                color: "#757373"
+                text: dateText
+                font.italic: true
+                font.family: "Ubuntu"
+            }
+
             TextField{
                 width: parent.width
                 ItemStyle.delegate: Item{} // removes ubuntu shape

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-03-19 17:52:36 +0000
+++ Simple/SimplePage.qml	2013-03-20 16:34:23 +0000
@@ -154,11 +154,13 @@
             function addCurrentToMemory() {
                 if (screenFormula[screenFormula.length-1]._operation === '=') {
                     var currentDate = new Date();
-                    if (memory.get(0).mainLabel.length == 0)
-                        memory.get(0).mainLabel = currentDate.toString();
+                    if (memory.get(0).mainLabel.length === 0)
+                        memory.get(0).mainLabel = '';
                     memory.get(0).isLastItem = false
+                    memory.get(0).dateText = "Few seconds ago..."
+                    memory.get(0).timeStamp = currentDate.getTime()
                     memory.setProperty(0, "timeStamp", currentDate.getTime());
-                    memory.insert(0,{'dbId': -1, 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
+                    memory.insert(0,{'dbId': -1, 'dateText': "", 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
                     positionViewAtBeginning();
                 }
             }
@@ -207,6 +209,16 @@
                     memory.get(index).mainLabel = newText;
                 }
 
+                // Update date label
+                onDateUpdate: {
+                    // If is in database
+                    if (memory.get(index).dbId !== -1)
+                        memory.get(index).dateText = storage.fromDateToString(storage.fromIdToDate(memory.get(index).dbId));
+                    // If is in memory but not in database
+                    else if (memory.get(index).timeStamp)
+                        memory.get(index).dateText = storage.fromDateToString(memory.get(index).timeStamp);
+                }
+
                 onLabelTextUpdated: {
                     if(index === 0){
                         screenFormula[idx]._text = newText;

=== modified file 'Storage.qml'
--- Storage.qml	2013-03-19 09:51:33 +0000
+++ Storage.qml	2013-03-20 16:34:23 +0000
@@ -35,8 +35,11 @@
                         for(var i=res.rows.length - 1; i >= 0; i--){
                             var obj = JSON.parse(res.rows.item(i).calc);
                             obj.dbId = res.rows.item(i).id;
+                            obj.dateText  = fromDateToString(res.rows.item(i).insertDate);
+
                             if (!('mainLabel' in obj))
                                 obj.mainLabel = ''
+
                             callback(obj);
                         }
                     }
@@ -66,4 +69,76 @@
             tx.executeSql('DELETE FROM Calculations WHERE id = ?', [calc.dbId]);
         });
     }
+
+    /*
+     * Function fromDateToString
+     *
+     * Given an input object recovers its timestamp and
+     * returns a string based on how much time has passed
+     */
+    function fromDateToString(time) {
+        time = new Date(time);
+        var now = new Date();
+        var string;
+
+        // Create a string with minutes :MM AM/PM
+        var minutes = ":";
+        minutes += time.getMinutes() < 10 ? "0" : "";
+        minutes += time.getMinutes() + " "
+        minutes += time.getHours() > 12 ? "PM" : "AM";
+
+        var weekdays = ["Sun","Mon","Tue", "Wed", "Thu", "Fry", "Sat"];
+        var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+        // Today
+        if (now.getDate() - time.getDate() === 0 && now.getMonth() === time.getMonth()) {
+            // Between 0 & 59 minutes
+            if (now.getHours() - time.getHours() < 1 || (now.getHours() - time.getHours() === 1 && time.getMinutes() > now.getMinutes())) {
+                // This is for different hours ex datestamp 11:58 now 12:02
+                string = now.getMinutes() - time.getMinutes() > 0 ? now.getMinutes() - time.getMinutes() : now.getMinutes() - time.getMinutes() + 60;
+                string += " minutes ago";
+
+                // Less than two minutes
+                if (now.getMinutes() - time.getMinutes() <= 1 && now.getMinutes() - time.getMinutes() >= 0 )
+                    string = "Few seconds ago...";
+
+                return string;
+            }
+
+            // > 1 hour ago
+            string = now.getHours() - time.getHours() + " hour";
+            string += now.getHours() - time.getHours() > 1 ? "s" : "";
+            return string + "  ago";
+        } // End today
+
+        // Between yesterday and one week ago
+        if (now.getDate() - time.getDate() > 0 && now.getDate() - time.getDate() < 7 && now.getMonth() === time.getMonth()) {
+            string = now.getDate() - time.getDate() === 1 ? "Yesterday" : weekdays[time.getDay()];
+            string += ", ";
+            string += time.getHours() > 12 ? time.getHours() - 12 : time.getHours();
+            string += minutes;
+
+            return string;
+        }
+
+        // More than one week ago
+        string = months[time.getMonth()];
+        string += " " + weekdays[time.getDay()] + ", ";
+        string += time.getHours() > 12 ? time.getHours() - 12 : time.getHours();
+        string += minutes;
+        return string;
+    }
+
+    // Function to have time from an ID
+    function fromIdToDate (dbId) {
+        var time;
+        openDB();
+        db.transaction(
+            function(tx){
+                var res = tx.executeSql('SELECT insertDate FROM Calculations WHERE id = ?', dbId);
+                time = res.rows.item(0).insertDate;
+             }
+        );
+        return time;
+    }
 }

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-12 16:27:14 +0000
+++ debian/changelog	2013-03-20 16:34:23 +0000
@@ -1,3 +1,10 @@
+ubuntu-calculator-app (0.1ubuntu1) UNRELEASED; urgency=low
+
+  * Fixing bug 1156520
+  * Added a function to convert date to string 
+
+ -- Riccardo Padovani <[e-mail]>  Wed, 20 Mar 2013 17:26:30 +0100
+
 ubuntu-calculator-app (0.1) raring; urgency=low
 
   * Initial release