From d856c12ad358cb040934b52279cc2c89aa8cc33c Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Fri, 14 Oct 2016 15:28:56 +0530 Subject: [PATCH] extr4acted out common code for CI AND CA --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js | 35 ++++++++++++++++++++++------------- 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 7 ++----- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js index 06f0061..27ec75c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js @@ -9,22 +9,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module $scope.loadForModuleById = function (moduleId) { + console.log('loadForModuleById is called') var moduleName = Modules[moduleId].Name; $scope.loadDataForModule(moduleName); } - $scope.loadDataForModule = function(moduleName) + $scope.loadDataForModule = function (moduleName) { + console.log('loadDataForModule is called') + var jsonPath; if(moduleName==ATLAS_ANATOMY) { - var promise = DataService.getJson('~/../content/data/json/aa/aa_dat_contentlist.json') + jsonPath ='~/../content/data/json/aa/aa_dat_contentlist.json'; + } + else if(moduleName == CLINICAL_ANIMATION) + { + //to do, in next phase of project + jsonPath ='~/../content/data/json/ca/ca_dat_contentlist.json'; + } + else if(moduleName == CLINICAL_ILLUSTRATION) + { + //to do, in next phase of project + jsonPath ='~/../content/data/json/ci/ci_dat_contentlist.json'; + } + + var promise = DataService.getJson(jsonPath) promise.then( function (result) { $scope.AtlasAnatomyData = result; $scope.data = new jinqJs() - .from($scope.AtlasAnatomyData.root.Item) + .from($scope.AtlasAnatomyData.root.Item) .orderBy([{ field: '_Title', sort: 'asc' }]) .select(); @@ -35,7 +51,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module var $el = $('
' + '
' - + '' + + '' + '

' + value._Title + '

').appendTo('#grid-view'); @@ -57,15 +73,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module console.log(' $scope.IllustrationData = ' + error.statusText); } ); - } - else if(moduleName==CLINICAL_ANIMATION) - { - - } - else if(moduleName == CLINICAL_ILLUSTRATION) - { - - } + + } $scope.scroll = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css index 771c4a7..652084e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css @@ -864,12 +864,9 @@ cursor:pointer; { background:#626c34 !important; } -.tinyImg { - width: 173px; - height: 216px !important; -} -.abc { + +.tinyImg { display: block; max-width:230px; max-height:95px; -- libgit2 0.21.4