ADAM / AIAHTML5

Commit 8e1e83a41f518df9c1704362123ae2811c1c6866

Authored by Birendra Kumar
2 parents d174a410 78a7cb13

Merge branch 'AIA_Develop' of https://gitlab.ebix.com/ADAM/AIAHTML5 into AIA_Develop-CI

Inline Side-by-side
Showing 9 changed files with 258 additions and 142 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/PixelLocationsController.cs
  View file @8e1e83a
... ... @@ -20,7 +20,16 @@ namespace AIAHTML5.API.Controllers
20 20 public HttpResponseMessage Get(string layerNumber, string bodyViewIndex, string systemNumber, string zoomLevel)
21 21 {
22 22 dynamic bodyRegions = PixelLocator.GetBodyRegionsPixelData(layerNumber, bodyViewIndex, systemNumber, zoomLevel);
23   - return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(bodyRegions) };
  23 + if (bodyRegions != "InternalServerError")
  24 + {
  25 + return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(bodyRegions) };
  26 + }
  27 + else
  28 + {
  29 + return new HttpResponseMessage { StatusCode = HttpStatusCode.InternalServerError, Content = new StringContent("Connection Failed:Internal Server Error") };
  30 + }
  31 +
  32 +
24 33 }
25 34  
26 35 // POST: api/PixelLocations
... ...
400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs
  View file @8e1e83a
... ... @@ -38,7 +38,8 @@ namespace AIAHTML5.API.Models
38 38 }
39 39 catch (Exception e)
40 40 {
41   - string error = e.Message + "..STACKTRACE: " + e.StackTrace;
  41 + //string error = e.Message + "..STACKTRACE: " + e.StackTrace;
  42 + string error = "InternalServerError";
42 43 return error;
43 44 }
44 45 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @8e1e83a
... ... @@ -125,6 +125,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
125 125 $scope.showItem(selectedImageId);
126 126 $scope.filterstring = true;
127 127 }
  128 + //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
128 129 }
129 130 }
130 131 else if (SearchByAlphabet != "" && SearchByAlphabet != null && SearchByAlphabet != undefined) {
... ... @@ -139,6 +140,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
139 140 $scope.showItem(selectedImageId);
140 141 $scope.filterstring = true;
141 142 }
  143 + //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
142 144 }
143 145 }
144 146 else {
... ... @@ -155,9 +157,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
155 157 $scope.filterstring = false;
156 158 $scope.showItem(selectedImageId);
157 159 }
  160 + //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
158 161 }
159 162 }
160 163 $scope.query.SelectedDiv = tabToSet;
  164 + //Method call for set position for selected title Bug-57978
  165 + //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
  166 + $('#grid-view').css("display", "none");
  167 + $('#list-view').css("display", "block");
161 168 }
162 169 else {
163 170 $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
... ... @@ -175,12 +182,69 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
175 182 $scope.loadAllAI(ImageCount);
176 183 }
177 184  
  185 + $('#grid-view').css("display", "block");
  186 + $('#list-view').css("display", "none");
178 187 }
  188 +
  189 + setTimeout(function () {
  190 + $scope.setImgPosition();
  191 + }, 100);
  192 +
179 193 };
180 194  
181 195  
182   - $scope.loadAIModuleById = function (moduleId) {
  196 + //$scope.loadAIModuleById = function (moduleId) {
183 197  
  198 + // var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
  199 +
  200 + // if ($rootScope.refreshcheck == null) {
  201 + // $location.path('/');
  202 + // }
  203 +
  204 + // // code that will be executed ...
  205 + // // every time this view is loaded
  206 +
  207 + // //get current path
  208 + // var currentURL = $location.path();
  209 + // var selectedModuleName = '';
  210 + // //set module title
  211 + // angular.forEach($rootScope.userModules, function (value, key) {
  212 + // if (value.slug === currentURL.replace('/', '')) {
  213 + // selectedModuleName = value.name;
  214 + // }
  215 + // $rootScope.currentActiveModuleTitle = selectedModuleName;
  216 + // })
  217 +
  218 + // $scope.LoadAIJsonData(ImageCount);
  219 + // $scope.scroll();
  220 + // //push the details of open module in array $rootScope.openModules
  221 + // $rootScope.openModules.push({ "ModuleId": 13 });
  222 +
  223 + // //set the local storage
  224 + // var curtab = $rootScope.getLocalStorageValue("currentAITabView");
  225 + // var inderectCall = true;
  226 + // if (curtab == 2) {
  227 + // $scope.setActiveTab(2, inderectCall);
  228 + // var curSelectedRowId = $rootScope.getLocalStorageValue("AISelectedRowId");
  229 + // if (typeof (curSelectedRowId) !== "undefined" && curSelectedRowId !== null && curSelectedRowId !== '') {
  230 + // $scope.reRunSearchOnLoad();
  231 + // $scope.idSelected = curSelectedRowId;
  232 + // $scope.ReloadListViewImageDiv($scope.idSelected, ImageCount);
  233 + // }
  234 + // else {
  235 + // $scope.reRunSearchOnLoad()
  236 + // $scope.idSelected = '';
  237 + // }
  238 + // }
  239 + // else {
  240 + // $scope.setActiveTab(1, inderectCall);
  241 + // $scope.reRunSearchOnLoad();
  242 +
  243 + // }
  244 + //}
  245 +
  246 + $scope.loadAIModuleById = function (moduleId) {
  247 +
184 248 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
185 249  
186 250 if ($rootScope.refreshcheck == null) {
... ... @@ -207,7 +271,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
207 271 $rootScope.openModules.push({ "ModuleId": 13 });
208 272  
209 273 //set the local storage
210   - var curtab = $rootScope.getLocalStorageValue("currentAITabView");
  274 + var curtab = $rootScope.getLocalStorageValue("currentAITabView");
211 275 var inderectCall = true;
212 276 if (curtab == 2) {
213 277 $scope.setActiveTab(2, inderectCall);
... ... @@ -220,13 +284,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
220 284 else {
221 285 $scope.reRunSearchOnLoad()
222 286 $scope.idSelected = '';
223   - }
  287 + }
224 288 }
225 289 else {
226 290 $scope.setActiveTab(1, inderectCall);
227 291 $scope.reRunSearchOnLoad();
228   -
229 292 }
  293 +
230 294 }
231 295  
232 296 $scope.reRunSearchOnLoad = function () {
... ... @@ -307,6 +371,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
307 371 if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images" && $scope.query.SelectedDiv == 1) {
308 372 $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
309 373 }
  374 +
310 375 }, 100);
311 376  
312 377 $rootScope.isLoading = false;
... ... @@ -507,21 +572,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
507 572 }
508 573  
509 574 setTimeout(function () {
  575 + //$scope.setImgPosition();
510 576 $scope.EnableUI();
511 577  
512 578 }, 10);
513 579  
514 580 $rootScope.isLoading = false;
515   - $('#aiSpinner').css('visibility', 'hidden');
516   -
517   - //Added code by sandeep for fixed bug-40273
518   - var _currentImgId = $rootScope.getLocalStorageValue("currentAIImageId");
519   - $rootScope.getLocalStorageValue("currentAIImageId")
520   - if (_currentImgId != "null" && _currentImgId != null) {
521   - $('#' + _currentImgId).find('.thumbnail').addClass('HightLightThumbnail');
522   - $('html, body').animate({ scrollTop: $('#' + _currentImgId).position().top }, 100);
523   - $scope.hiderow = true;
524   - }
  581 + $('#aiSpinner').css('visibility', 'hidden');
  582 +
525 583 },
526 584  
527 585 function (error) {
... ... @@ -530,6 +588,36 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
530 588 }
531 589 );
532 590 }
  591 +
  592 + //Added method by sandeep for fixed Bug-57978 to selected Image
  593 + $scope.setImgPosition = function () {
  594 + var _currentImgId = $rootScope.getLocalStorageValue("currentAIImageId");
  595 + var aISelectedRowId = $rootScope.getLocalStorageValue("AISelectedRowId");
  596 + if (_currentImgId != "null" && _currentImgId != null) {
  597 + $('#' + _currentImgId).find('.thumbnail').addClass('HightLightThumbnail');
  598 + $scope.hiderow = true;
  599 + }
  600 + if ($('#grid-view').css("display") == "block") {
  601 + var aiGridViewScroll = $rootScope.getLocalStorageValue('AIGridViewScroll');
  602 + if (aiGridViewScroll !== null && $location.url() == "/ADAM-images" && aiGridViewScroll != "0") {
  603 +
  604 + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') }, 'slow');
  605 + }
  606 + else if (_currentImgId != "null" && _currentImgId != null) {
  607 + $('html, body').animate({ scrollTop: $('#' + _currentImgId).position().top }, 100);
  608 + }
  609 + }
  610 + if ($('#list-view').css("display") == "block") {
  611 + var AIListViewScroll = $rootScope.getLocalStorageValue("AIListViewScrollPosition");
  612 + if (AIListViewScroll !== null && $location.url() == "/ADAM-images" && AIListViewScroll != "0") {
  613 + $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AIListViewScrollPosition') }, 'slow');
  614 + }
  615 + else if (aISelectedRowId != "null" && aISelectedRowId != null) {
  616 + $('html, body').animate({ scrollTop: $('#' + aISelectedRowId).position().top }, 100);
  617 + }
  618 + }
  619 + }
  620 +
533 621 $scope.DisableUI = function () {
534 622  
535 623 $('#imgParent').css('z-index', '1');
... ... @@ -624,18 +712,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
624 712 }
625 713  
626 714 setTimeout(function () {
  715 + //$scope.setImgPosition();
627 716 $scope.EnableUI();
628 717 }, 10);
629 718  
630 719 $rootScope.isLoading = false;
631   - $('#aiSpinner').css('visibility', 'hidden');
632   - //Added code by sandeep for fixed bug-40273
633   - var _currentImgId = $rootScope.getLocalStorageValue("currentAIImageId");
634   - if (_currentImgId != "null" && _currentImgId != null) {
635   - $('#' + _currentImgId).find('.thumbnail').addClass('HightLightThumbnail');
636   - $('html, body').animate({ scrollTop: $('#' + _currentImgId).position().top }, 100);
637   - hiderow = true;
638   - }
  720 + $('#aiSpinner').css('visibility', 'hidden');
639 721 },
640 722 function (error) {
641 723 console.log(' $scope.IllustrationData = ' + error.statusText);
... ... @@ -671,12 +753,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
671 753 localStorage.setItem("currentImageTitleFromJson", $rootScope.ViewTitle);
672 754 localStorage.setItem("currentAIImageId", $event.currentTarget.id);
673 755  
  756 + var moduleItemDataToBeSavedID = $event.currentTarget.id;
  757 + $("#list-view table tbody tr").removeClass("active");
  758 + localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID);
  759 + $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active");
  760 + localStorage.setItem("AIListViewScrollPosition", $("#list-view table tbody").scrollTop());
  761 +
674 762 //Set the vertical scroll value of the Grid-View.
675 763 var y = $($window).scrollTop();
676 764 localStorage.setItem("AIGridViewScroll", y);
  765 + localStorage.setItem("AIGridViewHighlightThumbnail", $(event.target).parent().parent().parent().attr('id'));
677 766 var u = $location.url();
678 767 $location.url('/adam-images-detail');
679   - }
  768 + }
680 769  
681 770 $scope.OpenAdamImageView = function () {
682 771  
... ... @@ -721,11 +810,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
721 810 theme: 'success',
722 811 currentController: 'AIController',
723 812 parentSlug: 'ADAM-images',
724   - content: '<div class="col-sm-12"><div class="container-fluid"><div class="row"><div class=" col-sm-12 img-thumbnail canvasDivClass" id="canvasDiv" style="overflow: scroll;" align="center"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1340" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1; left: 0px;"></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1340" class="canvas-annotationStyle1" style="position: absolute;z-index:0; left: 0px;"></canvas>' +
725   -
726   - '<img src="' + $scope.clickedAIImage + '" alt="" title="" id="aimage" class="img-responsive ">' +
727   - '</div>' +
728   - '</div></div></div></div>',
  813 + content: '<div class="row" id="canvasDiv"><div style="align:left;"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1340" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1340" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas></div>' +
  814 + '<div class="col-sm-12 img-thumbnail" align="center">' +
  815 + '<img src="' + $scope.clickedAIImage + '" id="aimage" alt="" title="" class="img-responsive " style="height:400px;">' +
  816 +
  817 + '</div></div>',
729 818 //ajax: {
730 819 // url: 'app/views/ci/ci-view-detail.html'
731 820 //},
... ... @@ -739,30 +828,37 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
739 828  
740 829 });
741 830  
742   - $('#canvasDiv img').load(function () {
  831 + //$('#canvasDiv img').load(function () {
743 832  
744   - $rootScope.isLoading = false;
745   - $('#aiSpinner').css('visibility', 'hidden');
746   - var canvas = document.getElementById("canvas");
747   - var canvasPaint = document.getElementById("canvasPaint");
  833 + // $rootScope.isLoading = false;
  834 + // $('#aiSpinner').css('visibility', 'hidden');
  835 + // var canvas = document.getElementById("canvas");
  836 + // var canvasPaint = document.getElementById("canvasPaint");
748 837  
749   - var imageheight = $("#aimage").height();
750   - var canvasDivheight = $(window).outerHeight() - 150;
751   -
752   - if (canvasDivheight > imageheight)
753   - {
754   - canvas.height = canvasDivheight;
755   - canvasPaint.height = canvasDivheight;
756   - }
757   - else
758   - {
759   - canvas.height = imageheight;
760   - canvasPaint.height = imageheight;
761   - }
  838 + // var imageheight = $("#aimage").height();
  839 + // var canvasDivheight = $(window).outerHeight() - 150;
  840 +
  841 + // if (canvasDivheight > imageheight) {
  842 + // canvas.height = canvasDivheight;
  843 + // canvasPaint.height = canvasDivheight;
  844 + // }
  845 + // else {
  846 + // canvas.height = imageheight;
  847 + // canvasPaint.height = imageheight;
  848 + // }
  849 +
  850 + // canvas.width = $(window).outerWidth() - 81;
  851 + // canvasPaint.width = $(window).outerWidth() - 81;
762 852  
763   - canvas.width = $(window).outerWidth() - 81;
764   - canvasPaint.width = $(window).outerWidth() - 81;
765   -
  853 + //});
  854 + $('#canvasDiv img').load(function () {
  855 + $rootScope.isLoading = false;
  856 + $('#aiSpinner').css('visibility', 'hidden');
  857 + var canvas = document.getElementById("canvas");
  858 + var canvasPaint = document.getElementById("canvasPaint");
  859 +
  860 + canvas.height = $("#aiImagePanel .jsPanel-content").height();
  861 + canvasPaint.height = $("#aiImagePanel .jsPanel-content").height();
766 862 });
767 863 $rootScope.currentSlug = 'adam-images-detail';
768 864 $rootScope.openViews.push(
... ... @@ -780,7 +876,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
780 876  
781 877 $('#AIView').css("width", $(window).outerWidth() - 15);
782 878  
783   - var canvasDIvHeight = parseInt($('#aiImagePanel').outerHeight()) - 90;
  879 + //var canvasDIvHeight = parseInt($('#aiImagePanel').outerHeight()) - 30;
  880 + var canvasDIvHeight = $("#aiImagePanel .jsPanel-content").height();
784 881  
785 882 $('#canvasDiv').css('height', canvasDIvHeight);
786 883 }
... ... @@ -833,17 +930,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
833 930 $scope.SelectedAITitle = SelectedAIthumbImage[0]._Title;
834 931 } else { $scope.hiderow = false; }
835 932  
836   - //Set the scroll position of the tablebody to show selected row.
  933 + //Set the scroll position of the tablebody to show selected row
  934 +
  935 + $scope.setImgPosition();
837 936  
838   - var curAIListViewScroll = $rootScope.getLocalStorageValue("AIListViewScroll");
839   - if (typeof (curAIListViewScroll) !== "undefined" && curAIListViewScroll !== null && curAIListViewScroll !== '') {
840   - if (typeof InstallTrigger !== 'undefined') {
841   - $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue("AIListViewScroll") });
842   - }
843   - else {
844   - $('#ListViewDiv').scrollTop($rootScope.getLocalStorageValue("AIListViewScroll"));
845   - }
846   - }
847 937 $rootScope.isLoading = false;
848 938 $('#aiSpinner').css('visibility', 'hidden');
849 939  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @8e1e83a
... ... @@ -45,9 +45,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
45 45 $('#' + id).remove();
46 46  
47 47 // remove panel name from dropdown
48   - $('#viwerSelect option[value="'+id+'"]').remove();
  48 + $('#viwerSelect option[value="' + id + '"]').remove();
  49 +
  50 + }
  51 + //Added code by sandeep for fixed Bug-58066
  52 + var ddlViewerLen = $("#viwerSelect option").length;
  53 + if (ddlViewerLen == 1) {
  54 + $('#viwerSelect').hide();
49 55 }
50   -
51 56 });
52 57  
53 58  
... ... @@ -599,7 +604,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
599 604 $('#CBSourceImagePanel').remove();
600 605  
601 606 $("#viwerSelect").empty();
602   -
  607 + $("#viwerSelect").hide();
603 608 if ($('#parentcustomDiv').html() != "") {
604 609 $('#parentcustomDiv').empty();
605 610 }
... ... @@ -1329,6 +1334,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1329 1334 var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
1330 1335 if (modulePanel != undefined && modulePanel != null) {
1331 1336 $('#viwerSelect').append('<option selected value="' + 0 + '">' + "Select Viewer" + '</option>');
  1337 + //Added code by sandeep for fixed Bug-58066
  1338 + if (modulePanel.length > 0) {
  1339 + $('#viwerSelect').show();
  1340 + }
  1341 + }
  1342 + else {
  1343 + $('#viwerSelect').hide();
1332 1344 }
1333 1345 for (var i = 0 ; i < modulePanel.length; i++) {
1334 1346 var paneld = modulePanel[i].id;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8e1e83a
... ... @@ -877,7 +877,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
877 877 $scope.btnSearchListId = "btnSearchList";
878 878 $scope.tbSliderId = "tbSlider";
879 879 $scope.IdMale = "IdMale";
880   - $scope.IdFemale = "IdFemale";
  880 + $scope.IdFemale = "IdFemale";
881 881  
882 882 //if ($rootScope.isOpenResourceBtnClicked || $rootScope.isCallFromOtherModule) {
883 883  
... ... @@ -1213,6 +1213,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1213 1213 // side bar toggle
1214 1214 $("#sidebarId").attr("id", "sidebarId_" + $rootScope.MULTI_VIEW_ID);
1215 1215  
  1216 +
1216 1217 // bodyview id
1217 1218 $("#Anterior").attr("id", "Anterior_" + $rootScope.MULTI_VIEW_ID);
1218 1219 $("#Lateral").attr("id", "Lateral_" + $rootScope.MULTI_VIEW_ID);
... ... @@ -4128,7 +4129,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4128 4129 $scope.isScrolledToHighlightedBR = false;
4129 4130 //disable the background till the system gets highlighted.
4130 4131 $scope.DisableUI();
4131   - $('.ui-slider').slider('disable');
  4132 +
  4133 + // $('.ui-slider').slider('disable');
  4134 +
  4135 + $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('disable');
4132 4136  
4133 4137 var currentNumber=$scope.GetwindowStoreData(windowviewid,'currentLayerNumber');
4134 4138 if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
... ... @@ -4157,26 +4161,30 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4157 4161 var bodyVid=$scope.GetwindowStoreData(windowviewid,'voId');
4158 4162 var lNumber=$scope.GetwindowStoreData(windowviewid,'layerNumber');
4159 4163 var zoomValue=$scope.GetwindowStoreData(windowviewid,'zoomInOut');
4160   - var systemNumber=$scope.GetwindowStoreData(windowviewid,'systemNumber');
  4164 + var systemNumber = $scope.GetwindowStoreData(windowviewid, 'systemNumber');
4161 4165  
4162 4166 TermService.getTermData(lNumber, bodyVid, systemNumber, zoomValue)
4163 4167 .then(
4164 4168 function (result) {
4165 4169  
4166   - if (result.length == 0) {
  4170 + if (result.length ==0) {
4167 4171 $rootScope.isLoading = false;
4168 4172 $('#spinner').css('visibility', 'hidden');
4169 4173  
4170 4174 //remove existing data and draw fresh data
4171 4175 $scope.removeCurrentHighlightedBodySystem(windowviewid);
4172 4176  
  4177 + // $('.ui-slider').slider('enable');
  4178 + $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
  4179 + $scope.EnableUI();
4173 4180  
4174   - $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
  4181 + $rootScope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
  4182 +
4175 4183 $("#daMessageModal").modal('show');
4176 4184  
4177   - $scope.EnableUI();
4178   -
4179   - $('.ui-slider').slider('enable');
  4185 + $(".notfoundSystem").draggable({ handle: ".modal-header" });
  4186 + $(".modal-backdrop").css("opacity", ".5");
  4187 +
4180 4188 }
4181 4189 else {
4182 4190 console.log('1. HighlightBodyByTermListForBodySystem is called');
... ... @@ -4249,7 +4257,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4249 4257  
4250 4258  
4251 4259 grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth)
4252   - if ($scope.GetwindowStoreData(windowviewid,'isExtract')) {
  4260 + if ($scope.GetwindowStoreData(windowviewid, 'isExtract')) {
4253 4261 grayCanvasContext.putImageData(whiteImageDataList[parseInt(TermExistInBodyRegionId) - 1], 0, 0);
4254 4262 }
4255 4263 else {
... ... @@ -4264,7 +4272,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4264 4272 var grayCanvasMRX;
4265 4273 var grayCanvasMRY;
4266 4274  
4267   - var bodyVid=$scope.GetwindowStoreData(windowviewid,'voId');
  4275 + var bodyVid = $scope.GetwindowStoreData(windowviewid, 'voId');
4268 4276 //draw a canvas for same bodyregion wich will be flipped after coloring the body system
4269 4277 if (bodyVid == "1" || bodyVid == "4" || bodyVid == "5" || bodyVid == "8") {
4270 4278 if (TermExistInBodyRegionId == 4 || TermExistInBodyRegionId == 5 || TermExistInBodyRegionId == 6) {
... ... @@ -4303,10 +4311,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4303 4311 .from($rootScope.macthedTermList)
4304 4312 .where('bodyRegionId == ' + TermExistInBodyRegionId)
4305 4313 .select();
4306   - var coloredImageDataVar=null;
4307   - if (coloredImageCanvasList.length>0) {
4308   - coloredImageDataVar = coloredImageCanvasList[parseInt(TermExistInBodyRegionId)-1];
4309   - }
  4314 + var coloredImageDataVar = null;
  4315 + if (coloredImageCanvasList.length > 0) {
  4316 + coloredImageDataVar = coloredImageCanvasList[parseInt(TermExistInBodyRegionId) - 1];
  4317 + }
4310 4318  
4311 4319 var grayImageDataValue = gData.data;
4312 4320 var coloredImageDataValue = coloredImageDataVar.data;
... ... @@ -4366,14 +4374,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4366 4374  
4367 4375 }
4368 4376 }
4369   -
4370   - $('#spinner').css('visibility', 'hidden')
4371   - $rootScope.isLoading = false;
4372   -
4373   - //document.getElementById("daView").style.pointerEvents = "auto";
4374   -
4375   - //$('.ui-slider').slider('enable');
4376   - $scope.EnableUI();
  4377 +
4377 4378 prevBRID = TermExistInBodyRegionId;
4378 4379  
4379 4380 $scope.scrollToHighlightedBodyRegion(TermExistInBodyRegionId, windowviewid);
... ... @@ -4386,14 +4387,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4386 4387 $rootScope.isLoading = false;
4387 4388  
4388 4389 $scope.EnableUI();
4389   - $('.ui-slider').slider('enable');
  4390 + // $('.ui-slider').slider('enable');
  4391 + $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
4390 4392 }
4391 4393  
4392   - })
4393   -
4394   - }
  4394 + });
  4395 +
  4396 + //$('.ui-slider').slider('enable');
  4397 + $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
  4398 + $scope.EnableUI();
4395 4399  
4396 4400  
  4401 + }
4397 4402  
4398 4403 }
4399 4404 },
... ... @@ -4401,14 +4406,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4401 4406 console.log(' Error in getting term data = ' + error);
4402 4407 $('#spinner').css('visibility', 'hidden')
4403 4408 $rootScope.isLoading = false;
4404   -
  4409 + //$('.ui-slider').slider('enable');
  4410 + $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
4405 4411 $scope.EnableUI();
4406 4412 //remove existing data and draw fresh data
4407 4413 $scope.removeCurrentHighlightedBodySystem(windowviewid);
4408 4414  
4409   - $scope.message = error;
  4415 + $rootScope.message = error;
4410 4416 $("#daMessageModal").modal('show');
4411 4417  
  4418 + $(".notfoundSystem").draggable({ handle: ".modal-header" });
  4419 + $(".modal-backdrop").css("opacity", ".5");
  4420 +
  4421 +
4412 4422 });
4413 4423  
4414 4424  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @8e1e83a
... ... @@ -1386,12 +1386,21 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
1386 1386  
1387 1387 }
1388 1388 else if ($location.url() == "/adam-images-detail") {
  1389 + //Modified code by sandeep for fixed bug-57956
1389 1390 $rootScope.disableMenuannotation = " ";
1390 1391 $rootScope.disableMenuoption = " ";
  1392 + $("#optiontSetting").addClass("disableSubMenu");
1391 1393 $rootScope.disableSubMenu = "disableSubMenu";
1392 1394 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1393   - $("#optionsListManagerTab").addClass("disableSubMenu");
1394 1395 $rootScope.disableFileMenu = " ";
  1396 + $rootScope.openResources = "openResources";
  1397 + $rootScope.OpenPitures = "OpenPitures";
  1398 + $rootScope.newCurriculum = "newCurriculum";
  1399 + $rootScope.openCurriculum = "openCurriculum";
  1400 + $rootScope.saveCurriculam = "saveCurriculam";
  1401 + $rootScope.PrintPreview = "";
  1402 + $rootScope.exportImage = "";
  1403 + $rootScope.PrintViewer = "";
1395 1404 }
1396 1405 else {
1397 1406 $("#annotationToolBarOptions").removeClass("disableSubMenu");
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/TermService.js
  View file @8e1e83a
... ... @@ -20,7 +20,7 @@
20 20 deferred.resolve(data);
21 21 }).error(function (data, status, headers, config) {
22 22 console.log('error status= ' + status)
23   - deferred.reject(status);
  23 + deferred.reject(data);
24 24 });
25 25 return deferred.promise;
26 26 },
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @8e1e83a
... ... @@ -312,50 +312,7 @@
312 312 </div>
313 313 </div>
314 314 </div>
315   - <div class="modal fade" id="daMessageModal" role="dialog" style="top:20%;">
316   -
317   - <div class="modal-dialog modal-sm">
318   -
319   - <div class="modal-content">
320   -
321   - <div class="modal-header">
322   -
323   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
324   -
325   - </div>
326   -
327   - <div class="modal-title"></div>
328   -
329   - <!--<div class="modal-body">"No body system"</div>-->
330   -
331   - <div class="modal-header"><p data-ng-bind="message" style="font-size:15px;"></p></div>
332   -
333   -
334   -
335   - <div class="modal-footer"> <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">OK</button></div>
336   -
337   -
338   - </div>
339   -
340   -
341   - </div>
342   -
343   - </div>
344   -
345   -
346   - <div class="modal fade" id="daMessageModal" role="dialog">
347   - <div class="modal-dialog">
348   -
349   - <div class="modal-content">
350   - <div class="modal-body" data-ng-bind="message"></div>
351   -
352   - <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div>
353   - </div>
354   - </div>
355   - </div>
356   -
357   -
358   -
  315 +
