Merge lp:~martin-borho/ubuntu-weather-app/reboot-real-weather-data into lp:ubuntu-weather-app

[Martin Borho]

Filled static prototype components with real weather data.

Filled static prototype components with real weather data.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:7
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~martin-borho/ubuntu-weather-app/reboot-real-weather-data/+merge/249002/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/9/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/9

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looking good so far, could we use Settings {} API instead of a dictionary?

https://developer.ubuntu.com/api/qml/sdk-14.10/Qt.labs.settings.Settings/
http://bazaar.launchpad.net/~music-app-dev/music-app/remix/view/head:/Player.qml#L52

review: Needs Information

[Andrew Hayzen (ahayzen)]

Just realised we already have Storage.qml, we can make the migration to the
settings api in a future mp.
On 7 Feb 2015 20:20, "Andrew Hayzen" <email address hidden> wrote:

> Review: Needs Information
>
> Looking good so far, could we use Settings {} API instead of a dictionary?
>
> https://developer.ubuntu.com/api/qml/sdk-14.10/Qt.labs.settings.Settings/
>
> http://bazaar.launchpad.net/~music-app-dev/music-app/remix/view/head:/Player.qml#L52
> --
>
> https://code.launchpad.net/~martin-borho/ubuntu-weather-app/reboot-real-weather-data/+merge/249002
> You are reviewing the proposed merge of
> lp:~martin-borho/ubuntu-weather-app/reboot-real-weather-data into
> lp:ubuntu-weather-app/reboot.
>

[Victor Thompson (vthompson)]

I have 2 inline comments that could use fixing.

review: Needs Fixing

[Martin Borho (martin-borho)]

Both errors have been fixed!

Btw: We should use string typed properties consistently for any weather-data related QML properties in the ui, because there can be some mismatch between JS and QML types (null, false or "" etc).

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:8
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/10/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/10/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Looks good, thanks! One small thing, in all the screens I've seen in the spec for the Today view, the large orange current temperature just has the degrees symbol and not the units (F or C)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:9
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/12/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/12/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm!

review: Approve

[lp:~martin-borho/ubuntu-weather-app/reboot-real-weather-data]

7. By Martin Borho on 2015-02-08

Filled static prototype components with real weather data.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

=== modified file 'app/components/HomeGraphic.qml'
--- app/components/HomeGraphic.qml	2015-02-03 21:26:09 +0000
+++ app/components/HomeGraphic.qml	2015-02-08 19:33:50 +0000
@@ -23,6 +23,8 @@
     height: units.gu(32)
     width: parent.width
 
+    property alias icon: iconLabel.text
+
     // TODO: will be on 'rails' (horizontal listview?) to reveal hourly forecast
     Image {
         anchors {
@@ -36,10 +38,10 @@
             color: "#F00"
 
             Label {
+                id: iconLabel
                 anchors {
                     centerIn: parent
                 }
-                text: "IMAGE HERE!"
             }
         }
     }

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-02-06 15:35:49 +0000
+++ app/ubuntu-weather-app.qml	2015-02-08 19:33:50 +0000
@@ -41,20 +41,64 @@
     useDeprecatedToolbar: false
     anchorToKeyboard: true
 
