Merge lp:~doflah/dialer-app/show_duration_hours into lp:dialer-app

[Dennis O'Flaherty]

Show hours in the call duration - fixes #1372689

Show hours in the call duration - fixes #1372689

[Gustavo Pichorim Boiko (boiko)]

27 + if (minutes < 10) minutes = "0" + minutes;
28 + if (seconds < 10) seconds = "0" + seconds;

Can you instead just use pad(minutes, 2) just like it was being used before?

Actually, now that I am looking at the patch, maybe we should create a Date object representing the duration and use Qt.formatTime() to format the display according to the user locale.

Would you mind experimenting with that and see if it is possible?

Thanks for the patch.

review: Needs Fixing

[lp:~doflah/dialer-app/show_duration_hours]

290. By Dennis O'Flaherty on 2014-10-10

Implement feedback and add tests

291. By Dennis O'Flaherty on 2014-10-10

Use formatTime

292. By Dennis O'Flaherty on 2014-10-10

Pass seconds value to constructor instead of a separate setSeconds call

[Dennis O'Flaherty (doflah)]

Using formatTime really cleans it up. I doubt we need to go out to "days" since a 24-hour phone call is probably well outside the typical use case.

[Gustavo Pichorim Boiko (boiko)]

Code looks good and works as expected!

review: Approve

[Gustavo Pichorim Boiko (boiko)]

I'm sorry it is taking so long for this change to get merged.
Would you mind merging latest changes from trunk into your branch?

[lp:~doflah/dialer-app/show_duration_hours]

293. By Dennis O'Flaherty on 2014-12-16

Merge from trunk

[Dennis O'Flaherty (doflah)]

Done!

[Gustavo Pichorim Boiko (boiko)]

Thanks!

Looks good!

review: Approve

=== modified file 'src/qml/LiveCallPage/StopWatch.qml'
--- src/qml/LiveCallPage/StopWatch.qml	2014-07-23 10:13:32 +0000
+++ src/qml/LiveCallPage/StopWatch.qml	2014-12-16 01:44:35 +0000
@@ -20,19 +20,12 @@
 import Ubuntu.Components 1.1
 
 Item {
-    function pad(text, length) {
-        while (text.length < length) text = '0' + text;
-        return text;
-    }
 
     property int time: 0
     property string elapsed: {
-        var divisor_for_minutes = time % (60 * 60);
-        var minutes = String(Math.floor(divisor_for_minutes / 60));
-
-        var divisor_for_seconds = divisor_for_minutes % 60;
-        var seconds = String(Math.ceil(divisor_for_seconds));
-
-        return "%1:%2".arg(pad(minutes, 2)).arg(pad(seconds, 2));
+        var d = new Date(0, 0, 0, 0, 0, time);
+
+        return d.getHours() == 0 ? Qt.formatTime(d, "mm:ss") :
+            Qt.formatTime(d, "h:mm:ss");
     }
 }

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2014-11-03 22:53:15 +0000
+++ tests/qml/CMakeLists.txt	2014-12-16 01:44:35 +0000
@@ -18,6 +18,7 @@
 if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
     declare_qml_test("keypad_button" tst_KeypadButton.qml)
     declare_qml_test("main_view" tst_MainView.qml)
+    declare_qml_test("stopwatch" tst_StopWatch.qml)
 else()
     if (NOT QMLTESTRUNNER_BIN)
         message(WARNING "Qml tests disabled: qmltestrunner not found")
@@ -28,5 +29,6 @@
 
 set(QML_TST_FILES
     tst_KeypadButton.qml
+    tst_StopWatch.qml
 )
 add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})

=== added file 'tests/qml/tst_StopWatch.qml'
--- tests/qml/tst_StopWatch.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_StopWatch.qml	2014-12-16 01:44:35 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of dialer-app.
+ *
+ * dialer-app 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.
+ *
+ * dialer-app 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.Test 0.1
+
+import '../../src/qml/LiveCallPage'
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(60)
+
+    StopWatch {
+        id: timer
+    }
+
+    UbuntuTestCase {
+        id: stopWatchTestCase
+        name: 'stopWatchTestCase'
+
+        when: windowShown
+
+        function test_zero() {
+            timer.time = 0;
+            compare(timer.elapsed, "00:00");
+        }
+
+        function test_thirty_seconds() {
+            timer.time = 30;
+            compare(timer.elapsed, "00:30");
+        }
+
+        function test_one_minute() {
+            timer.time = 60;
+            compare(timer.elapsed, "01:00");
+        }
+
+        function test_one_hour() {
+            timer.time = 3600;
+            compare(timer.elapsed, "1:00:00");
+        }
+
+        function test_hour_thirty_seconds() {
+            timer.time = 3600 + 30;
+            compare(timer.elapsed, "1:00:30");
+        }
+
+        function test_hour_one_minute() {
+            timer.time = 3600 + 60;
+            compare(timer.elapsed, "1:01:00");
+        }
+
+        function test_hour_one_minute_thirty_seconds() {
+            timer.time = 3600 + 60 + 30;
+            compare(timer.elapsed, "1:01:30");
+        }
+    }
+
+}