ADAM / AIAHTML5

Commit dd601b3a263475ffa232139d4c242320051eb1eb

Authored by Amrita Vishnoi
2 parents 62c7a5e6 055fa4a6

Merge branch 'IEClinicalIssue' into Develop

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @dd601b3
... ... @@ -397,12 +397,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
397 397  
398 398  
399 399 });
400   -
  400 + $('table > #ListViewDiv > #searchAnimation').remove();
401 401 //Show Error Message in case of gridview if no data is found
402 402 if ($scope.searchCAListViewData.length == 0) {
403   -
404 403 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');
405 404 $compile($el)($scope);
  405 + $('table > #ListViewDiv > #searchAnimation').remove();
  406 + $('#ListViewDiv').append('<tr id="searchAnimation"><td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td></tr>');
406 407 }
407 408  
408 409 },
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @dd601b3
... ... @@ -99,9 +99,9 @@
99 99 {{item._MedicalSpecialty}}
100 100 </td>
101 101 </tr>
102   - <tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
  102 + <!--<tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
103 103 <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td>
104   - </tr>
  104 + </tr>-->
105 105 </tbody>
106 106 </table>
107 107 </div>
... ...