Use descending instead of sortDesc

gnowoel · Oct 13, 2016 · d224baf · d224baf
1 parent 50c7e13
commit d224baf
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/app/adapters/application.js b/app/adapters/application.js
@@ -152,8 +152,8 @@ export default Adapter.extend(PouchAdapterUtils, {
       if (query.options) {
         queryParams = Ember.copy(query.options);
         if (query.sortKey || query.filterBy) {
-          if (query.sortDesc) {
-            queryParams.sortDesc = query.sortDesc;
+          if (query.descending) {
+            queryParams.descending = query.descending;
           }
           if (query.sortKey) {
             queryParams.sortKey = query.sortKey;

diff --git a/app/appointments/search/template.hbs b/app/appointments/search/template.hbs
@@ -24,12 +24,12 @@
   </div>
   <table class="table">
     <tr class="table-header">
-      {{#sortable-column sortBy='date' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.date'}}{{/sortable-column}}
+      {{#sortable-column sortBy='date' descending=descending sortKey=sortKey }}{{t 'labels.date'}}{{/sortable-column}}
       <th>{{t 'labels.name'}}</th>
-      {{#sortable-column sortBy='appointmentType' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}}
-      {{#sortable-column sortBy='location' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.location'}}{{/sortable-column}}
-      {{#sortable-column sortBy='provider' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.with'}}{{/sortable-column}}
-      {{#sortable-column sortBy='status' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.status'}}{{/sortable-column}}
+      {{#sortable-column sortBy='appointmentType' descending=descending sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}}
+      {{#sortable-column sortBy='location' descending=descending sortKey=sortKey }}{{t 'labels.location'}}{{/sortable-column}}
+      {{#sortable-column sortBy='provider' descending=descending sortKey=sortKey }}{{t 'labels.with'}}{{/sortable-column}}
+      {{#sortable-column sortBy='status' descending=descending sortKey=sortKey }}{{t 'labels.status'}}{{/sortable-column}}
       <th>{{t 'labels.actions'}}</th>
     </tr>
     {{#each model as |appointment|}}

diff --git a/app/components/sortable-column.js b/app/components/sortable-column.js
@@ -3,7 +3,7 @@ export default Ember.Component.extend({
   classNames: ['sortable-column'],
   tagName: 'th',
   action: 'sortByKey',
-  sortDesc: false,
+  descending: false,
   sortBy: null,
   sortKey: null,
   sorted: function() {
@@ -15,10 +15,10 @@ export default Ember.Component.extend({
   click() {
     let sortBy = this.get('sortBy');
     let sorted = this.get('sorted');
-    let sortDesc = false;
+    let descending = false;
     if (sorted) {
-      sortDesc = this.toggleProperty('sortDesc');
+      descending = this.toggleProperty('descending');
     }
-    this.sendAction('action', sortBy, sortDesc);
+    this.sendAction('action', sortBy, descending);
   }
 });
diff --git a/app/controllers/abstract-paged-controller.js b/app/controllers/abstract-paged-controller.js
@@ -10,8 +10,8 @@ export default Ember.Controller.extend(PaginationProps, ProgressDialog, UserSess
   previousStartKeys: [],
   progressMessage: 'Loading Records.  Please wait...',
   progressTitle: 'Loading',
-  queryParams: ['startKey', 'sortKey', 'sortDesc'],
-  sortDesc: false,
+  queryParams: ['startKey', 'sortKey', 'descending'],
+  descending: false,
   sortKey: null,
 
   canAdd: function() {
@@ -73,11 +73,11 @@ export default Ember.Controller.extend(PaginationProps, ProgressDialog, UserSess
       this.set('previousStartKeys', previousStartKeys);
       this.showProgressModal();
     },
-    sortByKey: function(sortKey, sortDesc) {
+    sortByKey: function(sortKey, descending) {
       this.setProperties({
         previousStartKey: null,
         previousStartKeys: [],
-        sortDesc: sortDesc,
+        descending: descending,
         sortKey: sortKey,
         startKey: null
       });

diff --git a/app/inventory/listing/template.hbs b/app/inventory/listing/template.hbs
@@ -2,12 +2,12 @@
   {{#if hasRecords}}
     <table class="table">
       <tr class="table-header">
-        {{#sortable-column sortBy='friendlyId' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}}
-        {{#sortable-column sortBy='name' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.name'}}{{/sortable-column}}
-        {{#sortable-column sortBy='inventoryType' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}}
-        {{#sortable-column sortBy='quantity' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.quantity'}}{{/sortable-column}}
+        {{#sortable-column sortBy='friendlyId' descending=descending sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}}
+        {{#sortable-column sortBy='name' descending=descending sortKey=sortKey }}{{t 'labels.name'}}{{/sortable-column}}
+        {{#sortable-column sortBy='inventoryType' descending=descending sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}}
+        {{#sortable-column sortBy='quantity' descending=descending sortKey=sortKey }}{{t 'labels.quantity'}}{{/sortable-column}}
         <th>{{t 'inventory.labels.location'}}</th>
-        {{#sortable-column sortBy='crossReference' sortDesc=sortDesc sortKey=sortKey }}{{t 'inventory.labels.xref'}}{{/sortable-column}}
+        {{#sortable-column sortBy='crossReference' descending=descending sortKey=sortKey }}{{t 'inventory.labels.xref'}}{{/sortable-column}}
         <th>{{t 'labels.actions'}}</th>
       </tr>
       {{#each model as |inventory|}}

diff --git a/app/patients/index/template.hbs b/app/patients/index/template.hbs
@@ -3,12 +3,12 @@
     <table class="table">
       <thead>
         <tr class="table-header">
-          {{#sortable-column sortBy='id' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}}
-          {{#sortable-column sortBy='firstName' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.firstName'}}{{/sortable-column}}
-          {{#sortable-column sortBy='lastName' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.lastName'}}{{/sortable-column}}
-          {{#sortable-column sortBy='sex' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.sex'}}{{/sortable-column}}
-          {{#sortable-column sortBy='dateOfBirth' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.dob'}}{{/sortable-column}}
-          {{#sortable-column sortBy='status' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.status'}}{{/sortable-column}}
+          {{#sortable-column sortBy='id' descending=descending sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}}
+          {{#sortable-column sortBy='firstName' descending=descending sortKey=sortKey }}{{t 'patients.labels.firstName'}}{{/sortable-column}}
+          {{#sortable-column sortBy='lastName' descending=descending sortKey=sortKey }}{{t 'patients.labels.lastName'}}{{/sortable-column}}
+          {{#sortable-column sortBy='sex' descending=descending sortKey=sortKey }}{{t 'patients.labels.sex'}}{{/sortable-column}}
+          {{#sortable-column sortBy='dateOfBirth' descending=descending sortKey=sortKey }}{{t 'patients.labels.dob'}}{{/sortable-column}}
+          {{#sortable-column sortBy='status' descending=descending sortKey=sortKey }}{{t 'labels.status'}}{{/sortable-column}}
           {{#if showActions}}
             <th>{{t 'labels.actions'}}</th>
           {{/if}}

diff --git a/app/routes/abstract-index-route.js b/app/routes/abstract-index-route.js
@@ -58,8 +58,8 @@ export default Ember.Route.extend(PouchDbMixin, ProgressDialog, AuthenticatedRou
       let queryParams = this._modelQueryParams(params);
       if (!Ember.isEmpty(params.sortKey)) {
         queryParams.sortKey = params.sortKey;
-        if (!Ember.isEmpty(params.sortDesc)) {
-          queryParams.sortDesc = params.sortDesc;
+        if (!Ember.isEmpty(params.descending)) {
+          queryParams.descending = params.descending;
         }
       }
       if (!Ember.isEmpty(filterParams)) {
@@ -88,7 +88,7 @@ export default Ember.Route.extend(PouchDbMixin, ProgressDialog, AuthenticatedRou
   },
 
   queryParams: {
-    sortDesc: { refreshModel: true },
+    descending: { refreshModel: true },
     sortKey: { refreshModel: true },
     startKey: { refreshModel: true }
   },

diff --git a/app/templates/components/sortable-column.hbs b/app/templates/components/sortable-column.hbs
@@ -1,5 +1,5 @@
 {{#if sorted}}
-  <span class="octicon {{if sortDesc 'octicon-triangle-down' 'octicon-triangle-up'}}"></span>
+  <span class="octicon {{if descending 'octicon-triangle-down' 'octicon-triangle-up'}}"></span>
 {{else}}
   <span class="octicon octicon-triangle-down inactive"></span>
 {{/if}}

diff --git a/app/utils/pouch-views.js b/app/utils/pouch-views.js
@@ -99,7 +99,7 @@ function generateSortFunction(sortFunction, includeCompareDate, filterFunction)
     '}' +
     '}' +
     '}' +
-    'if (req.query.sortDesc) {' +
+    'if (req.query.descending) {' +
     'rows = rows.reverse();' +
     '}' +
     'if (req.query.sortLimit) {' +