Merge lp:~martin-borho/ubuntu-weather-app/RunningRealData into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

First version with real data.

First version with real data. Locations can be added and removed. Data gets updated at start.

[Raúl Yeguas (neokore)]

review: Approve

[David Planella (dpm)]

Thanks Raúl for your review. To ensure Jenkins automatically merges the branch in a merge proposal into trunk, please set the overall status to "Approved" (i.e. not "Merged").

I'll change it to approved myself this time around. If you've got any questions on bzr, landing branches or Jenkins, feel free to ask.

Nice to see the Weather app branches coming in! :-)

Cheers,
David.

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

review: Approve (continuous-integration)

=== modified file 'components/AddLocationDialog.qml'
--- components/AddLocationDialog.qml	2013-03-12 19:28:16 +0000
+++ components/AddLocationDialog.qml	2013-04-20 18:49:27 +0000
@@ -1,23 +1,39 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem;
+import "WeatherApi.js" as Api
 
 // Dialog for adding a new location
 Component {
     id: addLocationDialog
     Dialog {
         id: addLocationDialogue
-        property string cityCode: ''
         height: units.gu(10)
         title: i18n.tr("Add location")
         text: i18n.tr("Write a city name o pick it by GPS location")
 
-        onCityCodeChanged: {
-            PopupUtils.close(addLocationDialogue);
-            addLocationAction.cityCode = cityCode;
-        }
-
-        Row{
+        function locationSelected(index) {
+            var location = citiesModel.get(index);
+            // make clone
+            location = JSON.parse(JSON.stringify(location));
+            mainView.locationAdded(location);
+            PopupUtils.close(addLocationDialogue)
+        }
+
+        function onApiError(err) {
+            // TODO display
+            console.log("onApiError")
+            console.log(err.msg+" / "+err.request.url)
+        }
+
+        function onSearchSuccess(locations) {
+            locations.results.forEach(function(v) {
+                citiesModel.append(v);
+            })
+        }
+
+        Row {
             TextField {
                 id: locationString
                 width: units.gu(25)
@@ -30,9 +46,8 @@
                 iconSource: "../resources/images/search_icon.png"
 
                 onClicked: {
-                    // Load cities from API search
-                    var cities = [{"id":"100000","name":"Madrid"}, {"id":"200000","name":"Seville"}, {"id":"300000","name":"Barcelona"}, {"id":"400000","name":"Valencia"},{"id":"500000","name":"Jaen"}];
-                    createCityList(cities);
+                    citiesModel.clear();
+                    Api.WeatherApi.searchLocationByName({name:locationString.text, units:"metric"},onSearchSuccess,onApiError);
                 }
             }
         }
@@ -41,26 +56,18 @@
             id: locationGPSButton
             text: i18n.tr("Get by GPS location")
             onClicked: {
-                // Load cities from API search
-                var cities = [{"id":"100000","name":"Madrid"}, {"id":"200000","name":"Seville"}, {"id":"300000","name":"Barcelona"}, {"id":"400000","name":"Valencia"},{"id":"500000","name":"Jaen"}];
-                createCityList(cities);
+                citiesModel.clear();
+                Api.WeatherApi.searchLocationByPoint({coords: {"lon":10,"lat":53.549999}, units:"metric"}, onSearchSuccess,onApiError);
             }
         }
 
         Button {
-            id: locationCancelButton
+            id:locationCancelButton
             text: i18n.tr("Cancel")
             color: "#C00000"
             onClicked: PopupUtils.close(addLocationDialogue)
         }
 
-        // This rectangle is a workaround to keep enough height in the dialog
-        Rectangle {
-            width: units.gu(30)
-            height: units.gu(20)
-            color: "transparent"
-        }
-
         Item {
             id: locationResultBox
             anchors {
@@ -69,47 +76,32 @@
             }
         }
 
-        // Function to show a list of cities in addCityAction
-        function createCityList(cities) {
-            if(resultList){
-                resultList.destroy();
-            }
+        ListModel {
+            id: citiesModel
+        }
 
-            var list = 'import QtQuick 2.0; \
-                import Ubuntu.Components 0.1; \
-                import Ubuntu.Components.ListItems 0.1 as ListItem; \
-                Rectangle { \
-                    id: cityList; \
-                    width: units.gu(30); \
-                    height: units.gu(20); \
-                    color: "transparent"; \
-                    ListView { \
-                        id: listView; \
-                        clip: true; \
-                        anchors.fill: parent; \
-                        model: ListModel { \
-            ';
-            for (var i in cities) {
-                list += 'ListElement { \
-                    label:\''+cities[i]["name"]+'\'; \
-                    code:\''+cities[i]["id"]+'\'; \
-                }';
-            };
-            list += ' \
-                        } \
-                        delegate: ListItem.Standard { \
-                            text: i18n.tr(label); \
-                            progression: true; \
-                            onClicked: { addLocationDialogue.cityCode = code;} \
-                        } \
-                    } \
-                    Scrollbar { \
-                        flickableItem: listView; \
-                        align: Qt.AlignTrailing; \
-                    } \
-                } \
-            ';
-            resultList = Qt.createQmlObject(list,locationResultBox,'results');
+        Rectangle {
+            id: cityList;
+            width: units.gu(30);
+            height: units.gu(30);
+            color: "transparent";
+            ListView {
+                id: listView;
+                clip: true;
+                anchors.fill: parent;
+                model:  citiesModel;
+                delegate: ListItem.Standard {
+                    text: i18n.tr(name)+((country) ? ', '+i18n.tr(country): '');
+                    progression: true;
+                    onClicked: {
+                        locationSelected(index);
+                    }
+                }
+            }
+            Scrollbar {
+                flickableItem: listView;
+                align: Qt.AlignTrailing;
+            }
         }
     }
 }

=== modified file 'components/DateComponent.qml'
--- components/DateComponent.qml	2013-03-09 15:30:09 +0000
+++ components/DateComponent.qml	2013-04-20 18:49:27 +0000
@@ -11,7 +11,11 @@
     property string borderColor: "#D6D6D6"
     property int borderHeight: units.gu(0.1)
 
-    Component.onCompleted: {
+    Component.onCompleted: {        
+        renderText()
+    }
+
+    function renderText() {
         var dateText = ""
         if(dateRelative !== "") {
             dateText += dateRelative+", ";

=== added file 'components/LocationTab.qml'
--- components/LocationTab.qml	1970-01-01 00:00:00 +0000
+++ components/LocationTab.qml	2013-04-20 18:49:27 +0000
@@ -0,0 +1,148 @@
+import QtQuick 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 0.1
+
+Tab {
+    id: locationTab
+    property int locationIndex: 0
+    property var locationData: {}
+
+    function formatTimestamp(timestamp, format) {
+        var date = new Date(timestamp*1000);
+        return Qt.formatDate(date, format)
+    }
+
+    function formatTimestampToTime(timestamp, format) {
+        var date = new Date(timestamp*1000);
+        return Qt.formatTime(date, format)
+    }
+
+    Component.onCompleted: {
+        var locData = mainView.locationsList[locationIndex],
+            currentData = locData.current.results;
+
+        // set location data as property
+        locationData = locData;
+
+        // set today date
+        var todayStr = formatTimestamp(currentData.timestamp, 'dddd, dd MMMM yyyy');
+        todayDateComponent.dateString = todayStr+" - "+ formatTimestampToTime(currentData.timestamp, 'HH:mm');
+        todayDateComponent.renderText()
+
+        // set current Condition
+        currentCondition.condition = 801; //currentData.condition.id;
+        currentCondition.currentTemp =  currentData.temp;
+        currentCondition.minTemp = currentData.temp_min;
+        currentCondition.maxTemp = currentData.temp_max;
+
+        // set daily forecasts
+        var dailyForecasts = locationData.daily.results,
+            dailyLength = dailyForecasts.length;
+        for(var x=0;x<dailyLength;x++) {
+            dayForecastModel.append({
+                dateRel: "",//Tomorrow",
+                date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'),
+                temp: dailyForecasts[x].temp,
+                tempMin: dailyForecasts[x].night,
+                cond: 801 // dailyForecasts[x].condition.id;
+            });
+        }
+    }
+
+    function locationAdded(location) {
+        mainView.locationAdded({"service":"openweathermap","service_id":2643743,"name":"London","country":"GB"});
+    }
+
+    // Menu for options
+    page: Page {
+
+        tools: ToolbarActions {
+            Action {
+                id: addLocationAction
+                property string cityCode: ''
+                objectName: "action"
+
+                iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
+                text: i18n.tr("Add")
+
+                onTriggered: {
+                    PopupUtils.open(addLocationDialog, locationTab);
+                }
+            }
+
+            Action {
+                id: removeLocationAction
+                property string cityCode: ''
+                objectName: "action"
+
+                iconSource: Qt.resolvedUrl("../resources/images/remove_icon.png")
+                text: i18n.tr("Remove")
+
+                onTriggered: {
+                    mainView.removeLocation(locationData.db.id)
+                }
+            }
+        }
+    }
+
+    ListModel {
+        id: dayForecastModel
+    }
+
+    Rectangle {
+        id:startPage
+        width: parent.width
+        height: parent.height
+
+        Flickable {
+            id: flickable
+            width: parent.width
+            height: parent.height
+            contentHeight: flickContent.height;
+            Rectangle {
+                id: flickContent
+                width:parent.width
+                height: childrenRect.height
+                DateComponent {
+                    id: todayDateComponent
+                    //dateRelative: i18n.tr("Today")
+                    borderTopVisible: false
+                }
+                CurrentWeather {
+                    id: currentCondition
+                    anchors.top: todayDateComponent.bottom
+                    condition: 801
+                }
+                /*ChartComponent{
+                    id: chartComponent
+                    anchors.top: currentCondition.bottom
+                }*/
+                ListView {
+                    id: dailyForecastList
+                    width: parent.width;
+                    height:childrenRect.height
+                    anchors.top: currentCondition.bottom
+                    model:dayForecastModel
+                    interactive: false
+                    delegate: Item {
+                        id: dailyForecastItem
+                        width:parent.width
+                        height: childrenRect.height
+                        DateComponent {
+                            id: dateComponent
+                            dateRelative: dateRel
+                            dateString: date
+                        }
+                        DayWeatherComponent {
+                            anchors.top: dateComponent.bottom
+                            temperature: temp
+                            temperatureMin: tempMin
+                            condition: cond
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}

=== added file 'components/LocationTabEmpty.qml'
--- components/LocationTabEmpty.qml	1970-01-01 00:00:00 +0000
+++ components/LocationTabEmpty.qml	2013-04-20 18:49:27 +0000
@@ -0,0 +1,35 @@
+import QtQuick 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 0.1
+
+Tab {
+    id: locationTabEmpty
+
+    title: i18n.tr("No Locations")
+
+    // Menu for options
+    page: Page {
+        anchors.fill: parent
+        tools: ToolbarActions {
+            Action {
+                id: addLocationAction
+                property string cityCode: ''
+                objectName: "action"
+
+                iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
+                text: i18n.tr("Add")
+
+                onTriggered: {
+                    PopupUtils.open(addLocationDialog, locationTabEmpty);
+                }
+            }
+        }
+
+        Label {
+            anchors.centerIn: parent;
+            text: "Add one";
+        }
+
+    }
+
+}

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-03-28 12:33:37 +0000
+++ components/WeatherApi.js	2013-04-20 18:49:27 +0000
@@ -17,7 +17,7 @@
                 service_id: r.id,
                 name: r.name,
                 coord: r.coords,
-                country: (r.sys && r.sys.country) ? r.sys.country : null
+                country: (r.sys && r.sys.country) ? r.sys.country : ""
             });
         })
         return searchResult;
@@ -206,7 +206,7 @@
                 if(response["current"] !== undefined && response["forecast"] !== undefined && response["daily"] !== undefined) {
                     onSuccess(response);
                 }
-            })
+            });
 
             this.getCurrentCondition(params, addDataToResponse, addDataToResponse)
             this.getForecast(params, addDataToResponse, addDataToResponse);

=== renamed file 'weather.qml' => 'ubuntu-weather-app.qml'
--- weather.qml	2013-04-19 19:15:40 +0000
+++ ubuntu-weather-app.qml	2013-04-20 18:49:27 +0000
@@ -1,18 +1,85 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "components" as Components
 import Ubuntu.Components.Popups 0.1
-import "components" as Components
 import "components/WeatherApi.js" as Api
 
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "weather"
+    applicationName: "ubuntu-weather-app"
+
     id: mainView
     
     width: units.gu(50)
     height: units.gu(75)
 
-    property var resultList: null
+    property var locationsList: []
+    property var tabsObject: null
+
+    // see https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1124071, temporary workaround
+    function buildTabs(locations) {
+        locationsList = locations;
+        if(tabsObject !== null) {
+            tabsObject.destroy()
+        }
+        var locLength = locations.length,
+            tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1; import \"components\" as Components; "
+                   + "Tabs {id: tabs; anchors.fill: parent;"
+        if(locLength > 0) {
+            for(var x=0;x<locLength;x++) {
+                tabsString += "Components.LocationTab {title: '"+locations[x].location.name+"'; locationIndex: "+x+"} "
+            };
+        } else {
+            tabsString += "Components.LocationTabEmpty { }"
+        }
+        tabsString += "}"; // END Tabs componen
+        tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
+    }
+
+    function removeLocation(dbId) {
+        storage.clearLocation(dbId);
+        storage.getLocations(buildTabs);
+    }
+
+    function locationAdded(locationObj) {
+        Api.WeatherApi.getLocationData({location:locationObj, units: "metric"}, onNewLocationDataSuccess, onApiError);
+    }
+
+    function onApiError(err) {
+        // TODO show error popup
+        console.log("onApiError")
+        console.log(err.msg+" / "+err.request.url)
+    }
+
+    function onNewLocationDataSuccess(resp) {
+        var res = storage.insertLocation(resp);
+        storage.getLocations(buildTabs);
+    }
+
+    function refreshData() {
+        storage.getLocations(function(locations) {
+            var locLength = locations.length,
+                locUpdated = 0;
+            if(locLength > 0) {
+                locations.forEach(function(loc) {
+                    var updatedHnd = function (newData) {
+                        locUpdated += 1;
+                        storage.updateLocation(loc.db.id, newData);
+                        if(locUpdated === locLength) {
+                            buildTabs(locations);
+                        }
+                    }
+                    Api.WeatherApi.getLocationData({location:loc.location, units: "metric"}, updatedHnd, onApiError);
+                })
+            } else buildTabs(locations);
+        });
+    }
+
+    Component.onCompleted: {
+        //storage.clearDB();
+        refreshData();
+    }
 
     Components.AddLocationDialog {
         id: addLocationDialog
@@ -22,169 +89,14 @@
         id: storage
     }
 
-    Tabs {
-        id: tabs
-        anchors.fill: parent
-        
-        // Location 1
-        Tab {
-            id: location1
-            objectName: "City1"
-            
-            title: i18n.tr("London")
-            
-            // Menu for options
-            page: Page {
-
-                tools: ToolbarActions {
-                    Action {
-                        id: addLocationAction
-                        property string cityCode: ''
-                        objectName: "action"
-
-                        iconSource: Qt.resolvedUrl("resources/images/add_icon.png")
-                        text: i18n.tr("Add")
-
-                        onTriggered: {
-                            PopupUtils.open(addLocationDialog, location1);
-                        }
-
-                        onCityCodeChanged: {
-                            // Action for adding a new cityCode
-                            console.log('DEBUG: cityCode has changed to '+cityCode);
-                        }
-                    }
-
-                    Action {
-                        id: removeLocationAction
-                        property string cityCode: ''
-                        objectName: "action"
-
-                        iconSource: Qt.resolvedUrl("resources/images/remove_icon.png")
-                        text: i18n.tr("Remove")
-
-                        onTriggered: {
-                            // Action for removing a weather location
-                        }
-                    }
-                }
-
-                Rectangle {
-                    id: startPage
-                    width: parent.width
-                    height: parent.height
-                    Flickable {
-                        width: parent.width
-                        height: parent.height
-                        contentHeight: column1.height
-                        Column {
-                            id: column1
-                            width: parent.width
-                            Components.DateComponent {
-                                dateRelative: "Today"
-                                dateString:"Saturday, 9th February"
-                                borderTopVisible: false
-                            }
-                            Components.CurrentWeather {
-                                condition: 801
-                                currentTemp: 20
-                                minTemp: 12
-                                maxTemp: 25
-                                metric: true
-                            }
-                            Components.ChartComponent{
-
-                            }
-                            Components.DateComponent {
-                                dateRelative: "Tomorrow"
-                                dateString:"Sunday, 10th February"
-                            }
-                            Components.DayWeatherComponent {
-                                temperature: 22
-                                temperatureMin: 11
-                                condition: 801
-                            }
-                            Components.DateComponent {
-                                dateString:"Monday, 11th February"
-                            }
-                            Components.DayWeatherComponent {
-                                temperature: 22
-                                temperatureMin: 11
-                                condition: 801
-                            }
-                            Components.DateComponent {
-                                dateString:"Tuesday, 12th February"
-                            }
-                            Components.DayWeatherComponent {
-                                temperature: 22
-                                temperatureMin: 11
-                                condition: 801
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Location 2
-        Tab {
-            objectName: "City2"
-
-            title: i18n.tr("San Francisco")
-
-            page: Page {
-
-                Rectangle {
-                    id: cityForecast2
-                    width: parent.width
-                    height: parent.height
-                    Flickable {
-                        width: parent.width
-                        height: parent.height
-                        contentHeight: column1.height
-                        Column {
-                            width: parent.width
-                            Components.DateComponent {
-                                dateRelative: "Today"
-                                dateString:"Saturday, 9th February"
-                                borderTopVisible: false
-                            }
-                            Components.CurrentWeather {
-                                condition: 801
-                                currentTemp: 11
-                                minTemp: 8
-                                maxTemp: 17
-                                metric: true
-                            }
-                            Components.DateComponent {
-                                dateRelative: "Tomorrow"
-                                dateString:"Sunday, 10th February"
-                            }
-                            Components.DayWeatherComponent {
-                                temperature: 18
-                                temperatureMin: 10
-                                condition: 801
-                            }
-                            Components.DateComponent {
-                                dateString:"Monday, 11th February"
-                            }
-                            Components.DayWeatherComponent {
-                                temperature: 20
-                                temperatureMin: 10
-                                condition: 801
-                            }
-                            Components.DateComponent {
-                                dateString:"Tuesday, 12th February"
-                            }
-                            Components.DayWeatherComponent {
-                                temperature: 20
-                                temperatureMin: 11
-                                condition: 801
-                            }
-                        }
-                    }
-                }
-            }
+    Page {
+        id: tabPage
+        title: "Simple page"
+
+        Tabs {
+            id: tabs
+            anchors.fill: parent
+            Tab {}
         }
     }
 }

=== modified file 'weather.qmlproject'
--- weather.qmlproject	2013-02-12 16:27:32 +0000
+++ weather.qmlproject	2013-04-20 18:49:27 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "weather.qml"
+    mainFile: "ubuntu-weather-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {