Merge lp:~fredoust/sudoku-app/profiles into lp:sudoku-app

[Frédéric Delgado]

[Dinko Osmankovic (dinko-metalac)]

review: Approve

[lp:~fredoust/sudoku-app/profiles]

67. By Frédéric Delgado on 2013-07-09

Clean code

=== added file 'components/AddProfileDialog.qml'
--- components/AddProfileDialog.qml	1970-01-01 00:00:00 +0000
+++ components/AddProfileDialog.qml	2013-07-09 09:59:26 +0000
@@ -0,0 +1,97 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import "../js/localStorage.js" as Settings
+import QtQuick.LocalStorage 2.0
+
+Component {
+    id: addProfileDialog
+
+    Dialog {
+        id: addProfileDialogue
+        title: i18n.tr("Add new profile")
+        width: parent.width
+
+
+        Column {
+            width: parent.width
+            spacing: units.gu(2)
+
+            Rectangle{
+                width: units.gu(25)
+                height: units.gu(4)
+                radius: 9
+                anchors.horizontalCenter: parent.horizontalCenter
+                TextField {
+                    id:lastnameField
+
+                    placeholderText: i18n.tr("Lastname")
+
+                }
+            }
+            Rectangle{
+                width: units.gu(25)
+                height: units.gu(4)
+                radius: 9
+                anchors.horizontalCenter: parent.horizontalCenter
+                TextField {
+                    id:firstnameField
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    placeholderText: i18n.tr("Firstname")
+                }
+            }
+
+
+            Row{
+                width: parent.width
+                spacing: units.gu(1)
+
+                SudokuDialogButton{
+                    id:okButton
+                    buttonText: i18n.tr("OK")
+                    width: parent.width/2;
+                    size: units.gu(5)
+                    onTriggered: {
+
+                        if(lastnameField.text!="" && firstnameField.text!="")
+                        {
+
+                            if(!Settings.existProfile(lastnameField.text, firstnameField.text))
+                            {
+
+                                Settings.insertProfile(lastnameField.text, firstnameField.text);
+                               PopupUtils.close(addProfileDialogue)
+                            }else{
+                                mainView.showAlert(i18n.tr("Warning"), i18n.tr("User already exist."), okButton)
+                            }
+
+
+                        } else{
+mainView.showAlert(i18n.tr("Warning"), i18n.tr("Lastname and firstname must not be empty."), okButton)
+                        }
+
+
+
+
+
+                    }
+                }
+
+                SudokuDialogButton{
+                    buttonText: i18n.tr("Cancel")
+                    width: parent.width/2;
+                    size: units.gu(5)
+                    onTriggered: {
+                      PopupUtils.close(addProfileDialogue)
+                    }
+                }
+            }
+
+
+
+        }
+
+
+    }
+}
+
 
