ADAM / AIAHTML5

Commit f46129b2332bdbd4692db8d2c8792ef184274cc3

Authored by Mitali Srivastava
1 parent 5be15595

Bug #7520: Clinical Animation: Message is missing! when no items are found after search. 

Bug #7707:CI and CA Search > The search button should work in case no criteria is selected.

also comment ui-grid link on index page as ui-grid library is not used to remove console error.
Inline Side-by-side
Showing 7 changed files with 20 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @f46129b
... ... @@ -41,7 +41,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
41 41 $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
42 42  
43 43  
44   - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  44 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
45 45 + '<div class="thumbnail" >'
46 46 + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
47 47 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
... ... @@ -118,10 +118,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
118 118 angular.forEach($scope.selectedCAListViewData, function (value, key) {
119 119 $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
120 120  
121   - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = ' + value._Title + ' data-ng-click="openView($event)">'
122   - + '<div class="thumbnail" >'
123   - + '<img id="' + value._Title + 'class="img-responsive" style="width:100%;height:100%;" "ng-src="' + $scope.imagePath + '" alt="" title="" >'
124   - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  121 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  122 + + '<div class="thumbnail" >'
  123 + + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
  124 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
125 125  
126 126  
127 127 $compile($el)($scope);
... ... @@ -204,10 +204,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
204 204  
205 205 $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
206 206  
207   - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = ' + value._Title + ' data-ng-click="openView($event)">'
208   - + '<div class="thumbnail" >'
209   - + '<img id="' + value._Title + 'class="img-responsive" style="width:100%;height:100%;" "ng-src="' + $scope.imagePath + '" alt="" title="" >'
210   - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  207 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  208 + + '<div class="thumbnail" >'
  209 + + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
  210 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
211 211  
212 212  
213 213 $compile($el)($scope);
... ... @@ -240,7 +240,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
240 240 //Show Error Message in case of gridview if no data is found
241 241 if ($scope.searchCAListViewData.length == 0) {
242 242  
243   - var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:red;">No animation found for the selected search criteria!</strong></div>').appendTo('#grid-view');
  243 + var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:white;">No animation found for the selected search criteria!</strong></div>').appendTo('#grid-view');
244 244 $compile($el)($scope);
245 245 }
246 246 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @f46129b
... ... @@ -50,7 +50,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
50 50 angular.forEach($scope.selectedCIListViewData, function (value, key) {
51 51 $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
52 52  
53   - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-md-2" title = ' + value._Title + ' data-ng-click="openView($event)">'
  53 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
54 54 + '<div class="thumbnail" >'
55 55 + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
56 56 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
... ... @@ -134,7 +134,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
134 134 angular.forEach($scope.selectedCIListViewData, function (value, key) {
135 135 $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
136 136  
137   - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-md-2" title = ' + value._Title + ' data-ng-click="openView($event)">'
  137 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
138 138 + '<div class="thumbnail" >'
139 139 + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
140 140 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
... ... @@ -252,7 +252,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
252 252  
253 253 $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
254 254  
255   - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-md-2" title = ' + value._Title + ' data-ng-click="openView($event)">'
  255 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
256 256 + '<div class="thumbnail" >'
257 257 + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
258 258 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
... ... @@ -290,7 +290,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
290 290 //Show Error Message in case of gridview if no data is found
291 291 if ($scope.searchCIListViewData.length == 0) {
292 292  
293   - var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:red">No illustration found for the selected search criteria!</strong></div>').appendTo('#grid-view');
  293 + var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:white">No illustration found for the selected search criteria!</strong></div>').appendTo('#grid-view');
294 294 $compile($el)($scope);
295 295 }
296 296 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @f46129b
... ... @@ -88,7 +88,7 @@
88 88 </td>
89 89 </tr>
90 90 <tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
91   - <td colspan="3"><strong style="color:red;">No animation found for the selected search criteria!</strong></td>
  91 + <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td>
92 92 </tr>
93 93 </tbody>
94 94 </table>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @f46129b
... ... @@ -143,7 +143,7 @@
143 143 </td>
144 144 </tr>
145 145 <tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''">
146   - <td colspan="6"><strong style="color:red;">No illustration found for the selected search criteria!</strong></td>
  146 + <td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td>
147 147 </tr>
148 148 </tbody>
149 149 </table>
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist.json
  View file @f46129b
... ... @@ -248,6 +248,7 @@
248 248 "_Video": "ca_vid_3392.flv",
249 249 "_ThumbnailImage": "ca_tni_3392.jpg",
250 250 "_BodySystem": "Reproductive",
  251 + "_BodyRegion": "None",
251 252 "_MedicalSpecialty": "Obstetrics and Gynecology (OB/GYN)",
252 253 "_Summary": "This animations shows the process of Intracytoplasmic sperm injection (ICSI), a procedure used to fertilize an egg cell outside of the body.",
253 254 "_LowerSummary": "Intracytoplasmic sperm injection, or ICSI, is a form of in vitro fertilization in which fertilization occurs outside of the body. First, egg cells are harvested and transferred to a special media in a laboratory dish. Within a few hours, a single sperm is injected through a fine needle into the center of an egg cell to aid in the process of fertilization. If successful, the cell will divide and form the beginning stages of an embryo. If necessary, the DNA of a single cell from an embryo may be checked to ensure that various genetic disorders are not present. Typically, several egg cells are harvested and fertilized at the same time then inserted back into the uterus to increase the chances that one will implant and develop into a successful pregnancy."
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json
  View file @f46129b
... ... @@ -248,6 +248,7 @@
248 248 "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200061/200061.mp4",
249 249 "_ThumbnailImage": "ca_tni_3392.jpg",
250 250 "_BodySystem": "Reproductive",
  251 + "_BodyRegion": "None",
251 252 "_MedicalSpecialty": "Obstetrics and Gynecology (OB/GYN)",
252 253 "_Summary": "This animations shows the process of Intracytoplasmic sperm injection (ICSI), a procedure used to fertilize an egg cell outside of the body.",
253 254 "_LowerSummary": "Intracytoplasmic sperm injection, or ICSI, is a form of in vitro fertilization in which fertilization occurs outside of the body. <BodyRegion/><BodyRegion/>First, egg cells are harvested and transferred to a special media in a laboratory dish. Within a few hours, a single sperm is injected through a fine needle into the center of an egg cell to aid in the process of fertilization. If successful, the cell will divide and form the beginning stages of an embryo. If necessary, the DNA of a single cell from an embryo may be checked to ensure that various genetic disorders are not present. <BodyRegion/><BodyRegion/>Typically, several egg cells are harvested and fertilized at the same time then inserted back into the uterus to increase the chances that one will implant and develop into a successful pregnancy."
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @f46129b
... ... @@ -2,6 +2,7 @@
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4 4 <!--<base href="/AIAHTML5/" />-->
  5 + <!--<base href="/AIA/" />-->
5 6 <base href="/" />
6 7 <meta charset="utf-8">
7 8 <meta http-equiv="X-UA-Compatible" content="IE=edge">
... ... @@ -20,7 +21,7 @@
20 21 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
21 22 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic">
22 23  
23   - <link rel="styleSheet" href="themes/default/css/uigrid/ui-grid.min.css" />
  24 + <!--<link rel="styleSheet" href="themes/default/css/uigrid/ui-grid.min.css" />-->
24 25  
25 26 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
26 27 <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
... ...