Merge lp:~renatofilho/address-book-app/fix-1207772 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Added DateOfBirth field into contact edit/view pages.

[lp:~renatofilho/address-book-app/fix-1207772]

70. By Renato Araujo Oliveira Filho on 2013-09-17

Added missing files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1017/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3501/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1019/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/147/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1024
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1024/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/859
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/871

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/149/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

problems:
1) no section headers displayed anymore after installing this
2) no label on field
3) the field is confusing what to enter
4) the input method hint should be set on the field to only display numbers

review: Needs Fixing

[Bill Filler (bfiller)]

I think we should not consider merging this until sdk bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1226329 is fixed

[Bartosz Kosiorek (gang65)]

Hi Bill.

It seems that the issue was resolved from SDK side.
Could you please continue work on that feature, as it is very important for end users?

review: Needs Information

Unmerged revisions

70. By Renato Araujo Oliveira Filho on 2013-09-17

Added missing files.

69. By Renato Araujo Oliveira Filho on 2013-09-17

Added DateOfBirth field into contact edit/view pages.

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2013-08-02 17:40:44 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2013-09-17 01:30:24 +0000
@@ -1,6 +1,7 @@
 set(CONTACT_EDIT_QMLS
     ContactDetailAddressesEditor.qml
     ContactDetailAvatarEditor.qml
+    ContactDetailDateOfBirthEditor.qml
     ContactDetailEmailsEditor.qml
     ContactDetailGroupWithTypeEditor.qml
     ContactDetailNameEditor.qml

=== added file 'src/imports/ContactEdit/ContactDetailDateOfBirthEditor.qml'
--- src/imports/ContactEdit/ContactDetailDateOfBirthEditor.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/ContactDetailDateOfBirthEditor.qml	2013-09-17 01:30:24 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012-2013 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.0
+import Ubuntu.Components 0.1
+import QtContacts 5.0 as QtContacts
+
+import "../Common"
+
+ContactDetailItem {
+    id: root
+
+    function save() {
+        var changed = false;
+
+        for(var i=0; i < fieldDelegates.length; i++) {
+            var delegate = fieldDelegates[i]
+
+            // Get item from Loader
+            if (delegate.item) {
+                delegate = delegate.item
+            }
+
+            if (delegate.detail && (delegate.field >= 0)) {
+                var date = new Date(delegate.text)
+                if ( date != delegate.detail.value(delegate.field)) {
+                    delegate.detail.setValue(delegate.field, date)
+                    changed  = true
+                }
+            }
+        }
+
+        return changed
+    }
+
+
+    detail: root.contact ? root.contact.birthday : null
+    fields: [ QtContacts.Birthday.Birthday ]
+
+    fieldDelegate: TextInputDetail {
+        function formatDetail(value)
+        {
+            if (value)
+                return Qt.formatDateTime(value, i18n.tr("MM/dd/yyyy"))
+            else
+                return ""
+        }
+
+        width: root.width - units.gu(4)
+        x: units.gu(2)
+        detail: root.detail
+        height: units.gu(4)
+        placeholderText: i18n.tr("Date of birth")
+        //The inputMaks will make the placeholderText never appears
+        //BUG #1226329
+        inputMask: i18n.tr("09/09/9999")
+        inputMethodHints: Qt.ImhDate
+    }
+}

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-09-12 23:22:06 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-09-17 01:30:24 +0000
@@ -142,6 +142,15 @@
                 height: implicitHeight
             }
 
+            ContactDetailDateOfBirthEditor {
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
             ContactDetailPhoneNumbersEditor {
                 contact: contactEditor.contact
                 anchors {

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2013-09-12 23:26:39 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2013-09-17 01:30:24 +0000
@@ -25,10 +25,16 @@
 
     property QtObject detail
     property int field: -1
-    property variant originalValue: root.detail && (root.field >= 0) ? root.detail.value(root.field) : null
+    property variant originalValue: root.detail && (root.field >= 0) ? formatDetail(root.detail.value(root.field)) : null
 
     signal removeClicked()
 
+    // rewrite this function to format specific fields into text format. Ex: Date
+    function formatDetail(value)
+    {
+        return value
+    }
+
     Component.onCompleted: makeMeVisible(root)
 
     focus: true

=== modified file 'src/imports/ContactView/CMakeLists.txt'
--- src/imports/ContactView/CMakeLists.txt	2013-07-16 21:13:34 +0000
+++ src/imports/ContactView/CMakeLists.txt	2013-09-17 01:30:24 +0000
@@ -3,6 +3,7 @@
     BasicFieldView.qml
     ContactDetailAddressesView.qml
     ContactDetailAvatarView.qml
+    ContactDetailDateOfBirthView.qml
     ContactDetailEmailsView.qml
     ContactDetailFavoriteView.qml
     ContactDetailGroupWithTypeView.qml

=== added file 'src/imports/ContactView/ContactDetailDateOfBirthView.qml'
--- src/imports/ContactView/ContactDetailDateOfBirthView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactView/ContactDetailDateOfBirthView.qml	2013-09-17 01:30:24 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2012-2013 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.0
+import Ubuntu.Components 0.1
+import QtContacts 5.0
+
+import "../Common"
+
+ContactDetailBase {
+    id: root
+
+    // use formatDateTime to check if the date is valid
+    property bool isEmpty: !(detail &&  Qt.formatDateTime(detail.birthday) != "")
+
+    detail: root.contact ? root.contact.birthday : null
+    implicitHeight: label.paintedHeight + (label.anchors.margins * 2)
+
+    Label {
+        id: label
+
+        anchors {
+            fill: parent
+            margins: units.gu(2)
+        }
+        text: detail ? Qt.formatDateTime(detail.birthday, i18n.tr("MM/dd/yyyy")) : ""
+
+        // style
+        fontSize: "medium"
+        color: "#f3f3e7"
+    }
+}

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2013-08-28 17:06:38 +0000
+++ src/imports/ContactView/ContactView.qml	2013-09-17 01:30:24 +0000
@@ -81,6 +81,15 @@
                 height: implicitHeight
             }
 
+            ContactDetailDateOfBirthView {
+                contact: root.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: isEmpty ? 0 : implicitHeight
+            }
+
             ContactDetailPhoneNumbersView {
                 contact: root.contact
                 anchors {