=== added file 'components/ManageProfileDialog.qml'
--- components/ManageProfileDialog.qml	1970-01-01 00:00:00 +0000
+++ components/ManageProfileDialog.qml	2013-07-09 09:59:26 +0000
@@ -0,0 +1,115 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import "../js/localStorage.js" as Settings
+import QtQuick.LocalStorage 2.0
+
+Component {
+    id: editProfileDialog
+
+    Dialog {
+        id: editProfileDialogue
+        title: i18n.tr("Edit profile")
+        width: parent.width
+
+
+        Column {
+            width: parent.width
+            spacing: units.gu(2)
+
+            Rectangle{
+                width: 200
+                height: 32
+                radius: 9
+                anchors.horizontalCenter: parent.horizontalCenter
+                TextField {
+                    id:lastnameField
+                    text: Settings.getUserLastName(editUserId)
+                    placeholderText: i18n.tr("Lastname")
+
+                }
+            }
+            Rectangle{
+                width: 200
+                height: 32
+                radius: 9
+                anchors.horizontalCenter: parent.horizontalCenter
+                TextField {
+                    id:firstnameField
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    placeholderText: i18n.tr("Firstname")
+                    text: Settings.getUserFirstName(editUserId)
+                }
+            }
+
+
+            Row{
+                width: parent.width
+                spacing: units.gu(1)
+
+                SudokuDialogButton{
+                    id:okButton
+                    buttonText: i18n.tr("OK")
+                    width: parent.width/2;
+                    size: units.gu(5)
+                    onTriggered: {
+
+                        if(lastnameField.text!="" && firstnameField.text!="")
+                        {
+
+                            if(!Settings.existProfile( lastnameField.text, firstnameField.text))
+                            {
+
+                                Settings.updateProfile(editUserId, lastnameField.text, firstnameField.text);
+                                var userId = currentUserId
+                                currentUserId = -1
+                                currentUserId = userId
+
+                                PopupUtils.close(editProfileDialogue)
+                            }else{
+                                PopupUtils.close(editProfileDialogue)
+                            }
+
+
+                        } else{
+                            mainView.showAlert(i18n.tr("Warning"), i18n.tr("Lastname and firstname must not be empty."), okButton)
+                        }
+
+
+
+
+
+                    }
+                }
+
+                SudokuDialogButton{
+                    buttonText: i18n.tr("Delete")
+                    width: parent.width/2;
+                    size: units.gu(5)
+                    onTriggered: {
+                        Settings.deleteProfile(editUserId)
+                        if(editUserId == currentUserId)
+                            currentUserId = -1
+
+
+                       PopupUtils.close(editProfileDialogue)
+                    }
+                }
+            }
+            SudokuDialogButton{
+                anchors.horizontalCenter: parent.horizontalCenter
+                buttonText: i18n.tr("Cancel")
+                width: parent.width/2;
+                size: units.gu(5)
+                onTriggered: {
+                    PopupUtils.close(editProfileDialogue)
+                }
+            }
+
+
+        }
+
+
+    }
+}
+
 
=== modified file 'components/SudokuDialogButton.qml'
--- components/SudokuDialogButton.qml	2013-07-05 21:36:31 +0000
+++ components/SudokuDialogButton.qml	2013-07-09 09:59:26 +0000
@@ -3,9 +3,9 @@
 
 SudokuButton {
     id: dialogButton
-    border.color: defaultBorderColor
+    border.color: sudokuBlocksGrid.defaultBorderColor
     //border.width: 3
-    textColor: defaultTextColor;
+    textColor: sudokuBlocksGrid.defaultTextColor;
 
     signal triggered;
 
@@ -43,5 +43,5 @@
             animateDialogButton.start();
         }
     }
-    buttonColor: buttonMouseArea.pressed ? String(Qt.darker(defaultColor,1.2)):defaultColor
+    buttonColor: buttonMouseArea.pressed ? String(Qt.darker(sudokuBlocksGrid.defaultColor,1.2)):sudokuBlocksGrid.defaultColor
 }
 
=== modified file 'js/SudokuCU.js'
--- js/SudokuCU.js	2013-07-03 17:08:32 +0000
+++ js/SudokuCU.js	2013-07-09 09:59:26 +0000
@@ -159,20 +159,17 @@
         if(value == 0)
             return false;
 
-         console.log("test for "+value)
         for(var i = 0; i < 9; i++)
         {
             console.log("test with col"+this.rows[i][column])
             if(i != row && this.rows[i][column] == value)
             {
-                console.log("find row")
                 return true;
             }
 
            // console.log("test with row"+this.rows[row][i])
             if(i != column && this.rows[row][i] == value)
             {
-                console.log("find col")
                 return true;
             }
         }
@@ -209,8 +206,6 @@
                 if(value == 0)
                     continue;
 
-                console.log("test minigrid "+value)
-
                 //if(App.Utils.arrayContains(numbers, value))
                 //    return false;
                 if (numbers.indexOf(value) != -1 )
@@ -252,8 +247,6 @@
                 if(value == 0)
                     continue;
 
-                console.log("test minigrid "+value)
-
                 //if(App.Utils.arrayContains(numbers, value))
                 //    return false;
                 if (numbers.indexOf(value) != -1 && value == val)
 
=== modified file 'js/localStorage.js'
--- js/localStorage.js	2013-07-06 06:18:26 +0000
+++ js/localStorage.js	2013-07-09 09:59:26 +0000
@@ -12,14 +12,19 @@
                     // Create the settings table if it doesn't already exist
                     // If the table exists, this is skipped
                     tx.executeSql('PRAGMA foreign_keys = ON;');
