Make review queue sortable

bd808 · bd808 · commit b41e27cdb8b0 · 2014-10-01T15:47:27.000-06:00
diff --git a/data/templates/proposals/queue.html b/data/templates/proposals/queue.html
@@ -1,5 +1,18 @@
 {% extends "proposals/base.html" %}
 {% set route = 'proposals_queue' %}
+{% set ctx = _context %}
+
+{% macro sortHeader( column, ctx ) %}
+{% set sorted = ctx.s == column %}
+{% set label = "proposals-list-#{column}" %}
+{% if sorted %}
+  {% set o = ctx.o == 'desc' ? 'desc' : 'asc' %}
+  {% set nextO = o == 'asc' ? 'desc' : 'asc' %}
+{% else %}
+  {% set nextO = 'asc' %}
+{% endif %}
+<th><a class="sortable {{ sorted ? "sorted-#{o}" : 'unsorted' }}" href="{{ urlFor( ctx.route ) }}?{{ qsMerge( { 's':column, 'o':nextO } ) }}">{{ label|message }}</a></th>
+{% endmacro %}
 
 {% block subtitle %}{{ 'nav-proposals-queue'|message }}{% endblock %}
 {% block content %}
@@ -11,17 +24,17 @@
 
 <table class="table table-striped table-hover table-condensed table-responsive">
   <tr>
-    <th>{{ 'proposals-list-title'|message }}</th>
-    <th>{{ 'proposals-list-theme'|message }}</th>
-    <th>{{ 'proposals-list-amount'|message }}</th>
-    <th>{{ 'proposals-list-reviews'|message }}</th>
+    {{ _self.sortHeader( 'title', ctx ) }}
+    {{ _self.sortHeader( 'theme', ctx ) }}
+    {{ _self.sortHeader( 'amount', ctx ) }}
+    {{ _self.sortHeader( 'reviews', ctx ) }}
   </tr>
   {% for row in records %}
   <tr>
     <td><a href="{{ urlFor( 'proposals_view', { 'id': row.id } ) }}">{{ row.title }}</a></td>
     <td>{{ row.theme }}</td>
     <td class="text-right">{{ row.amount|number_format }}</td>
-    <td class="text-right">{{ row.review_count|number_format }}</td>
+    <td class="text-right">{{ row.reviews|number_format }}</td>
   </tr>
   {% else %}
   <tr><td colspan="12">{{ 'no-results'|message }}</td></tr>
diff --git a/data/templates/proposals/search.html b/data/templates/proposals/search.html
@@ -54,8 +54,8 @@
     {{ _self.sortHeader( 'proposals-list-title', 'title', ctx ) }}
     {{ _self.sortHeader( 'proposals-list-theme', 'theme', ctx ) }}
     {{ _self.sortHeader( 'proposals-list-amount', 'amount', ctx ) }}
-    {{ _self.sortHeader( 'proposals-list-reviews', 'review_count', ctx ) }}
-    {{ _self.sortHeader( 'proposals-list-myreviews', 'my_review_count', ctx ) }}
+    {{ _self.sortHeader( 'proposals-list-reviews', 'reviews', ctx ) }}
+    {{ _self.sortHeader( 'proposals-list-myreviews', 'myreviews', ctx ) }}
   </tr>
   {% for row in records %}
   <tr>
diff --git a/src/Controllers/Proposals/Queue.php b/src/Controllers/Proposals/Queue.php
@@ -38,16 +38,24 @@ protected function handleGet() {
 			array( 'min_range' => 1, 'max_range' => 250, 'default' => 20 )
 		);
 		$this->form->expectInt( 'p', array( 'min_range' => 0, 'default' => 0 ) );
+		$this->form->expectString( 's', array( 'default' => 'id' ) );
+		$this->form->expectInArray( 'o', array( 'asc', 'desc' ),
+			array( 'default' => 'asc' )
+		);
 		$this->form->validate( $_GET );
 
 		$this->view->set( 'items', $this->form->get( 'items' ) );
 		$this->view->set( 'p', $this->form->get( 'p' ) );
+		$this->view->set( 's', $this->form->get( 's' ) );
+		$this->view->set( 'o', $this->form->get( 'o' ) );
 		$this->view->set( 'found', null );
 
 		$params = array(
 			'proposals' => 'myqueue',
 			'items' => $this->form->get( 'items' ),
 			'page' => $this->form->get( 'p' ),
+			'sort' => $this->form->get( 's' ),
+			'order' => $this->form->get( 'o' ),
 		);
 
 		$ret = $this->dao->search( $params );
diff --git a/src/Dao/Proposals.php b/src/Dao/Proposals.php
@@ -122,7 +122,7 @@ public function search( array $params ) {
 
 		$validSorts = array(
 			'id', 'title', 'amount', 'theme', 'status',
-			'review_count', 'my_review_count',
+			'reviews', 'myreviews',
 		);
 		$sortby = in_array( $params['sort'], $validSorts ) ?
 			$params['sort'] : $defaults['sort'];
@@ -154,29 +154,29 @@ public function search( array $params ) {
 			'p.amount as amount',
 			'p.theme as theme',
 			'p.status as status',
-			'COALESCE(rc.review_count, 0) as review_count',
-			'COALESCE(mc.my_review_count, 0) as my_review_count',
+			'COALESCE(rc.reviews, 0) as reviews',
+			'COALESCE(mc.myreviews, 0) as myreviews',
 		);
 
 		switch( $params['proposals'] ) {
 			case 'unreviewed':
-				$where[] = 'review_count IS NULL';
+				$where[] = 'reviews IS NULL';
 				break;
 			case 'myqueue':
-				$where[] = 'my_review_count IS NULL';
+				$where[] = 'myreviews IS NULL';
 				break;
 			default:
 				break;
 		}
 
 		$reviewCountSql = self::concat(
-			'SELECT proposal, count(*) as review_count',
+			'SELECT proposal, count(*) as reviews',
 			'FROM reviews',
 			'GROUP BY proposal'
 		);
 
 		$myReviewCountSql = self::concat(
-			'SELECT proposal, count(*) as my_review_count',
+			'SELECT proposal, count(*) as myreviews',
 			'FROM reviews',
 			'WHERE reviewer = :int_userid',
 			'GROUP BY proposal'
