Commit d856c12ad358cb040934b52279cc2c89aa8cc33c
1 parent
d5b85e0c
extr4acted out common code for CI AND CA
Showing
2 changed files
with
24 additions
and
18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js
@@ -9,22 +9,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module | @@ -9,22 +9,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module | ||
9 | 9 | ||
10 | $scope.loadForModuleById = function (moduleId) { | 10 | $scope.loadForModuleById = function (moduleId) { |
11 | 11 | ||
12 | + console.log('loadForModuleById is called') | ||
12 | var moduleName = Modules[moduleId].Name; | 13 | var moduleName = Modules[moduleId].Name; |
13 | 14 | ||
14 | $scope.loadDataForModule(moduleName); | 15 | $scope.loadDataForModule(moduleName); |
15 | } | 16 | } |
16 | 17 | ||
17 | - $scope.loadDataForModule = function(moduleName) | 18 | + $scope.loadDataForModule = function (moduleName) |
18 | { | 19 | { |
20 | + console.log('loadDataForModule is called') | ||
21 | + var jsonPath; | ||
19 | if(moduleName==ATLAS_ANATOMY) | 22 | if(moduleName==ATLAS_ANATOMY) |
20 | { | 23 | { |
21 | - var promise = DataService.getJson('~/../content/data/json/aa/aa_dat_contentlist.json') | 24 | + jsonPath ='~/../content/data/json/aa/aa_dat_contentlist.json'; |
25 | + } | ||
26 | + else if(moduleName == CLINICAL_ANIMATION) | ||
27 | + { | ||
28 | + //to do, in next phase of project | ||
29 | + jsonPath ='~/../content/data/json/ca/ca_dat_contentlist.json'; | ||
30 | + } | ||
31 | + else if(moduleName == CLINICAL_ILLUSTRATION) | ||
32 | + { | ||
33 | + //to do, in next phase of project | ||
34 | + jsonPath ='~/../content/data/json/ci/ci_dat_contentlist.json'; | ||
35 | + } | ||
36 | + | ||
37 | + var promise = DataService.getJson(jsonPath) | ||
22 | promise.then( | 38 | promise.then( |
23 | function (result) { | 39 | function (result) { |
24 | $scope.AtlasAnatomyData = result; | 40 | $scope.AtlasAnatomyData = result; |
25 | 41 | ||
26 | $scope.data = new jinqJs() | 42 | $scope.data = new jinqJs() |
27 | - .from($scope.AtlasAnatomyData.root.Item) | 43 | + .from($scope.AtlasAnatomyData.root.Item) |
28 | .orderBy([{ field: '_Title', sort: 'asc' }]) | 44 | .orderBy([{ field: '_Title', sort: 'asc' }]) |
29 | .select(); | 45 | .select(); |
30 | 46 | ||
@@ -35,7 +51,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module | @@ -35,7 +51,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module | ||
35 | 51 | ||
36 | var $el = $('<div id="' + value._Id + '" class="col-sm-3 col-md-3" title = "' + value._Title + '" data-ng-click="openView($event)">' | 52 | var $el = $('<div id="' + value._Id + '" class="col-sm-3 col-md-3" title = "' + value._Title + '" data-ng-click="openView($event)">' |
37 | + '<div class="thumbnail" >' | 53 | + '<div class="thumbnail" >' |
38 | - + '<img class="abc" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >' | 54 | + + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >' |
39 | + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); | 55 | + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); |
40 | 56 | ||
41 | 57 | ||
@@ -57,15 +73,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module | @@ -57,15 +73,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, Module | ||
57 | console.log(' $scope.IllustrationData = ' + error.statusText); | 73 | console.log(' $scope.IllustrationData = ' + error.statusText); |
58 | } | 74 | } |
59 | ); | 75 | ); |
60 | - } | ||
61 | - else if(moduleName==CLINICAL_ANIMATION) | ||
62 | - { | ||
63 | - | ||
64 | - } | ||
65 | - else if(moduleName == CLINICAL_ILLUSTRATION) | ||
66 | - { | ||
67 | - | ||
68 | - } | 76 | + |
77 | + | ||
69 | } | 78 | } |
70 | 79 | ||
71 | $scope.scroll = function () { | 80 | $scope.scroll = function () { |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -864,12 +864,9 @@ cursor:pointer; | @@ -864,12 +864,9 @@ cursor:pointer; | ||
864 | { | 864 | { |
865 | background:#626c34 !important; | 865 | background:#626c34 !important; |
866 | } | 866 | } |
867 | -.tinyImg { | ||
868 | - width: 173px; | ||
869 | - height: 216px !important; | ||
870 | -} | ||
871 | 867 | ||
872 | -.abc { | 868 | + |
869 | +.tinyImg { | ||
873 | display: block; | 870 | display: block; |
874 | max-width:230px; | 871 | max-width:230px; |
875 | max-height:95px; | 872 | max-height:95px; |