Attempt to roll back some of the general changes, and make a specific change to fix batchgroup sorting

Author: njl

logic.py

@@ -298,7 +298,7 @@ def _score_weight_average(v):
 def scored_proposals():
     q = '''SELECT scores, nominate, proposal, proposals.data->>'title' AS title,
                     proposals.accepted,
-                    COALESCE(batchgroups.name,'') as batchgroup,
+                    batchgroups.name as batchgroup,
                     batchgroups.id as batch_id
             FROM votes
             INNER JOIN proposals ON (votes.proposal = proposals.id)

static/js/app.js

@@ -118,7 +118,7 @@ function table_sorter($table, data_src, row_template, extra_column_functions){
             $this.addClass('warning');
             var column = $this.data().column;
             var value_function = function(x){
-                return x[column]?x[column]:'';
+                return x[column];
             }
             if(extra_column_functions[column]){
                 value_function = extra_column_functions[column]($this);

templates/admin/rough_scores.html

@@ -138,8 +138,15 @@
     });
 }
 
+function batchgroup_val(e){
+    if(e.batchgroup){
+        return e.batchgroup;
+    }
+    return 'ZZZZZZZZZZZZZZ';
+}
+
 $(document).ready(function(){
-    table_sorter($('table'), proposals, TEMPLATES.table_row);
+    table_sorter($('table'), proposals, TEMPLATES.table_row, {batchgroup:batchgroup_val});
     $('#get-groups').on('click', get_groups);
     $('tbody').on('click', '.batchgroup', handle_batch_click);
     $('tbody').on('change', '.batchgroup select', handle_batch_change);