+
+
                     tx.executeSql('CREATE TABLE IF NOT EXISTS settings(setting TEXT UNIQUE, value TEXT)');
                     print("setting table created.")
                     tx.executeSql('CREATE TABLE IF NOT EXISTS profiles(id INTEGER PRIMARY KEY AUTOINCREMENT, first_name TEXT, last_name TEXT, UNIQUE(first_name, last_name) ON CONFLICT ROLLBACK)');
                     print("profile table created.")
+
                     tx.executeSql('INSERT OR IGNORE INTO profiles VALUES (null,?,?);', ["Sudoku","User"]);
                     tx.executeSql('CREATE TABLE IF NOT EXISTS scores(id INTEGER PRIMARY KEY AUTOINCREMENT, profile_id INTEGER, score INTEGER NOT NULL, game_date DATE, FOREIGN KEY(profile_id) REFERENCES profiles(id))');
                     print("scores table created.")
 
+
+
                 });
 }
 function setSetting(setting, value) {
@@ -113,6 +118,113 @@
     return res;
 }
 
+function printObject(o)
+{
+    var out = '';
+    for(var p in o){
+        out+=p+': '+o[p]+'\n';
+    }
+    console.log(out)
+}
+
+function getAllProfiles()
+{
+    var db = getDatabase();
+    var res=new Array();
+
+    print("GETTING ALL PROFILES")
+    db.transaction( function(tx) {
+        var rs = tx.executeSql("SELECT * FROM profiles limit 10;");
+        for(var i = 0; i < rs.rows.length; i++) {
+            var dbItem = rs.rows.item(i);
+            var o = new Object();
+            o["id"] = dbItem.id;
+             o["lastname"] = dbItem.last_name;
+             o["firstname"] = dbItem.first_name;
+            res.push(o)
+        }
+    });
+    print(res);
+    return res;
+}
+
+
+function deleteProfile(id)
+{
+
+    var db = getDatabase();
+    var res="";
+    db.transaction(function(tx) {
+        var rs = tx.executeSql('DELETE FROM profiles WHERE id=? ;', [id]);
+
+        if (rs.rowsAffected > 0) {
+            res = "OK";
+        } else {
+            res = "Error";
+        }
+    }
+    );
+    // The function returns “OK” if it was successful, or “Error” if it wasn't
+    return res;
+}
+
+
+function updateProfile(id, lastname, firstname)
+{
+
+    var db = getDatabase();
+    var res="";
+    db.transaction(function(tx) {
+        var rs = tx.executeSql('UPDATE profiles SET first_name=?, last_name=? WHERE id=? ;', [firstname, lastname, id]);
+
+        if (rs.rowsAffected > 0) {
+            res = "OK";
+        } else {
+            res = "Error";
+        }
+    }
+    );
+    // The function returns “OK” if it was successful, or “Error” if it wasn't
+    return res;
+}
+
+function insertProfile(lastname, firstname)
+{
+
+    var db = getDatabase();
+    var res="";
+    db.transaction(function(tx) {
+        var rs = tx.executeSql('INSERT OR IGNORE INTO profiles VALUES (null,?,?);', [firstname, lastname]);
+
+        if (rs.rowsAffected > 0) {
+            res = "OK";
+        } else {
+            res = "Error";
+        }
+    }
+    );
+    // The function returns “OK” if it was successful, or “Error” if it wasn't
+    return res;
+}
+
+function existProfile(lastname, firstname)
+{
+    var db = getDatabase();
+    var res="";
+
+    db.transaction(function(tx) {
+        var rs = tx.executeSql('SELECT id FROM profiles WHERE last_name=? AND first_name=?;', [lastname, firstname]);
+        if (rs.rows.length > 0) {
+            res = true
+        } else {
+            res = false
+        }
+    })
+
+
+    return res
+}
+
 function getUserFirstName(profile_id)
 {
     var db = getDatabase();
 
=== modified file 'sudoku-app.qml'
--- sudoku-app.qml	2013-07-08 09:38:32 +0000
+++ sudoku-app.qml	2013-07-09 09:59:26 +0000
@@ -2,6 +2,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import QtQuick.LocalStorage 2.0
+import Ubuntu.Components.Popups 0.1
 import "js/localStorage.js" as Settings
 import "components"
 
@@ -17,12 +18,21 @@
     property real blockDistance: pageWidth/200;
     property bool alreadyCreated: false;
     property bool gridLoaded: false;
-    property int currentUserId: 1;
+    property int currentUserId: -1;
     property string highscoresHeaderText: i18n.tr("<b>Best scores for all players</b>")
 
+    property string alertTitle: ""
+    property string alertText : ""
+
+    property int editUserId : -1;
+
     width: pageWidth;
     height: pageHeight;
 
+    onCurrentUserIdChanged: {
+        Settings.setSetting("currentUserId", currentUserId)
+    }
+
     function newSize(width, height) {
         pageWidth = width;
         pageHeight = height;
@@ -58,6 +68,36 @@
         //buttonsGridPublic.update();
     }
 
+
+    Component {
+        id: alertDialog
+        Dialog {
+            id: alertDialogue
+            title: alertTitle
+            text: alertText
+
+            SudokuDialogButton{
+                buttonText: i18n.tr("OK")
+                width: parent.width/2;
+                size: units.gu(5)
+                onTriggered: {
+                    PopupUtils.close(alertDialogue)
+                }
+            }
+
+        }
+    }
+
+    function showAlert(title, text, caller)
+    {
+        alertTitle = title
+        alertText = text
+        PopupUtils.open(alertDialog, caller)
+
+    }
+
+
+
     onHeightChanged: {
         if (!gridLoaded)
             return;
@@ -98,6 +138,14 @@
                                        'lastname':  lastName,
                                        'score': rowItem[1] });
         }
