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

[Renato Araujo Oliveira Filho]

Implemented search for unaccented contact names.

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

351. By Renato Araujo Oliveira Filho on 2015-01-05

Fixed contact filter when using contact manager != "galera"

Unmerged revisions

=== modified file 'src/imports/Ubuntu/Contacts/ContactListModel.qml'
--- src/imports/Ubuntu/Contacts/ContactListModel.qml	2014-12-08 20:00:47 +0000
+++ src/imports/Ubuntu/Contacts/ContactListModel.qml	2014-12-15 19:48:22 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
+import Ubuntu.Contacts 0.1
 
 ContactModel {
     id: root
@@ -66,19 +67,30 @@
             id: contactTermFilter
 
             property string value: ""
-
-            DetailFilter {
-                detail: ContactDetail.DisplayLabel
-                field: DisplayLabel.Label
-                value: contactTermFilter.value
-                matchFlags: DetailFilter.MatchContains
-            }
-
-            DetailFilter {
+            property var phoneNumberFilter: DetailFilter {
                 detail: ContactDetail.PhoneNumber
                 field: PhoneNumber.Number
                 value: contactTermFilter.value
-                matchFlags: DetailFilter.MatchPhoneNumber | DetailFilter.MatchContains
+                matchFlags: (DetailFilter.MatchPhoneNumber | DetailFilter.MatchContains)
+            }
+
+            filters: [
+                DetailFilter {
+                    detail: ContactDetail.ExtendedDetail
+                    field: root.manager === "galera" ? ExtendedDetail.Data : ContactDetail.DisplayLabel
+                    value: root.manager === "galera" ? Contacts.normalized(contactTermFilter.value) : contactTermFilter.value
+                    matchFlags: DetailFilter.MatchContains
+                }
+            ]
+
+            onValueChanged: {
+                var containsLetter = /^[a-zA-Z]/.test(value)
+
+                if (containsLetter && (filters.length > 1)) {
+                    filters = [filters[0]]
+                } else if (!containsLetter) {
+                    filters = [filters[0], phoneNumberFilter]
+                }
             }
         },
         IntersectionFilter {

=== modified file 'src/imports/Ubuntu/Contacts/contacts.cpp'
--- src/imports/Ubuntu/Contacts/contacts.cpp	2014-07-05 22:00:02 +0000
+++ src/imports/Ubuntu/Contacts/contacts.cpp	2014-12-15 19:48:22 +0000
@@ -39,3 +39,19 @@
 
     return initials;
 }
+
+QString UbuntuContacts::normalized(const QString &value)
+{
+    QString s2 = value.normalized(QString::NormalizationForm_D);
+    QString out;
+
+    for (int i=0, j=s2.length(); i<j; i++)
+    {
+        // strip diacritic marks
+        if (s2.at(i).category() != QChar::Mark_NonSpacing &&
+            s2.at(i).category() != QChar::Mark_SpacingCombining) {
+            out.append(s2.at(i));
+        }
+    }
+    return out;
+}

=== modified file 'src/imports/Ubuntu/Contacts/contacts.h'
--- src/imports/Ubuntu/Contacts/contacts.h	2014-07-05 22:00:02 +0000
+++ src/imports/Ubuntu/Contacts/contacts.h	2014-12-15 19:48:22 +0000
@@ -28,6 +28,7 @@
     UbuntuContacts(QObject *parent = 0);
 
     Q_INVOKABLE QString contactInitialsFromString(const QString &value);
+    Q_INVOKABLE QString normalized(const QString &value);
 };
 
 #endif //_UBUNTU_CONTACTS_H_