+    /*
+      List of locations and their data, accessible through index
+    */
+    property var locationsList: []
+
+    /*
+      Index of Location before a refresh, to go back after
+    */
+    property int indexAtRefresh: -1
+
+    /*
+      Set default values for settings here
+    */
+    property var settings: {
+        "units": Qt.locale().measurementSystem === Locale.MetricSystem ? "metric" : "imperial",
+        "wind_units": Qt.locale().measurementSystem === Locale.MetricSystem ? "kmh" : "mph",
+        "precip_units": Qt.locale().measurementSystem === Locale.MetricSystem ? "mm" : "in",
+        "service": "weatherchannel"
+    }
+
+    /*
+      Scale symbols and labels.
+    */
+    property string tempScale
+    property string speedScale
+    property string precipScale
+    property string tempUnits
+    property string windUnits
+    property string precipUnits
+
+    /*
+      After reading the settings from storage and updating the default
+      settings with the user selected ones, (re)load pages!
+    */
     Component.onCompleted: {
-        storage.getLocations(function(locations) {
-            WeatherApi.sendRequest({
-                action: "updateData",
-                params: {
-                    locations:locations,
-                    force:false,
-                    service: "weatherchannel",
-                    api_key: Key.twcKey
-                }
-            }, responseDataHandler)
+        storage.getSettings(function(storedSettings) {
+            for(var settingName in storedSettings) {
+                settings[settingName] = storedSettings[settingName];
+            }
+            setScalesAndLabels();
+            refreshData();
         })
     }
 
+    function setScalesAndLabels() {
+        // set scales
+        tempScale = String("°") + ((settings["units"] === "imperial") ? "F" : "C")
+        speedScale = ((settings["wind_units"] === "mph") ? "mph" : "km/h")
+        precipScale = ((settings["precip_units"] === "in") ? "in" : "mm")
+        tempUnits = ((settings["units"] === 'imperial') ? 'imperial' : 'metric')
+        windUnits = ((settings["wind_units"] === 'mph') ? 'imperial' : 'metric')
+        precipUnits = ((settings["precip_units"] === 'in') ? 'imperial' : 'metric')
+    }
+
+    /*
+      Handle response data from data backend. Checks if a location
+      was updated and has to be stored again.
+    */
     function responseDataHandler(messageObject) {
          if(!messageObject.error) {
              if(messageObject.action === "updateData") {
@@ -65,7 +109,7 @@
                      }
                  });
                  //print(JSON.stringify(messageObject.result));
-                 //buildTabs(messageObject.result);
+                 fillPages(messageObject.result);
              }
          } else {
              console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
@@ -73,6 +117,35 @@
          }
      }
 
+    /* Fill the location pages with their data. */
+    function fillPages(locations) {
+        locationsList = locations;
+        // refactor this when Location are in a ListView!
+        homePage.renderData();
+    }
+
+    /*
+      Refresh data, either directly from storage or by checking against
+      API instead.
+    */
+    function refreshData(from_storage, force_refresh) {
+        if(from_storage === true && force_refresh !== true) {
+            storage.getLocations(fillPages);
+        } else {
+            storage.getLocations(function(locations) {
+                WeatherApi.sendRequest({
+                    action: "updateData",
+                    params: {
+                        locations:locations,
+                        force:force_refresh,
+                        service:settings["service"],
+                        api_key: Key.twcKey
+                    }
+                }, responseDataHandler)
+            });
+        }
+    }
+
     Data.Storage {
         id: storage
     }

