Merge branch '923/sort-by-rank'

okfn · Mar 22, 2017 · 02ce637 · 02ce637
2 parents 8682d79 + 7d4898b
commit 02ce637
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 19 deletions.
diff --git a/census/static/css/styles.css b/census/static/css/styles.css
diff --git a/census/static/css/styles.css.map b/census/static/css/styles.css.map
diff --git a/census/static/scripts/site/table.js b/census/static/scripts/site/table.js
@@ -27,6 +27,21 @@ define(['jquery', 'bootstrap', 'chroma', 'tablesorter', 'stickykit'],
           11: {sorter: false}
         }
       },
+      tablesorterPlaceIndexOptions = {
+        sortList: [[0, 0]],
+        headers: {
+          2: {sorter: false},
+          3: {sorter: false},
+          4: {sorter: false},
+          5: {sorter: false},
+          6: {sorter: false},
+          7: {sorter: false},
+          8: {sorter: false},
+          9: {sorter: false},
+          10: {sorter: false},
+          11: {sorter: false}
+        }
+      },
       tablesorterDatasetOptions = {
         sortList: [[0, 0]],
         headers: {
@@ -71,6 +86,7 @@ define(['jquery', 'bootstrap', 'chroma', 'tablesorter', 'stickykit'],
       sortFlag = true;
 
     $('#places_overview_table').tablesorter(tablesorterPlaceOptions);
+    $('#places_overview_table_index').tablesorter(tablesorterPlaceIndexOptions);
     $('#datasets_overview_table').tablesorter(tablesorterDatasetOptions);
     $('#slice-table').tablesorter(tablesorterSliceOptions);
     $('#slice-table-index').tablesorter(tablesorterSliceIndexOptions);
@@ -82,7 +98,7 @@ define(['jquery', 'bootstrap', 'chroma', 'tablesorter', 'stickykit'],
 
     $('.content').on('click', '.sort_rank, .sort_place',
       function(e) {
-        $('#places_overview_table').trigger('sorton',
+        $('#places_overview_table, #places_overview_table_index').trigger('sorton',
           [[[$(e.target).hasClass('sort_place') / 1, sortFlag]]]);
         $('.headerSortDown').removeClass('headerSortDown');
         $('.headerSortUp').removeClass('headerSortUp');

diff --git a/census/static/scss/_tables.scss b/census/static/scss/_tables.scss
@@ -271,15 +271,18 @@ td.previous-results {
 }
 
 
-#places_overview_table thead tr th, #datasets_overview_table thead tr th, .slice-table thead tr th {
+#places_overview_table thead tr th,
+#places_overview_table_index thead tr th,
+#datasets_overview_table thead tr th,
+.slice-table thead tr th {
   &.clickable {
     cursor: pointer;
     color: lighten(black, 15%);
   }
 }
 
-#places_overview_table {
-
+#places_overview_table,
+#places_overview_table_index {
   tr td {
     padding: 8px 4px 8px 4px !important;
 

diff --git a/census/views/includes/dataviews/table_places.html b/census/views/includes/dataviews/table_places.html
@@ -1,11 +1,17 @@
 {% import "macros/popovers.html" as popovers %}
-
+{% if is_index %}
+  {% set table_id = "places_overview_table_index" %}
+  {% set sortby = "rank" %}
+{% else %}
+  {% set table_id = "places_overview_table" %}
+  {% set sortby = "name" %}
+{% endif %}
 <div class="table-responsive">
-  <table id="places_overview_table" class="table data-table sexyTable">
+  <table id="{{ table_id }}" class="table data-table sexyTable">
     <thead>
       <tr>
         <th class="clickable sort_rank header" title="{{ gettext('Sort by Rank') }}" style="width: 71px;">{{ gettext('Rank') }}</th>
-        <th class="clickable sort_place header headerSortDown" title="{{ gettext('Sort by A-Z') }}" style="width: 71px;">{{ gettext('Place') }}</th>
+        <th class="clickable sort_place header" title="{{ gettext('Sort by A-Z') }}" style="width: 71px;">{{ gettext('Place') }}</th>
         {% for dataset in datasets %}
           <th class="datasetHeader">
             <div><a href="{{ format('/dataset/%(dataset)s', {dataset: dataset.id}) }}">{{ dataset.name }}</a></div>
@@ -15,7 +21,7 @@
       </tr>
     </thead>
     <tbody>
-      {% for place in places|sort(false, false, 'name') %}
+      {% for place in places|sort(false, false, sortby) %}
         <tr data-rank="{{ place.rank }}" data-score="{{ place.computedRelativeScore}}" data-place="{{ place.id }}" data-name="{{ place.name }}">
           <td class="rank" data-rank="{{ place.rank }}">
             <div>{{ place.rank }}</div>

diff --git a/census/views/includes/dataviews/table_slice_dataset.html b/census/views/includes/dataviews/table_slice_dataset.html
@@ -1,8 +1,10 @@
 <div class="table-responsive">
     {% if is_index %}
       {% set tableId = 'slice-table-index' %}
+      {% set sortby = 'rank' %}
     {% else %}
       {% set tableId = 'slice-table' %}
+      {% set sortby = 'name' %}
     {% endif %}
     <table id="{{ tableId }}" class="table slice-table data-table table-header-stuck">
         {% if is_index %}
@@ -41,7 +43,7 @@
           </tr>
         </thead>
         <tbody>
-          {% for place in places|sort(false, false, 'name') %}
+          {% for place in places|sort(false, false, sortby) %}
             {% set entry = entries|find({'place': place.id, 'dataset': dataset.id}) %}
             {% set submissions = pending|where({'place': place.id, 'dataset': dataset.id}) %}
             <tr id="{{ place.id }}" class="entry" data-rank="{{ place.rank }}" data-score="{{ place.computedScore }}" data-place="{{ place.id }}" data-name="{{ place.name }}">