359 316 <div id="searchedTermListPopUp" style="display:none">
360 317 <div class="modal-header annotation-modal-header">
361 318 <button type="button" class="close" aria-label="Close" ng-click="closeSerachTermListPopUp()"><span aria-hidden="true">&times;</span></button>
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @8e1e83a
... ... @@ -264,7 +264,6 @@
264 264 <div class="modal-footer" style="padding-bottom:10px;">
265 265 <button type="button" class="btn btn-primary btn-block" ng-click="SendMailToUser(userInfo, false)">Send Mail</button>
266 266 </div>
267   - <!--<div style="color: maroon; font-weight: bold; " ng-if="message">{{message}}</div>-->
268 267 </div>
269 268 </div>
270 269 </div>
... ... @@ -301,7 +300,6 @@
301 300 <div class="modal-footer modal-footer-forgot-password" style="padding-bottom:10px;">
302 301 <button type="button" class="btn btn-primary btn-block" ng-click="SendMailToUser(userInfo, true)">Send Mail</button>
303 302 </div>
304   - <!--<div style="color: maroon; font-weight: bold; " ng-if="message">{{message}}</div>-->
305 303 </div>
306 304 </div>
307 305 </div>
... ... @@ -1056,6 +1054,33 @@
1056 1054 </div>
1057 1055 </div>
1058 1056  
  1057 +
  1058 + <!--DA Body System not found modal-->
  1059 + <div class="modal fade notfoundSystem" id="daMessageModal" role="dialog" aria-labelledby="myModalLabel"
  1060 + style="z-index: 1200002; top:10%">
  1061 +
  1062 + <div class="modal-dialog modal-sm">
  1063 +
  1064 + <div class="modal-content">
  1065 +
  1066 + <div class="modal-header">
  1067 +
  1068 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  1069 +
  1070 + </div>
  1071 +
  1072 + <div class="modal-title"></div>
  1073 +
  1074 + <div class="modal-header"><p data-ng-bind="message" style="font-size:15px;"></p></div>
  1075 +
  1076 + <div class="modal-footer"> <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">OK</button></div>
  1077 +
  1078 + </div>
  1079 +
  1080 + </div>
  1081 +
  1082 + </div>
  1083 +
1059 1084 <!--Export Image Modal-->
1060 1085 <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
1061 1086 style="z-index: 1200002;">
... ... @@ -1179,7 +1204,8 @@
1179 1204 </div>
1180 1205 </div>
1181 1206 <!--Print Preview Modal-->
1182   - <div id="dvPrintPreview" style="display: none;"></div>
  1207 + <div id="dvPrintPreview" style="display: none;"></div>
  1208 +
1183 1209 </div>
1184 1210 </div>
1185 1211 <!--RESET PASSWORD FORM-->
... ... @@ -1258,6 +1284,8 @@
1258 1284 </div>
1259 1285 </div>
1260 1286  
  1287 +
  1288 +
1261 1289 <!--Admin Form (Under Process)-->
1262 1290  
1263 1291  
... ...