=== added file 'tests/data/tst_ContactListModel_data.vcf'
--- tests/data/tst_ContactListModel_data.vcf	1970-01-01 00:00:00 +0000
+++ tests/data/tst_ContactListModel_data.vcf	2014-12-15 19:48:22 +0000
@@ -0,0 +1,30 @@
+BEGIN:VCARD
+VERSION:3.0
+UID:47bbbfcab7c9b8ef0e7375074d22ff54905174bd
+X-QTPROJECT-EXTENDED-DETAIL:CLIENTPIDMAP;[\n    "1"\n]\n
+N:First;Last;;;
+FN:First Last
+X-QTPROJECT-FAVORITE:false;0
+TEL:123456
+CATEGORIES:F
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+UID:e5bb57fc852541dfc9ad29d583a36f1c353b65ed
+X-QTPROJECT-EXTENDED-DETAIL:CLIENTPIDMAP;[\n    "1"\n]\n
+N:Fulano;de;tal6;;
+FN:Fulano de Tal6
+X-QTPROJECT-FAVORITE:false;0
+TEL:123678
+CATEGORIES:F
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+UID:0d753ce1005dde92f69e4ddb62222240691693a0
+X-QTPROJECT-EXTENDED-DETAIL:CLIENTPIDMAP;[\n    "1"\n]\n
+N:Fulano;da;Silva1;;;
+FN:Fulano da Silva1
+X-QTPROJECT-FAVORITE:false;0
+TEL:555666
+CATEGORIES:F
+END:VCARD

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2014-11-10 20:14:36 +0000
+++ tests/qml/CMakeLists.txt	2014-12-15 19:48:22 +0000
@@ -22,6 +22,7 @@
 
 if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
     declare_qml_test("contact_list" tst_ContactList.qml)
+    declare_qml_test("Contact_list_model" tst_ContactListModel.qml)
     declare_qml_test("contact_editor" tst_ContactEditor.qml)
     declare_qml_test("contact_avatar" tst_ContactAvatar.qml)
     declare_qml_test("list_with_actions" tst_ListWithActions.qml)
@@ -40,6 +41,7 @@
     tst_ContactEditor.qml
     tst_ContactAvatar.qml
     tst_ContactList.qml
+    tst_ContactListModel.qml
     tst_ListWithActions.qml
     tst_ContactPreviewPage.qml
     tst_VCardParser.qml

=== added file 'tests/qml/tst_ContactListModel.qml'
--- tests/qml/tst_ContactListModel.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_ContactListModel.qml	2014-12-15 19:48:22 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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.2
+import QtTest 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Test 0.1
+import Ubuntu.Contacts 0.1
+
+Item {
+    id: root
+
+    property var application
+    property var contactListModelObj
+
+    width: units.gu(40)
+    height: units.gu(80)
+
+    Component {
+        id: contactListModelCmp
+
+        ContactListModel {
+            id: contactListModel
+
+            property int contactCount: contacts ? contacts.length : 0
+
+            manager: "memory"
+            Component.onCompleted: importContacts(Qt.resolvedUrl("../data/tst_ContactListModel_data.vcf"))
+        }
+    }
+
+    UbuntuTestCase {
+        id: contactListModelTestCase
+        name: 'contactListModelTestCase'
+
+        when: windowShown
+
+        function init()
+        {
+            root.contactListModelObj = contactListModelCmp.createObject(root)
+            //waitForRendering(root.contactListModelObj)
+        }
+
+        function cleanup()
+        {
+            root.contactListModelObj.destroy()
+        }
+
+        function test_contactImport()
+        {
+            tryCompare(root.contactListModelObj, "contactCount", 3)
+        }
+
+        function test_searchByPhoneNumber()
+        {
+            root.contactListModelObj.filterTerm = "555"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
+
+            root.contactListModelObj.filterTerm = "5"
+            tryCompare(root.contactListModelObj, "contactCount", 2)
+
+            root.contactListModelObj.filterTerm = "6"
+            tryCompare(root.contactListModelObj, "contactCount", 3)
+        }
+
+        function test_searchByContactName()
+        {
+            root.contactListModelObj.filterTerm = "First"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
+
+            root.contactListModelObj.filterTerm = "Fulano"
+            tryCompare(root.contactListModelObj, "contactCount", 2)
+
+            root.contactListModelObj.filterTerm = "F"
+            tryCompare(root.contactListModelObj, "contactCount", 3)
+
+            root.contactListModelObj.filterTerm = "tal6"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
+        }
+
+        function test_searchByNameAndNumber()
+        {
+            root.contactListModelObj.filterTerm = "First"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
+
+            root.contactListModelObj.filterTerm = "555"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
+
+            root.contactListModelObj.filterTerm = "1"
+            tryCompare(root.contactListModelObj, "contactCount", 3)
+        }
+    }
+}