=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-02-03 21:26:09 +0000
+++ app/ui/HomePage.qml	2015-02-08 19:33:50 +0000
@@ -24,14 +24,85 @@
 
 Page {
     // Set to null otherwise the header is shown (but blank) over the top of the listview
+    id: locationPage
     flickable: null
 
+    /*
+      Data properties
+    */
+    property string name;
+    property string conditionText
+    property string currentTemp
+    property string todayMaxTemp
+    property string todayMinTemp
+    property string iconName
+
+    // TODO map iconnames to source image names
+    property var iconMap: {
+        "moon": "moon.svg"
+        // etc pp
+    }
+
+    /*
+      Format date object by given format.
+    */
+    function formatTimestamp(dateData, format) {
+        var date = new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
+        return Qt.formatDate(date, i18n.tr(format))
+    }
+
+    /*
+      Extracts values from the location weather data and puts them into the appropriate components
+      to display them.
+
+      Attention: Data access happens through "weatherApp.locationList[]" by index, since complex
+      data in models will lead to type problems.
+    */
+    function renderData() {
+        var index = Math.floor(Math.random()*weatherApp.locationsList.length), // TODO get this value from ListView.currentIndex later!
+            data = weatherApp.locationsList[index],
+            current = data.data[0].current,
+            forecasts = data.data,
+            forecastsLength = forecasts.length,
+            today = forecasts[0],
+            tempUnits = weatherApp.tempUnits,
+            tempScale = weatherApp.tempScale;
+
+        // set general location data
+        name = data.location.name;
+
+        // set current temps and condition
+        iconName = (current.icon) ? current.icon : ""
+        conditionText = (current.condition.main) ? current.condition.main : current.condition; // difference TWC/OWM
+        todayMaxTemp = (today[tempUnits].tempMax) ? Math.round(today[tempUnits].tempMax).toString() + tempScale: "";
+        todayMinTemp = Math.round(today[tempUnits].tempMin).toString() + tempScale;
+        currentTemp = Math.round(current[tempUnits].temp).toString() + String("°");
+
+        // reset days list
+        mainPageWeekdayListView.model.clear()
+
+        // set daily forecasts
+        if(forecastsLength > 0) {
+            for(var x=1;x<forecastsLength;x++) {
+                // print(JSON.stringify(forecasts[x][units]))
+                var dayData = {
+                    day: formatTimestamp(forecasts[x].date, 'dddd'),
+                    low: Math.round(forecasts[x][tempUnits].tempMin).toString() + tempScale,
+                    high: (forecasts[x][tempUnits].tempMax !== undefined) ? Math.round(forecasts[x][tempUnits].tempMax).toString() + tempScale : "",
+                    image: (forecasts[x].icon !== undefined && iconMap[forecasts[x].icon] !== undefined) ? iconMap[forecasts[x].icon] + tempScale : ""
+                }
+                mainPageWeekdayListView.model.append(dayData);
+            }
+        }
+    }
+
     ListView {
         id: mainPageWeekdayListView
         anchors {
             fill: parent
             margins: units.gu(2)
         }
+
         header: Column {
             anchors {
                 left: parent.left
@@ -40,50 +111,30 @@
             spacing: units.gu(1)
 
             HeaderRow {
-                locationName: "Hackney"  // TODO: non static
+                locationName: locationPage.name
             }
 
             HomeGraphic {
-
+                icon: locationPage.iconName
             }
 
             HomeTempInfo {
-                description: i18n.tr("Rainy & windy")  // TODO: non static
-                high: "13°C"
-                low: "10°C"
-                now: "13°"  // TODO: non static
+                description: locationPage.conditionText
+                high: locationPage.todayMaxTemp
+                low: locationPage.todayMinTemp
+                now: locationPage.currentTemp
             }
 
             ListItem.ThinDivider {
 
             }
         }
-        model: ListModel {  // TODO: non static
-            ListElement {
-                day: "Saturday"
-                low: 12
-                high: 15
-            }
-            ListElement {
-                day: "Sunday"
-                low: 14
-                high: 18
-            }
-            ListElement {
-                day: "Monday"
-                low: 10
-                high: 11
-            }
-            ListElement {
-                day: "Tuesday"
-                low: -7
-                high: 0
-            }
-        }
+        model: ListModel {}
+
         delegate: DayDelegate {
             day: model.day
-            high: model.high + "°C"  // TODO: non static
-            low: model.low + "°C"
+            high: model.high
+            low: model.low
         }
     }
 }

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-02-03 21:26:09 +0000
+++ po/com.ubuntu.weather.pot	2015-02-08 19:33:50 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-03 21:25+0000\n"
+"POT-Creation-Date: 2015-02-07 18:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,10 +21,6 @@
 msgid "Today"
 msgstr ""
 
-#: ../app/ui/HomePage.qml:51
-msgid "Rainy & windy"
-msgstr ""
-
 #: ubuntu-weather-app.desktop.in.in.h:1
 msgid "Weather"
 msgstr ""