From b00822fe8b233f33adca86f93e5c1b90050983aa Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Fri, 18 May 2018 14:42:52 -0400 Subject: contacts: handle multiple numbers and types The current contact model has a few fixed fields for phone numbers and only one is displayed and able to be dialed from the contacts view. Update the model to support an array of tuples indicating each phone number and type of phone number (mobile, home, work, other) associated with a contact entry. Also, update the ContactsView so we see all phone numbers for a given contact. Bug-AGL: SPEC-1435 Change-Id: Ie883d3f06c0e4102e79546395dbb1712741bac8b Signed-off-by: Matt Porter --- app/models/ContactsModel.qml | 68 ++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 24 deletions(-) (limited to 'app/models/ContactsModel.qml') diff --git a/app/models/ContactsModel.qml b/app/models/ContactsModel.qml index f8419ee..f53d2c8 100755 --- a/app/models/ContactsModel.qml +++ b/app/models/ContactsModel.qml @@ -1,68 +1,88 @@ /* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved. * Copyright (C) 2015, The Qt Company. All Rights Reserved. + * Copyright (C) 2018, Konsulko Group * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import QtQml.Models 2.2 +import NumberType 1.0 ListModel { function findName(number) { for (var i = 0; i < count; i++) { - var o = get(i) - if (o.phone === number || o.mobile === number || o.work === number) - return o.name + var entry = get(i) + for (var j = 0; j < entry.numbers.length; j++) { + if (entry.numbers[j].number) { + return entry.name + } + } } return "Unknown number" } ListElement { name: "Art McGee" - number: "503-616-4940" - mobile: "503-715-6618" - work: "972-256-9732" + numbers: [ + ListElement {number: "503-715-6618"; type: NumberType.Mobile}, + ListElement {number: "972-256-9732"; type: NumberType.Work}, + ListElement {number: "503-616-4940"; type: NumberType.Home} + ] } ListElement { name: "Dana Jonty" - number: "503-000-0000" - mobile: "503-209-3254" - work: "972-000-0000" + numbers: [ + ListElement {number: "503-209-3254"; type: NumberType.Mobile}, + ListElement {number: "972-000-0000"; type: NumberType.Work}, + ListElement {number: "503-000-0000"; type: NumberType.Other} + ] } ListElement { name: "Jojo Derick" - number: "503-000-0000" - mobile: "503-209-3254" - work: "972-000-0000" + numbers: [ + ListElement {number: "503-209-3254"; type: NumberType.Mobile}, + ListElement {number: "972-000-0000"; type: NumberType.Work}, + ListElement {number: "503-000-0000"; type: NumberType.Other} + ] } ListElement { name: "Kelly Johnson" - number: "503-000-0000" - mobile: "503-000-0000" - work: "972-000-0000" + numbers: [ + ListElement {number: "503-000-0000"; type: NumberType.Mobile}, + ListElement {number: "972-000-0000"; type: NumberType.Work}, + ListElement {number: "503-000-0000"; type: NumberType.Home} + ] } ListElement { name: "Marco Morales" - number: "503-000-0000" - mobile: "503-209-3254" - work: "972-000-0000" + numbers: [ + ListElement {number: "503-209-3254"; type: NumberType.Mobile}, + ListElement {number: "972-000-0000"; type: NumberType.Work}, + ListElement {number: "503-000-0000"; type: NumberType.Home} + ] } ListElement { name: "Rob Brad" - number: "503-000-0000" - mobile: "503-209-3254" - work: "972-000-0000" + numbers: [ + ListElement {number: "503-209-3254"; type: NumberType.Mobile}, + ListElement {number: "972-000-0000"; type: NumberType.Work}, + ListElement {number: "503-000-0000"; type: NumberType.Other} + ] } ListElement { name: "Ted Gilbert" - number: "503-000-0000" - mobile: "503-209-3254" - work: "972-000-0000" + numbers: [ + ListElement {number: "503-209-3254"; type: NumberType.Mobile}, + ListElement {number: "972-000-0000"; type: NumberType.Work}, + ListElement {number: "503-101-1001"; type: NumberType.Home}, + ListElement {number: "503-000-0000"; type: NumberType.Other} + ] } } -- cgit 1.2.3-korg