Were added statuses request for ordres and default sorting for server pagination

Author: skozlov

demo/bootstrap/index.html

@@ -168,7 +168,7 @@ <h4>Additional Demos</h4>
                                     ng-model="status"
                                     ng-change="filter()">
                                 <option value="">All Statuses</option>
-                                <option ng-repeat="option in statusOptions track by option.value"
+                                <option ng-repeat="option in UI.statusOptions track by option.value"
                                         value="{{option.value}}">{{option.text}}
                                 </option>
                             </select>

demo/bootstrap/js/serverPaginationApp.js

@@ -15,23 +15,32 @@
             data: [],
             getData: myAppFactory.getOrdersData,
             sort: {
-                predicate: 'name',
+                predicate: 'orderNo',
                 direction: 'asc'
             }
         };
+        $scope.UI = {};
         $scope.gridActions = {};
+        myAppFactory.getStatuses().success(function (resp) {
+            $scope.UI.statusOptions = resp;
+        });
     }
 
     function MyAppFactory($http) {
         var herokuDomain = 'https://server-pagination.herokuapp.com';
         return {
-            getOrdersData: getOrdersData
+            getOrdersData: getOrdersData,
+            getStatuses: getStatuses
         };
 
         function getOrdersData(params, callback) {
             $http.get(herokuDomain + '/orders' + params).success(function (response) {
                 callback(response.orders, response.ordersCount);
             });
         }
+
+        function getStatuses() {
+            return $http.get(herokuDomain + '/orders/statuses');
+        }
     }
 })();

demo/bootstrap/server-pagination.html

@@ -137,10 +137,21 @@
         <table class="table table-bordered">
             <thead>
             <tr>
-                <th sortable="orderNo" class="sortable">Order #</th>
-                <th sortable="datePlaced" class="sortable">Date Placed</th>
-                <th sortable="status" class="sortable">Statuses</th>
-                <th sortable="amount" class="sortable">Total</th>
+                <th width="30%" sortable="orderNo" class="sortable">Order #</th>
+                <th width="30%" sortable="datePlaced" class="sortable">Date Placed</th>
+                <th class="st-sort-disable th-dropdown">
+                    <select class="form-control width-15"
+                            filter-by="status"
+                            filter-type="select"
+                            ng-model="status"
+                            ng-change="filter()">
+                        <option value="">All Statuses</option>
+                        <option ng-repeat="option in UI.statusOptions track by option.value"
+                                value="{{option.value}}">{{option.text}}
+                        </option>
+                    </select>
+                </th>
+                <th sortable="total" class="sortable">Total</th>
             </tr>
             </thead>
             <tbody>

src/js/dataGrid.js

@@ -55,10 +55,12 @@
                 }
             });
 
-            $scope.sort = function (predicate) {
-                var direction = $scope.sortOptions.predicate === predicate && $scope.sortOptions.direction === 'desc' ? 'asc' : 'desc';
-                $scope.sortOptions.predicate = predicate;
-                $scope.sortOptions.direction = direction;
+            $scope.sort = function (predicate, isDefaultSort) {
+                if (!isDefaultSort) {
+                    var direction = $scope.sortOptions.predicate === predicate && $scope.sortOptions.direction === 'desc' ? 'asc' : 'desc';
+                    $scope.sortOptions.direction = direction;
+                    $scope.sortOptions.predicate = predicate;
+                }
                 $scope.paginationOptions.currentPage = 1;
                 $scope.reloadGrid();
             };
@@ -217,10 +219,14 @@
 
             function getData() {
                 var url = $location.path().slice(1);
-                $scope._gridOptions.getData('?' + url, function (data, totalItems) {
-                    $scope.filtered = data;
-                    $scope.paginationOptions.totalItems = totalItems;
-                });
+                if (!url && $scope.sortOptions.predicate) {
+                    $scope.sort($scope.sortOptions.predicate, true);
+                } else {
+                    $scope._gridOptions.getData('?' + url, function (data, totalItems) {
+                        $scope.filtered = data;
+                        $scope.paginationOptions.totalItems = totalItems;
+                    });
+                }
                 // -> to promise
                 //$scope._gridOptions.getData('?' + url).then(function (data, totalItems) {
                 //    $scope.filtered = data;