ADAM / AIAHTML5

Commit b772c01c15aea4162abd71bc68234d78247eab20

Authored by Amrita Vishnoi
2 parents 388d57c7 2e5c4938

Merge branch 'CICAAlphabetical' into Develop

Inline Side-by-side
Showing 2 changed files with 14 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @b772c01
@@ -33,7 +33,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B @@ -33,7 +33,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
33 promise.then( 33 promise.then(
34 function (result) { 34 function (result) {
35 $scope.AnimationData = result; 35 $scope.AnimationData = result;
36 - $scope.selectedCAListViewData = $scope.AnimationData.root.CAData; 36 + //$scope.selectedCAListViewData = $scope.AnimationData.root.CAData;
  37 +
  38 + $scope.selectedCAListViewData = new jinqJs()
  39 + .from($scope.AnimationData.root.CAData)
  40 + .orderBy([{ field: '_Title', sort: 'asc' }])
  41 + .select();
  42 +
  43 + //console.log($scope.selectedCAListViewData);
37 44
38 $('#grid-view').empty(); 45 $('#grid-view').empty();
39 46
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @b772c01
@@ -43,7 +43,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -43,7 +43,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
43 promise.then( 43 promise.then(
44 function (result) { 44 function (result) {
45 $scope.IllustrationData = result; 45 $scope.IllustrationData = result;
46 - $scope.selectedCIListViewData = $scope.IllustrationData.root.CIData; 46 + //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData;
  47 +
  48 + $scope.selectedCIListViewData = new jinqJs()
  49 + .from($scope.IllustrationData.root.CIData)
  50 + .orderBy([{ field: '_Title', sort: 'asc' }])
  51 + .select();
47 52
48 $('#grid-view').empty(); 53 $('#grid-view').empty();
49 54