Commit dc9f600defdc4313887fb69fda9a86eaad4f6c29
Merge branch 'CACI_8680' into Develop
Showing
5 changed files
with
217 additions
and
42 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
... | ... | @@ -14,6 +14,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
14 | 14 | $scope.filterstring = false; |
15 | 15 | $scope.hostedServer = "http://aia5.adam.com/graphics/Multimedia/en/"; |
16 | 16 | $scope.hostedFolderId; |
17 | + $scope.idSelected; | |
17 | 18 | $scope.query = { |
18 | 19 | selectedbodyregion: '', |
19 | 20 | selectedbodysystem: '', |
... | ... | @@ -39,13 +40,31 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
39 | 40 | //set the local storage |
40 | 41 | |
41 | 42 | var curtab = localStorage.getItem("currentCATabView"); |
43 | + //if (curtab == 2) { | |
44 | + // $scope.setActiveTab(2); | |
45 | + //} | |
42 | 46 | if (curtab == 2) { |
43 | 47 | $scope.setActiveTab(2); |
48 | + var curSelectedRowId = localStorage.getItem("CASelectedRowId"); | |
49 | + if (typeof (curSelectedRowId) !== "undefined" && curSelectedRowId !== null && curSelectedRowId !== '') { | |
50 | + $scope.reRunSearchOnLoad(); | |
51 | + $scope.idSelected = curSelectedRowId; | |
52 | + $scope.ReloadListViewImageDiv($scope.idSelected); | |
53 | + } | |
54 | + else { | |
55 | + $scope.reRunSearchOnLoad() | |
56 | + $scope.idSelected = ''; | |
57 | + } | |
44 | 58 | } |
45 | 59 | else { |
46 | 60 | $scope.setActiveTab(1); |
47 | 61 | } |
48 | 62 | |
63 | + $scope.reRunSearchOnLoad(); | |
64 | + | |
65 | + }); | |
66 | + | |
67 | + $scope.reRunSearchOnLoad = function () { | |
49 | 68 | var curBodyRegion = localStorage.getItem("CACurBodyRegion"); |
50 | 69 | if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !== '') { |
51 | 70 | $scope.query.selectedbodyregion = curBodyRegion; |
... | ... | @@ -76,10 +95,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
76 | 95 | } |
77 | 96 | else { |
78 | 97 | $scope.ApplySearch($scope.query); |
79 | - } | |
80 | 98 | |
81 | - | |
82 | - }); | |
99 | + } | |
100 | + } | |
83 | 101 | |
84 | 102 | $scope.LoadCAJsonData = function () { |
85 | 103 | |
... | ... | @@ -159,6 +177,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
159 | 177 | |
160 | 178 | $scope.showItem = function (id) { |
161 | 179 | //console.log(id); |
180 | + $scope.idSelected = id; | |
181 | + localStorage.setItem("CASelectedRowId", id); | |
182 | + | |
183 | + //Set the vertical scroll value of the table. | |
184 | + var y = $('#ListViewDiv').scrollTop(); | |
185 | + localStorage.setItem("CAListViewScroll", y); | |
186 | + | |
162 | 187 | $scope.hiderow = true; |
163 | 188 | if ($scope.filterstring == false) { |
164 | 189 | |
... | ... | @@ -200,15 +225,30 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
200 | 225 | query.selectedspecialty = ""; |
201 | 226 | |
202 | 227 | //set localstorage values |
203 | - localStorage.setItem("CACurBodyRegion", query.selectedbodyregion); | |
204 | - localStorage.setItem("CACurBodySystem", query.selectedbodysystem); | |
205 | - localStorage.setItem("CACurSpeciality", query.selectedspecialty); | |
228 | + localStorage.setItem("CACurBodyRegion", ''); | |
229 | + localStorage.setItem("CACurBodySystem", ''); | |
230 | + localStorage.setItem("CACurSpeciality", ''); | |
231 | + localStorage.setItem("CAListViewScroll", ''); | |
232 | + localStorage.setItem("CASelectedRowId", ""); | |
206 | 233 | |
207 | 234 | $scope.filterstring = false; |
235 | + | |
236 | + if ($('.selected').hasClass("selected")) { $('.selected').removeClass("selected"); } | |
237 | + | |
238 | + $('#ListViewDiv').scrollTop(0); | |
239 | + | |
240 | + $scope.HideListViewDiv(); | |
241 | + | |
242 | + | |
208 | 243 | while ($scope.searchCAListViewData.length) { |
209 | 244 | $scope.searchCAListViewData.pop(); |
210 | 245 | } |
211 | 246 | |
247 | + if (localStorage.getItem("currentCATabView") == 2) { | |
248 | + localStorage.setItem("CASelectedRowId", ""); | |
249 | + $scope.hiderow = false; | |
250 | + } | |
251 | + | |
212 | 252 | $scope.loadAllCA(); |
213 | 253 | |
214 | 254 | } |
... | ... | @@ -545,6 +585,58 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
545 | 585 | $scope.videoNumber = vidNumber; |
546 | 586 | }; |
547 | 587 | |
588 | + $scope.ReloadListViewImageDiv = function (id) { | |
589 | + //console.log(id); | |
590 | + $scope.idSelected = id; | |
591 | + $scope.hiderow = true; | |
592 | + | |
593 | + var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json') | |
594 | + promise.then( | |
595 | + function (result) { | |
596 | + $scope.AnimationData = result; | |
597 | + //$scope.selectedCAListViewData = $scope.AnimationData.root.CAData; | |
598 | + | |
599 | + var SelectedCAthumbImage = []; | |
600 | + SelectedCAthumbImage = new jinqJs() | |
601 | + .from($scope.AnimationData.root.CAData) | |
602 | + .where('_id = ' + id) | |
603 | + .select('_ThumbnailImage', '_Summary', '_id', '_Title'); | |
604 | + | |
605 | + //console.log($scope.selectedCAListViewData); | |
606 | + | |
607 | + $scope.SelectedCAthumbImage = "~/../content/images/ca/thumbnails/" + SelectedCAthumbImage[0]._ThumbnailImage; | |
608 | + | |
609 | + $scope.SelectedCASummary = SelectedCAthumbImage[0]._Summary; | |
610 | + $scope.SelectedCAId = SelectedCAthumbImage[0]._id; | |
611 | + $scope.SelectedCATitle = SelectedCAthumbImage[0]._Title; | |
612 | + | |
613 | + //Set the scroll position of the tablebody to show selected row. | |
614 | + | |
615 | + var curCAListViewScroll = localStorage.getItem("CAListViewScroll"); | |
616 | + if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') { | |
617 | + | |
618 | + $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll")); | |
619 | + } | |
620 | + //else { | |
621 | + // $('#ListViewDiv').scrollTop(0); | |
622 | + //} | |
623 | + | |
624 | + }, | |
625 | + function (error) { | |
626 | + // handle errors here | |
627 | + console.log(' $scope.AnimationData = ' + error.statusText); | |
628 | + } | |
629 | + ); | |
630 | + }; | |
631 | + | |
632 | + $scope.hideListViewDiv = function () { | |
633 | + if (localStorage.getItem("currentCATabView") == 2) { | |
634 | + localStorage.setItem("CASelectedRowId", ""); | |
635 | + if ($('.selected').hasClass("selected")) { $('.selected').removeClass("selected"); } | |
636 | + $scope.hiderow = false; | |
637 | + } | |
638 | + } | |
639 | + | |
548 | 640 | |
549 | 641 | }] |
550 | 642 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
... | ... | @@ -16,6 +16,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
16 | 16 | $scope.SelectedCITitle = []; |
17 | 17 | $scope.selectedCIListViewData = []; |
18 | 18 | $scope.filterstring = false; |
19 | + $scope.idSelected; | |
20 | + $scope.srollListView; | |
19 | 21 | $scope.query = { |
20 | 22 | selectedbodyregion: '', |
21 | 23 | selectedbodysystem: '', |
... | ... | @@ -49,13 +51,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
49 | 51 | var curtab = localStorage.getItem("currentCITabView"); |
50 | 52 | if (curtab == 2) { |
51 | 53 | $scope.setActiveTab(2); |
54 | + var curSelectedRowId = localStorage.getItem("CISelectedRowId"); | |
55 | + if (typeof (curSelectedRowId) !== "undefined" && curSelectedRowId !== null && curSelectedRowId !== '') { | |
56 | + $scope.reRunSearchOnLoad(); | |
57 | + $scope.idSelected = curSelectedRowId; | |
58 | + $scope.ReloadListViewImageDiv($scope.idSelected); | |
59 | + } | |
60 | + else { | |
61 | + $scope.reRunSearchOnLoad() | |
62 | + $scope.idSelected = ''; | |
63 | + } | |
52 | 64 | } |
53 | 65 | else { |
54 | 66 | $scope.setActiveTab(1); |
55 | 67 | } |
56 | 68 | |
69 | + $scope.reRunSearchOnLoad(); | |
70 | + | |
71 | + }); | |
72 | + | |
73 | + $scope.reRunSearchOnLoad = function () { | |
74 | + | |
57 | 75 | var curBodyRegion = localStorage.getItem("CICurBodyRegion"); |
58 | - if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !=='') { | |
76 | + if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !== '') { | |
59 | 77 | $scope.query.selectedbodyregion = curBodyRegion; |
60 | 78 | } |
61 | 79 | else { |
... | ... | @@ -63,7 +81,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
63 | 81 | } |
64 | 82 | |
65 | 83 | var curBodySystem = localStorage.getItem("CICurBodySystem"); |
66 | - if (typeof (curBodySystem) !== "undefined" && curBodySystem !== null && curBodySystem !=='') { | |
84 | + if (typeof (curBodySystem) !== "undefined" && curBodySystem !== null && curBodySystem !== '') { | |
67 | 85 | $scope.query.selectedbodysystem = curBodySystem; |
68 | 86 | } |
69 | 87 | else { |
... | ... | @@ -71,7 +89,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
71 | 89 | } |
72 | 90 | |
73 | 91 | var curOrientation = localStorage.getItem("CICurOrientation"); |
74 | - if (typeof (curOrientation) !== "undefined" && curOrientation !== null && curOrientation !=='') { | |
92 | + if (typeof (curOrientation) !== "undefined" && curOrientation !== null && curOrientation !== '') { | |
75 | 93 | $scope.query.selectedorientation = curOrientation; |
76 | 94 | } |
77 | 95 | else { |
... | ... | @@ -79,7 +97,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
79 | 97 | } |
80 | 98 | |
81 | 99 | var curImageType = localStorage.getItem("CICurImageType"); |
82 | - if (typeof (curImageType) !== "undefined" && curImageType !== null && curImageType !=='') { | |
100 | + if (typeof (curImageType) !== "undefined" && curImageType !== null && curImageType !== '') { | |
83 | 101 | $scope.query.selectedimagetype = curImageType; |
84 | 102 | } |
85 | 103 | else { |
... | ... | @@ -87,7 +105,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
87 | 105 | } |
88 | 106 | |
89 | 107 | var curSpeciality = localStorage.getItem("CICurSpeciality"); |
90 | - if (typeof (curSpeciality) !== "undefined" && curSpeciality !== null && curSpeciality !=='') { | |
108 | + if (typeof (curSpeciality) !== "undefined" && curSpeciality !== null && curSpeciality !== '') { | |
91 | 109 | $scope.query.selectedspecialty = curSpeciality; |
92 | 110 | } |
93 | 111 | else { |
... | ... | @@ -102,7 +120,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
102 | 120 | $scope.ApplySearch($scope.query); |
103 | 121 | } |
104 | 122 | |
105 | - }); | |
123 | + } | |
106 | 124 | |
107 | 125 | $scope.LoadCIJsonData = function () { |
108 | 126 | |
... | ... | @@ -110,8 +128,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
110 | 128 | promise.then( |
111 | 129 | function (result) { |
112 | 130 | $scope.IllustrationData = result; |
113 | - //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData; | |
114 | - | |
115 | 131 | $scope.selectedCIListViewData = new jinqJs() |
116 | 132 | .from($scope.IllustrationData.root.CIData) |
117 | 133 | .orderBy([{ field: '_Title', sort: 'asc' }]) |
... | ... | @@ -133,7 +149,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
133 | 149 | promise.then( |
134 | 150 | function (result) { |
135 | 151 | $scope.IllustrationData = result; |
136 | - //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData; | |
137 | 152 | |
138 | 153 | $scope.selectedCIListViewData = new jinqJs() |
139 | 154 | .from($scope.IllustrationData.root.CIData) |
... | ... | @@ -175,7 +190,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
175 | 190 | } |
176 | 191 | |
177 | 192 | $scope.showItem = function (id) { |
178 | - // console.log(id); | |
193 | + $scope.idSelected = id; | |
194 | + localStorage.setItem("CISelectedRowId", id); | |
195 | + | |
196 | + //Set the vertical scroll value of the table. | |
197 | + var y = $('#ListViewDiv').scrollTop(); | |
198 | + localStorage.setItem("CIListViewScroll", y); | |
199 | + | |
179 | 200 | $scope.hiderow = true; |
180 | 201 | if ($scope.filterstring == false) { |
181 | 202 | |
... | ... | @@ -219,11 +240,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
219 | 240 | |
220 | 241 | |
221 | 242 | //set localstorage values |
222 | - localStorage.setItem("CICurBodyRegion", query.selectedbodyregion); | |
223 | - localStorage.setItem("CICurBodySystem", query.selectedbodysystem); | |
224 | - localStorage.setItem("CICurOrientation", query.selectedorientation); | |
225 | - localStorage.setItem("CICurImageType", query.selectedimagetype); | |
226 | - localStorage.setItem("CICurSpeciality", query.selectedspecialty); | |
243 | + localStorage.setItem("CICurBodyRegion", ''); | |
244 | + localStorage.setItem("CICurBodySystem", ''); | |
245 | + localStorage.setItem("CICurOrientation", ''); | |
246 | + localStorage.setItem("CICurImageType", ''); | |
247 | + localStorage.setItem("CICurSpeciality", ''); | |
248 | + localStorage.setItem("CISelectedRowId", ""); | |
249 | + localStorage.setItem("CIListViewScroll", ''); | |
250 | + | |
251 | + if ($('.selected').hasClass("selected")) { $('.selected').removeClass("selected"); } | |
252 | + | |
253 | + $('#ListViewDiv').scrollTop(0); | |
254 | + | |
255 | + $scope.HideListViewDiv(); | |
227 | 256 | |
228 | 257 | $scope.filterstring = false; |
229 | 258 | while ($scope.searchCIListViewData.length) { |
... | ... | @@ -290,7 +319,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
290 | 319 | promise.then( |
291 | 320 | function (result) { |
292 | 321 | $scope.IllustrationData = result; |
293 | - //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData; | |
294 | 322 | |
295 | 323 | $scope.selectedCIListViewData = new jinqJs() |
296 | 324 | .from($scope.IllustrationData.root.CIData) |
... | ... | @@ -594,6 +622,54 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
594 | 622 | // $rootScope.FreeStylePaint(); |
595 | 623 | }); |
596 | 624 | |
625 | + $scope.ReloadListViewImageDiv = function (id) { | |
626 | + //console.log(id); | |
627 | + $scope.idSelected = id; | |
628 | + $scope.hiderow = true; | |
629 | + | |
630 | + var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json') | |
631 | + promise.then( | |
632 | + function (result) { | |
633 | + $scope.IllustrationData = result; | |
634 | + | |
635 | + var SelectedCIthumbImage = []; | |
636 | + SelectedCIthumbImage = new jinqJs() | |
637 | + .from($scope.IllustrationData.root.CIData) | |
638 | + .where('_id = ' + id) | |
639 | + .select('_ThumbnailImage', '_Summary', '_id', '_Title'); | |
640 | + | |
641 | + $scope.SelectedCIthumbImage = "~/../content/images/ci/thumbnails/" + SelectedCIthumbImage[0]._ThumbnailImage; | |
642 | + $scope.SelectedCISummary = SelectedCIthumbImage[0]._Summary; | |
643 | + $scope.SelectedCIId = SelectedCIthumbImage[0]._id; | |
644 | + $scope.SelectedCITitle = SelectedCIthumbImage[0]._Title; | |
645 | + | |
646 | + //Set the scroll position of the tablebody to show selected row. | |
647 | + | |
648 | + var curCIListViewScroll = localStorage.getItem("CIListViewScroll"); | |
649 | + if (typeof (curCIListViewScroll) !== "undefined" && curCIListViewScroll !== null && curCIListViewScroll !== '') { | |
650 | + | |
651 | + $('#ListViewDiv').scrollTop(localStorage.getItem("CIListViewScroll")); | |
652 | + } | |
653 | + //else { | |
654 | + // $('#ListViewDiv').scrollTop(0); | |
655 | + //} | |
656 | + | |
657 | + }, | |
658 | + function (error) { | |
659 | + // handle errors here | |
660 | + console.log(' $scope.AnimationData = ' + error.statusText); | |
661 | + } | |
662 | + ); | |
663 | + }; | |
664 | + | |
665 | + $scope.hideListViewDiv = function () { | |
666 | + if (localStorage.getItem("currentCITabView") == 2) { | |
667 | + localStorage.setItem("CISelectedRowId", ""); | |
668 | + if ($('.selected').hasClass("selected")) { $('.selected').removeClass("selected"); } | |
669 | + $scope.hiderow = false; | |
670 | + } | |
671 | + } | |
672 | + | |
597 | 673 | }] |
598 | 674 | |
599 | 675 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
1 | -<div class="bodyWrap row "> | |
1 | + | |
2 | +<div class="bodyWrap row "> | |
2 | 3 | <div ng-include="'app/widget/MainMenu.html'" /> |
3 | 4 | <div class="main"> |
4 | 5 | |
... | ... | @@ -11,7 +12,7 @@ |
11 | 12 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
12 | 13 | <div class="form-group"> |
13 | 14 | <h6 class="text-center text-primary txt-white f11">Body Region</h6> |
14 | - <select class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item"> | |
15 | + <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item"> | |
15 | 16 | <option value="">All</option> |
16 | 17 | </select> |
17 | 18 | </div> |
... | ... | @@ -19,7 +20,7 @@ |
19 | 20 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
20 | 21 | <div class="form-group"> |
21 | 22 | <h6 class="text-center text-primary txt-white f11">Body System</h6> |
22 | - <select class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item"> | |
23 | + <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item"> | |
23 | 24 | <option value="">All</option> |
24 | 25 | </select> |
25 | 26 | </div> |
... | ... | @@ -27,7 +28,7 @@ |
27 | 28 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
28 | 29 | <div class="form-group"> |
29 | 30 | <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6> |
30 | - <select class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> | |
31 | + <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> | |
31 | 32 | <option value="">All</option> |
32 | 33 | </select> |
33 | 34 | </div> |
... | ... | @@ -67,8 +68,8 @@ |
67 | 68 | <th style="min-width: 280px;">Specialty</th> |
68 | 69 | </tr> |
69 | 70 | </thead> |
70 | - <tbody ng-if="!filterstring" class="clstbodyca"> | |
71 | - <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData"> | |
71 | + <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbodyca"> | |
72 | + <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData"> | |
72 | 73 | <td style="max-width: 250px;"> |
73 | 74 | {{item._Title}} |
74 | 75 | </td> |
... | ... | @@ -83,8 +84,8 @@ |
83 | 84 | </td> |
84 | 85 | </tr> |
85 | 86 | </tbody> |
86 | - <tbody ng-if="filterstring" class="clstbodyca"> | |
87 | - <tr ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData"> | |
87 | + <tbody id="ListViewDiv" ng-if="filterstring" class="clstbodyca"> | |
88 | + <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData"> | |
88 | 89 | <td style="max-width: 250px;"> |
89 | 90 | {{item._Title}} |
90 | 91 | </td> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
1 | -<div class="bodyWrap row no-scroll"> | |
1 | + | |
2 | +<div class="bodyWrap row no-scroll"> | |
2 | 3 | <div ng-include=" 'app/widget/MainMenu.html' " /> |
3 | 4 | <div class="main"> |
4 | 5 | <div class="col-sm-12 stickey-area clsstickydiv"> |
... | ... | @@ -8,7 +9,7 @@ |
8 | 9 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
9 | 10 | <div class="form-group"> |
10 | 11 | <h6 class="text-center text-primary txt-white f11">Body Region</h6> |
11 | - <select class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CIAllBodyRegion track by item"> | |
12 | + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CIAllBodyRegion track by item"> | |
12 | 13 | <option value="">All</option> |
13 | 14 | </select> |
14 | 15 | </div> |
... | ... | @@ -16,7 +17,7 @@ |
16 | 17 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
17 | 18 | <div class="form-group"> |
18 | 19 | <h6 class="text-center text-primary txt-white f11">Body System</h6> |
19 | - <select class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CIAllBodySystem track by item"> | |
20 | + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CIAllBodySystem track by item"> | |
20 | 21 | <option value="">All</option> |
21 | 22 | </select> |
22 | 23 | </div> |
... | ... | @@ -25,7 +26,7 @@ |
25 | 26 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
26 | 27 | <div class="form-group"> |
27 | 28 | <h6 class="text-center text-primary txt-white f11">View Orientation</h6> |
28 | - <select class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in CIAllOrientation track by item"> | |
29 | + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in CIAllOrientation track by item"> | |
29 | 30 | <option value="">All</option> |
30 | 31 | </select> |
31 | 32 | </div> |
... | ... | @@ -33,7 +34,7 @@ |
33 | 34 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
34 | 35 | <div class="form-group"> |
35 | 36 | <h6 class="text-center text-primary txt-white f11">Image Type</h6> |
36 | - <select class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in CIAllImageType track by item"> | |
37 | + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in CIAllImageType track by item"> | |
37 | 38 | <option value="">All</option> |
38 | 39 | </select> |
39 | 40 | </div> |
... | ... | @@ -41,7 +42,7 @@ |
41 | 42 | <div class="col-md-2 col-sm-4 pad-lftrgt3"> |
42 | 43 | <div class="form-group"> |
43 | 44 | <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6> |
44 | - <select class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> | |
45 | + <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> | |
45 | 46 | <option value="">All</option> |
46 | 47 | </select> |
47 | 48 | </div> |
... | ... | @@ -111,8 +112,8 @@ |
111 | 112 | <th width="25%">Specialty</th> |
112 | 113 | </tr> |
113 | 114 | </thead> |
114 | - <tbody ng-if="!filterstring" class="clstbody"> | |
115 | - <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCIListViewData"> | |
115 | + <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody"> | |
116 | + <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCIListViewData"> | |
116 | 117 | <td width="15%"> |
117 | 118 | {{item._Title}} |
118 | 119 | </td> |
... | ... | @@ -133,8 +134,8 @@ |
133 | 134 | </td> |
134 | 135 | </tr> |
135 | 136 | </tbody> |
136 | - <tbody ng-if="filterstring" class="clstbody"> | |
137 | - <tr ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in searchCIListViewData"> | |
137 | + <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> | |
138 | + <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCIListViewData"> | |
138 | 139 | <td width="15%"> |
139 | 140 | {{item._Title}} |
140 | 141 | </td> |
... | ... | @@ -160,7 +161,7 @@ |
160 | 161 | </tbody> |
161 | 162 | </table> |
162 | 163 | </div> |
163 | - <div class="col-sm-12" ng-show=" hiderow" style="padding-left:25px;padding-top:10px;"> | |
164 | + <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;"> | |
164 | 165 | <div class="row well"> |
165 | 166 | <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-2 no-padding"> |
166 | 167 | <div class="thumbnail no-margin"> |
... | ... | @@ -181,3 +182,4 @@ |
181 | 182 | </div> |
182 | 183 | </div> |
183 | 184 | |
185 | + | ... | ... |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... | ... | @@ -905,4 +905,8 @@ background-image: url("../../../../../content/images/blank-shapes.png"); |
905 | 905 | height:100%; |
906 | 906 | background:#fff; |
907 | 907 | border-radius: 50%; |
908 | - } | |
909 | 908 | \ No newline at end of file |
909 | + } | |
910 | +/*Bug #8679*/ | |
911 | + .selected { | |
912 | + background-color: lightgrey; | |
913 | + } | |
910 | 914 | \ No newline at end of file | ... | ... |