Merge lp:~rpadovani/ubuntu-calculator-app/history into lp:ubuntu-calculator-app

[Riccardo Padovani]

Created the database

Create the backend for the database.

Added function to create and delete calcs in the database

[Mihir Soni (mihirsoni)]

Hi This looks great.

I can see only two fields in DB , I believe we need datetime as well ?

review: Needs Information

[Bartosz Kosiorek (gang65)]

+1 to save also current date.

According to this document:
https://docs.google.com/presentation/d/1EiIELGizPHrd0TY7JdNwULbiqPYfOyEEI5CS87n7QlY/edit#slide=id.g4d8c681df_076

We should also save date in history

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

After save history with many entries, and reopen calculator, the keypad are gone.

I think we should display keypad by default after run calculator.

[Bartosz Kosiorek (gang65)]

Please investigate docId potential issue

review: Needs Fixing

[lp:~rpadovani/ubuntu-calculator-app/history]

21. By Riccardo Padovani on 2014-12-03

Fixed vars name

[Riccardo Padovani (rpadovani)]

Fixed all vars name as by comment.

The docId is univoque, because Database doesn't delete index of deleted docs, so calcDatabase.listDocs().length returns number of all documents added in the database, also if after they were deleted

[Bartosz Kosiorek (gang65)]

Looks ok for me

review: Approve

=== added file 'app/engine/CalculationHistory.qml'
--- app/engine/CalculationHistory.qml	1970-01-01 00:00:00 +0000
+++ app/engine/CalculationHistory.qml	2014-12-03 22:51:51 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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.3
+import Ubuntu.Components 1.1
+import U1db 1.0 as U1db
+
+Item {
+    U1db.Database {
+        id: calculationHistoryDatabase
+        path: "com.ubuntu.calculator"
+    }
+
+    U1db.Document {
+        id: calculationDocument
+        database: calculationHistoryDatabase
+    }
+
+    U1db.Index {
+        id: index
+        database: calculationHistoryDatabase
+        name: "byDocId"
+        expression: ["formula", "result"]
+    }
+
+    U1db.Query {
+        id: query
+        index: index
+    }
+
+    SortFilterModel {
+        id: sortedHistory
+        model: query
+        sort.property: "docId"
+        sort.order: Qt.DescendingOrder
+    }
+
+    function addCalculationToDatabase(formula, result) {
+        var docId = calculationHistoryDatabase.listDocs().length;
+        var calculationToAdd = calculationDocument;
+
+        calculationToAdd.docId = docId;
+        calculationToAdd.contents = {
+            'formula': formula,
+            'result': result
+        };
+
+        calculationToAdd.create = true;
+    }
+
+    function getContents() {
+        return sortedHistory;
+    }
+
+    function deleteCalc(docId) {
+        calculationHistoryDatabase.deleteDoc(docId);
+    }
+}

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2014-12-02 17:50:22 +0000
+++ app/ubuntu-calculator-app.qml	2014-12-03 22:51:51 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 import "ui"
+import "engine"
 import "engine/math.js" as MathJs
 
 MainView {
@@ -222,16 +223,15 @@
             return;
         }
 
-        historyModel.insert(0, {"formulaToDisplay":returnFormulaToDisplay(longFormula), "result":displayedInputText});
+        calculationHistory.addCalculationToDatabase(returnFormulaToDisplay(longFormula), displayedInputText);
         longFormula = result;
         shortFormula = result;
         numberOfOpenedBrackets = 0;
         isAllowedToAddDot = false;
     }
 
-    ListModel {
-        // TODO: create a separate component with storage management
-        id: historyModel
+    CalculationHistory {
+        id: calculationHistory
     }
 
     ListView {
@@ -246,14 +246,14 @@
         // and we set the position of the keyboard to bottom
         verticalLayoutDirection: ListView.BottomToTop
 
-        model: historyModel
+        model: calculationHistory.getContents()
 
         delegate: Screen {
             width: parent.width
         }
 
         header: Column {
-            width: parent.width
+            width: parent ? parent.width : 0
 
             TextField {
                 height: units.gu(6)
@@ -282,8 +282,6 @@
                 selectByMouse: true
             }
 
-            // TODO: insert here actual screen
-
             CalcKeyboard {
                 id: calcKeyboard
             }

=== modified file 'app/ui/Screen.qml'
--- app/ui/Screen.qml	2014-11-28 00:01:50 +0000
+++ app/ui/Screen.qml	2014-12-03 22:51:51 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 0.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Standard {
@@ -26,13 +25,13 @@
     Row {
         id: row
         Text {
-            text: formulaToDisplay;
+            text: contents.formula
         }
         Text {
             text: "=";
         }
         Text {
-            text: result;
+            text: contents.result
             font.bold: true
         }
     }