Merge lp:~qqworini/ubuntu-rssreader-app/saved into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

New feature: "Saved" simply implemented, include save button in article view, "Saved" tab and related gridview, listview will be implemented by Roman soon, and multiselect not implemented yet.

New feature: "Saved" simply implemented, include save button in article view, "Saved" tab and related gridview, listview will be implemented by Roman soon, and multiselect not implemented yet.

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

FAILED: Continuous integration, rev:65
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/41/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/341
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/41

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/41/rebuild

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'OrganicGrid.qml'
--- OrganicGrid.qml	2013-09-03 18:47:49 +0000
+++ OrganicGrid.qml	2013-09-11 12:16:27 +0000
@@ -71,7 +71,15 @@
                     addArticleToModel(feedArticles.rows[i])
                 }
             }
-        } else {
+        }
+        else if (tag_id == -2) {
+            var favArticles = DB.loadFavouriteArticles()
+            for (var i=0; i < favArticles.rows.length; i++)
+            {
+                addArticleToModel(favArticles.rows[i])
+            }
+        }
+        else {
             var feedArticles = DB.loadArticles({"isAll": true});
             for (var i=0; i < feedArticles.rows.length; i++)
             {
 
=== modified file 'RssFeedPage.qml'
--- RssFeedPage.qml	2013-09-07 16:38:50 +0000
+++ RssFeedPage.qml	2013-09-11 12:16:27 +0000
@@ -20,6 +20,7 @@
     property string rssTitle: ""
     property int rssIndex: 0
     property variant rssModel
+    property variant rssItem
 
     onRssIndexChanged: {
         rssListview.currentIndex = rssIndex
@@ -41,6 +42,26 @@
 
         ToolbarButton {
             action: Action {
+                text:  rssItem.favourite == "0" ? i18n.tr("Save") : i18n.tr("Unsave")
+                iconSource: Qt.resolvedUrl("./icons_tmp/go-to.svg")
+                onTriggered:
+                {
+                    var fav = (rssItem.favourite == "0" ? "1" : "0")
+                    var dbResult = DB.updateArticleFavourite(rssItem.id, fav)
+                    if (dbResult.rowsAffected == 1) {
+                        rssItem.favourite = fav
+                        var dbResult1 = DB.updateArticleStatus(rssItem.id, "0")
+                        if (dbResult1.rowsAffected == 1) {
+                            rssItem.status = "0"
+                        }
+                        mainView.refreshSavedTab()
+                    }
+                }
+            }
+        }
+
+        ToolbarButton {
+            action: Action {
                 text:  i18n.tr("Open site")
                 iconSource: Qt.resolvedUrl("./icons_tmp/go-to.svg")
                 onTriggered:
@@ -72,7 +93,7 @@
 
         onCurrentIndexChanged: {
             // console.log("ListView onCurrentIndexChanged", currentIndex)
-            var rssItem = rssModel.get(currentIndex)
+            rssItem = rssModel.get(currentIndex)
             rssTitle = rssItem.feed_name
             var dbResult = DB.updateArticleStatus(rssItem.id, "1")
             if (dbResult.rowsAffected == 1) {
 
=== modified file 'TopicTab.qml'
--- TopicTab.qml	2013-09-07 16:38:50 +0000
+++ TopicTab.qml	2013-09-11 12:16:27 +0000
@@ -58,13 +58,22 @@
         // flickable: null
 
         function reload () {
-            var feedTags =  DB.loadFeedsFromTag(topicId)
-            var feeds = []
-            for (var i=0; i < feedTags.rows.length; i++) {
-                feeds.push(feedTags.rows.item(i))
+            switch (topicId) {
+            case -1:
+                break
+            case -2:
+                organicGridView.reload()
+                break
+
+            default:
+                var feedTags =  DB.loadFeedsFromTag(topicId)
+                var feeds = []
+                for (var i=0; i < feedTags.rows.length; i++) {
+                    feeds.push(feedTags.rows.item(i))
+                }
+                feedArray = feeds
+                organicGridView.reload()
             }
-            feedArray = feeds
-            organicGridView.reload()
         }
 
         OrganicGrid {
 
=== modified file 'databasemodule_v2.js'
--- databasemodule_v2.js	2013-09-06 07:27:18 +0000
+++ databasemodule_v2.js	2013-09-11 12:16:27 +0000
@@ -238,6 +238,20 @@
     return dbResult;
 }
 
+// load all favourite articles
+function loadFavouriteArticles()
+{
+    var db = openStdDataBase()
+    var dbResult
+
+    db.transaction(function(tx) {
+        dbResult = tx.executeSql('SELECT article.*, feed.title as feed_name FROM article inner join feed on article.feed_id = feed.id WHERE article.favourite = "1" ORDER BY article.pubdate DESC' )
+    }
+    )
+    console.log("loadFavouriteArticles: ", dbResult.rows.length)
+    return dbResult;
+}
+
 // insert
 function addArticle(title, content, link, description, pubdate, guid, feed_id)
 {
@@ -319,7 +333,7 @@
 //        ensureFeedTableExists(tx)
         dbResult = tx.executeSql('UPDATE article SET status=? WHERE id=?',
                                  [status, id])
-        console.log("article UPDATE, AFFECTED ROWS: ", dbResult.rowsAffected)
+        console.log("article status UPDATE, AFFECTED ROWS: ", dbResult.rowsAffected)
     }
     )
     return dbResult
@@ -333,7 +347,7 @@
 //        ensureFeedTableExists(tx)
         dbResult = tx.executeSql('UPDATE article SET favourite=? WHERE id=?',
                                  [favourite, id])
-        //console.log("article UPDATE, AFFECTED ROWS: ", dbResult.rowsAffected)
+        console.log("article favourite UPDATE, AFFECTED ROWS: ", dbResult.rowsAffected)
     }
     )
     return dbResult
 
=== modified file 'ubuntu-rssreader-app.qml'
--- ubuntu-rssreader-app.qml	2013-09-07 16:38:50 +0000
+++ ubuntu-rssreader-app.qml	2013-09-11 12:16:27 +0000
@@ -70,7 +70,12 @@
         xmlnetwork.updateFeeds(feedarray, topicId)
     }
 
-    function toRssPage(model, index)     //   go to single article page     // bugs remain
+                                                   // refresh "Saved" Tab
+    function refreshSavedTab() {
+        repeater.reloadSaved()
+    }
+
+    function toRssPage(model, index)     //   go to single article page
     {
         feed_page.setFeed(model, index)
         pageStack.push(feed_page)
@@ -193,7 +198,7 @@
                 function reloadTabs() {
                     repeater.model = 0
                     var tags = DB.loadTags()
-                    repeater.model = tags.rows.length
+                    repeater.model = tags.rows.length + 1  // plus 1 for "Saved" tab
 
                     for (var i = 0; i< tags.rows.length; i++) {
                         repeater.itemAt(i).title = tags.rows.item(i).name
@@ -201,6 +206,15 @@
                         repeater.itemAt(i).isAll = false
                         repeater.itemAt(i).reload()
                     }
+                    // for "Saved" tab (means "favourite" in db)
+                    repeater.itemAt(tags.rows.length).title = i18n.tr("Saved")
+                    repeater.itemAt(tags.rows.length).topicId = -2
+                    repeater.itemAt(tags.rows.length).isAll = true
+                    repeater.itemAt(tags.rows.length).reload()
+                }
+
+                function reloadSaved() {
+                    repeater.itemAt(repeater.model - 1).reload()
                 }
             } // Repeater
         }