+
+        if(Settings.getSetting("currentUserId")=="Unknown")
+            currentUserId = -1;
+        else
+        {
+            currentUserId = Settings.getSetting("currentUserId")
+        }
+
     }
 
     Tabs {
@@ -259,6 +307,7 @@
                     SudokuBlocksGrid {
                         id: sudokuBlocksGrid;
                     }
+
                 }
             }
 
@@ -364,19 +413,102 @@
             property alias difficultyIndex: difficultySelector.selectedIndex;
             property alias themeIndex: themeSelector.selectedIndex;
 
+
+
             title: i18n.tr("Settings")
-            page: Page {
-                /*
-                tools: ToolbarActions {
-
-                    Action {
-                        iconSource: Qt.resolvedUrl("icons/close.svg")
-                        text: i18n.tr("Close");
-                        onTriggered: Qt.quit()
-                    }
-                }
-                */
+            page:
+
+                Page {
+
                 Column {
+
+                    Component {
+                        id: profileSelector
+                        DefaultSheet {
+                            title: i18n.tr("Select profile")
+                            contentsHeight: mainView.height
+
+                            /*
+                            Column {
+                                anchors {
+                                    top: parent.top
+                                    left: parent.left
+                                    right: parent.right
+                                }
+                                height: mainColumnSettings.height
+
+                                ListItem.Header {
+                                    id: header
+                                    text: i18n.tr("Select profile")
+                                }
+                                */
+
+
+
+                            ListView {
+                                height: mainColumnSettings.height
+                                id: profileListView
+                                clip: true
+                                width: parent.width
+                                // height: parent.height - header.height
+                                model: profilesModel
+
+                                delegate:
+                                    ListItem.Standard {
+
+                                    text: firstname + " " + lastname
+                                    progression: true
+                                    onTriggered: {
+                                        console.log("clicked "+index)
+                                        currentUserId = profileId;
+                                        hide()
+                                    }
+                                }
+
+                            }
+                        }
+                        // }
+                    }
+
+                    Component {
+                        id: manageProfileSelector
+                        DefaultSheet {
+                            title: i18n.tr("Select profile")
+                            contentsHeight: mainView.height
+
+
+
+                                ListView {
+                                    id: manageProfileListView
+                                    clip: true
+                                    width: parent.width
+                                  height: mainColumnSettings.height
+                                    model: profilesModel
+
+                                    delegate:
+
+                                        ListItem.Standard {
+
+                                            text: firstname + " " + lastname
+
+                                            progression: true
+                                            onTriggered: {
+                                                hide()
+                                                editUserId = profileId
+                                                PopupUtils.open(manageProfileDialog, selectorProfile)
+                                            }
+                                        }
+
+
+
+                            }
+                        }
+                    }
+
+                    ListModel{
+                        id: profilesModel
+                    }
+
                     id: mainColumnSettings;
                     //width: settingsTab.width;
                     //height: settingsTab.height;
@@ -460,9 +592,76 @@
                             }
                         }
                     }
