Added time based selection to the sweeper nav

ushahidi · Feb 1, 2011 · fd0fd39 · fd0fd39
1 parent 6c02187
commit fd0fd39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/web/application/classes/controller/api/contentselection.php b/web/application/classes/controller/api/contentselection.php
@@ -9,7 +9,7 @@ public function action_index()
 
         $strings = array ("state", "type", "subType", "source", "orderBy");
 
-        $ints = array ("minVeracity", "maxVeracity", "pageSize", "pageStart");
+        $ints = array ("minVeracity", "maxVeracity", "pageSize", "pageStart", "time");
 
         $params = array();
 

diff --git a/web/application/views/pages/contentlist.php b/web/application/views/pages/contentlist.php
@@ -1,6 +1,7 @@
 <?php ?>
 <script type="text/javascript" language="javascript">
-    var nav_state = '<?php echo(isset($_SESSION["nav_state"]) ? $_SESSION["nav_state"] : $state); ?>'; <!-- changed -->
+    var nav_state = '<?php echo(isset($_SESSION["nav_state"]) ? $_SESSION["nav_state"] : $state); ?>'; 
+    var nav_time = '<?php echo(isset($_SESSION["nav_time"]) ? $_SESSION["nav_time"] : \time()); ?>';
     var nav_minVeracity = <?php echo(isset($_SESSION["nav_minVeracity"]) ? $_SESSION["nav_minVeracity"] : "0"); ?>;
     var nav_maxVeracity = <?php echo(isset($_SESSION["nav_maxVeracity"]) ? $_SESSION["nav_maxVeracity"] : "100"); ?>;
     var nav_type = '<?php echo(isset($_SESSION["nav_type"]) ? $_SESSION["nav_type"] : "null"); ?>';
@@ -15,7 +16,7 @@
     $(document).ready(function(){
         setInterval("Update()", 10000);
         listController = new ListController(nav_baseUrl, "div#content-list ul", "div#nav-container");
-        listController.NavigationStateChange(new NavigationState(nav_state, nav_minVeracity, nav_maxVeracity, nav_type, nav_subType, nav_source, nav_pageSize, nav_pageStart, nav_orderBy, nav_tags));
+        listController.NavigationStateChange(new NavigationState(nav_state, nav_time, nav_minVeracity, nav_maxVeracity, nav_type, nav_subType, nav_source, nav_pageSize, nav_pageStart, nav_orderBy, nav_tags));
         $("#more_content a").attr("href", "javascript:MoreContent("+ nav_pageSize +")");
     });
 </script>

diff --git a/web/media/js/site/framework.js b/web/media/js/site/framework.js
@@ -76,6 +76,7 @@ function ListController(baseUrl, subject, navContainer) {
             uri,
             {
                 state : this.navigationState.state,
+                time : this.navigationState.time,
                 minVeracity : this.navigationState.minVeracity,
                 maxVeracity : this.navigationState.maxVeracity,
                 type : this.navigationState.type,
@@ -406,8 +407,9 @@ function ListController(baseUrl, subject, navContainer) {
     return true;
 }
 
-function NavigationState(state, minVeracity, maxVeracity, type, subType, source, pageSize, pageStart, orderBy, tags) {
+function NavigationState(state, time, minVeracity, maxVeracity, type, subType, source, pageSize, pageStart, orderBy, tags) {
     this.state = state;
+    this.time = time;
     this.minVeracity = minVeracity;
     this.maxVeracity = maxVeracity;
     this.type = type;
@@ -420,6 +422,7 @@ function NavigationState(state, minVeracity, maxVeracity, type, subType, source,
 
     this.Equals = function(navigationState) {
         if(navigationState.state != this.state)                 return false;
+        if(navigationState.time != this.time)                   return false;
         if(navigationState.minVeracity != this.minVeracity)     return false;
         if(navigationState.type != this.type)                   return false;
         if(navigationState.subType != this.subType)             return false;
@@ -434,6 +437,7 @@ function NavigationState(state, minVeracity, maxVeracity, type, subType, source,
     this.Copy = function() {
         return new NavigationState(
             this.state,
+            this.time,
             this.minVeracity,
             this.maxVeracity,
             this.type,