+                    ListItem.Header {
+                        text: i18n.tr("<b>Profiles settings</b>")
+                    }
+                    ListItem.SingleValue {
+                        text: "Current profile"
+                        id: selectorProfile
+                        value: {
+                            if(currentUserId==-1)
+                                return i18n.tr("None")
+                            else
+                                return Settings.getUserFirstName(currentUserId)+" "+Settings.getUserLastName(currentUserId);
+
+                        }
+
+                        onClicked: {
+
+                            var allProfiles = new Array();
+                            allProfiles = Settings.getAllProfiles()
+
+                            profilesModel.clear()
+
+                            for(var i = 0; i < allProfiles.length; i++)
+                            {
+                                profilesModel.append({"profileId":allProfiles[i].id,"lastname":allProfiles[i].lastname, "firstname":allProfiles[i].firstname})
+                            }
+                            PopupUtils.open(profileSelector, selectorProfile)
+                        }
+                    }
+
+                    AddProfileDialog{
+                        id:addProfileDialog
+                    }
+
+                    ManageProfileDialog{
+                        id:manageProfileDialog
+                    }
+
+
+                    ListItem.SingleValue {
+                        id:addSingleValue
+                        text: i18n.tr("Add profile")
+                        onClicked: {
+                            PopupUtils.open(addProfileDialog, addSingleValue);
+                        }
+                    }
+
+                    ListItem.SingleValue {
+                        id:manageProfileSingleValue
+                        text: i18n.tr("Manage profiles")
+                        onClicked: {
+
+                            var allProfiles = new Array();
+                            allProfiles = Settings.getAllProfiles()
+
+                            profilesModel.clear()
+
+                            for(var i = 0; i < allProfiles.length; i++)
+                            {
+                                profilesModel.append({"profileId":allProfiles[i].id,"lastname":allProfiles[i].lastname, "firstname":allProfiles[i].firstname})
+                            }
+
+                            PopupUtils.open(manageProfileSelector, manageProfileSingleValue)
+                        }
+                    }
+
+
                 }
             }
 
+
         }
 
         Tab {
@@ -470,18 +669,7 @@
             objectName: "aboutTab"
             title: i18n.tr("About")
             page: Page {
-                /*
-                tools: ToolbarActions {
-
-
-                    Action {
-                        iconSource: Qt.resolvedUrl("icons/close.svg");
-                        text: i18n.tr("Close");
-                        onTriggered: Qt.quit()
-                    }
-
-                }
-                */
+
                 Column {
                     id: aboutColumn;
                     spacing: 5;
@@ -489,15 +677,15 @@
                     anchors.horizontalCenter: parent.horizontalCenter;
                     y: units.gu(8);
                     Image {
-                            property real maxWidth: units.gu(100)
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: Math.min(mainView.width, maxWidth)/1.75
-                            //height: width
-                            source: "icons/sudoko-vector-about.svg"
-                            smooth: true
-                            fillMode: Image.PreserveAspectFit
+                        property real maxWidth: units.gu(100)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        width: Math.min(mainView.width, maxWidth)/1.75
+                        //height: width
+                        source: "icons/sudoko-vector-about.svg"
+                        smooth: true
+                        fillMode: Image.PreserveAspectFit
 
-                        }
+                    }
                     Row {
                         //anchors.horizontalCenter: parent.horizontalCenter;
                         anchors.left: aboutColumn.left