Commit 01a9f9d8959148154be4040d12b9ff4942357616

Authored by Amrita Vishnoi
1 parent 3d2545d3

against Merge Request #772

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -276,6 +276,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -276,6 +276,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
276 }; 276 };
277 277
278 $scope.DisableUI = function () { 278 $scope.DisableUI = function () {
  279 +
  280 + //enable daBodyViewDiv which was disabled on thumbnail click so need not bother where to enable
  281 + //as jspanel disable/enable is working for all features
  282 + document.getElementById('daBodyview').style.pointerEvents = "auto";
  283 + document.getElementById('daBodyview').style.opacity = "1";
  284 +
279 var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); 285 var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
280 for (var i = 0; i < daImagePanelConetent.length; i++) { 286 for (var i = 0; i < daImagePanelConetent.length; i++) {
281 daImagePanelConetent[i].style.pointerEvents = "none"; 287 daImagePanelConetent[i].style.pointerEvents = "none";
@@ -299,8 +305,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -299,8 +305,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
299 } 305 }
300 306
301 $scope.openView = function ($event) { 307 $scope.openView = function ($event) {
302 - $scope.DisableUI();  
303 - 308 +
304 $rootScope.disableAnnotationTB = false; 309 $rootScope.disableAnnotationTB = false;
305 $rootScope.MenuModuleName = "DA"; 310 $rootScope.MenuModuleName = "DA";
306 $rootScope.isLoading = true; 311 $rootScope.isLoading = true;
@@ -316,6 +321,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -316,6 +321,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
316 var u = $location.url(); 321 var u = $location.url();
317 $location.url('/da-body-view'); 322 $location.url('/da-body-view');
318 323
  324 +
  325 +
319 var view_list = angular.element($event.currentTarget); 326 var view_list = angular.element($event.currentTarget);
320 var view_list_male_female = view_list.attr('title'); 327 var view_list_male_female = view_list.attr('title');
321 328
@@ -459,6 +466,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -459,6 +466,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
459 //da-body-views functions 466 //da-body-views functions
460 467
461 $scope.openBodyView = function () { 468 $scope.openBodyView = function () {
  469 +
  470 + //disable whole div because till now jspanel is not created. enable when jspanel gets disabled because
  471 + //than jspanel will take care of disabling/enabling ui
  472 + document.getElementById('daBodyview').style.pointerEvents = "none";
  473 + document.getElementById('daBodyview').style.opacity = "0.5";
  474 +
462 //Check if browser 'REFRESHED' or 'RELOADED' 475 //Check if browser 'REFRESHED' or 'RELOADED'
463 if ($rootScope.CommonData != null) { 476 if ($rootScope.CommonData != null) {
464 //0. we will initially append container to load body 477 //0. we will initially append container to load body
@@ -1720,7 +1733,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -1720,7 +1733,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1720 annotationText = $scope.GetAnnotationText(parseInt(RGBColor)); 1733 annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
1721 } 1734 }
1722 else { 1735 else {
1723 - $scope.loadSearchData(); 1736 + $rootScope.loadSearchData();
1724 annotationText = $scope.GetAnnotationText(parseInt(RGBColor)); 1737 annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
1725 } 1738 }
1726 1739
@@ -2095,7 +2108,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -2095,7 +2108,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2095 2108
2096 } 2109 }
2097 else { 2110 else {
2098 - $scope.loadSearchData(); 2111 + $rootScope.loadSearchData();
2099 annotationText = $scope.GetAnnotationText(parseInt(RGBColor)); 2112 annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
2100 2113
2101 } 2114 }
@@ -4367,6 +4380,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -4367,6 +4380,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4367 if ($rootScope.isExtract == false) { 4380 if ($rootScope.isExtract == false) {
4368 4381
4369 $("#btnExtract").addClass("disabled"); 4382 $("#btnExtract").addClass("disabled");
  4383 + $("#btnExtract").css("pointer-events", "none");
4370 4384
4371 //if listanager is visisble then close it 4385 //if listanager is visisble then close it
4372 $rootScope.isListManagerSelected = false; 4386 $rootScope.isListManagerSelected = false;
@@ -6508,6 +6522,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6508,6 +6522,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6508 //To enable extract button 6522 //To enable extract button
6509 $rootScope.isTransparencyActivated = false; 6523 $rootScope.isTransparencyActivated = false;
6510 $("#btnExtract").removeClass("disabled"); 6524 $("#btnExtract").removeClass("disabled");
  6525 + $("#btnExtract").css("pointer-events", "auto");
6511 6526
6512 6527
6513 $('.com_anno').remove(); 6528 $('.com_anno').remove();
@@ -6728,13 +6743,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6728,13 +6743,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6728 $("#annotationButton").removeClass("active"); 6743 $("#annotationButton").removeClass("active");
6729 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { 6744 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
6730 $("#btnExtract").addClass("disabled"); 6745 $("#btnExtract").addClass("disabled");
  6746 + $("#btnExtract").css("pointer-events", "none");
  6747 +
6731 $('#btnTranparency').addClass('tButtonActive'); 6748 $('#btnTranparency').addClass('tButtonActive');
6732 $('#btnTranparency').removeClass('btn-black'); 6749 $('#btnTranparency').removeClass('btn-black');
6733 } 6750 }
6734 else 6751 else
6735 $("#btnExtract").removeClass("disabled"); 6752 $("#btnExtract").removeClass("disabled");
  6753 + $("#btnExtract").css("pointer-events", "auto");
  6754 +
6736 6755
6737 $("#btnTranparency").removeClass("disabled"); 6756 $("#btnTranparency").removeClass("disabled");
  6757 + $("#btnTranparency").css("pointer-events", "auto");
  6758 +
6738 $rootScope.isTransparencyBoxActivated = false; 6759 $rootScope.isTransparencyBoxActivated = false;
6739 $rootScope.isNormalMode = false; 6760 $rootScope.isNormalMode = false;
6740 $rootScope.isGenderChnage = false; 6761 $rootScope.isGenderChnage = false;
@@ -6971,6 +6992,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6971,6 +6992,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6971 6992
6972 $scope.enableNormalMode = function () { 6993 $scope.enableNormalMode = function () {
6973 $("#btnTranparency").removeClass("disabled"); 6994 $("#btnTranparency").removeClass("disabled");
  6995 + $("#btnTranparency").css("pointer-events", "auto");
6974 6996
6975 if ($rootScope.isTransparencyActivated) { 6997 if ($rootScope.isTransparencyActivated) {
6976 $scope.layerNumber = $rootScope.currentLayerNumber; 6998 $scope.layerNumber = $rootScope.currentLayerNumber;
@@ -7089,6 +7111,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7089,6 +7111,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7089 if ($rootScope.isTransparencyActivated == true) { 7111 if ($rootScope.isTransparencyActivated == true) {
7090 7112
7091 $("#btnExtract").addClass("disabled"); 7113 $("#btnExtract").addClass("disabled");
  7114 + $("#btnExtract").css("pointer-events", "none");
7092 7115
7093 } 7116 }
7094 7117
@@ -7113,6 +7136,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7113,6 +7136,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7113 7136
7114 7137
7115 $("#btnTranparency").addClass("disabled"); 7138 $("#btnTranparency").addClass("disabled");
  7139 + $("#btnTranparency").css("pointer-events", "none");
7116 7140
7117 if ($rootScope.isNormalMode == true) { 7141 if ($rootScope.isNormalMode == true) {
7118 7142
@@ -7139,7 +7163,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7139,7 +7163,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7139 //disable transparency button 7163 //disable transparency button
7140 7164
7141 $("#btnTranparency").addClass("disabled"); 7165 $("#btnTranparency").addClass("disabled");
7142 - 7166 + $("#btnTranparency").css("pointer-events", "none");
7143 7167
7144 if ($rootScope.isNormalMode == true) { 7168 if ($rootScope.isNormalMode == true) {
7145 7169
@@ -7222,6 +7246,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7222,6 +7246,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7222 $scope.CloseTransparencyBox(); 7246 $scope.CloseTransparencyBox();
7223 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { 7247 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7224 $("#btnExtract").addClass("disabled"); 7248 $("#btnExtract").addClass("disabled");
  7249 + $("#btnExtract").css("pointer-events", "none");
7225 $('#btnTranparency').addClass('tButtonActive'); 7250 $('#btnTranparency').addClass('tButtonActive');
7226 $('#btnTranparency').removeClass('btn-black'); 7251 $('#btnTranparency').removeClass('btn-black');
7227 } 7252 }
@@ -7730,7 +7755,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7730,7 +7755,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7730 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft; 7755 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
7731 7756
7732 $("#btnExtract").removeClass("disabled"); 7757 $("#btnExtract").removeClass("disabled");
  7758 + $("#btnExtract").css("pointer-events", "auto");
  7759 +
7733 $("#btnTranparency").removeClass("disabled"); 7760 $("#btnTranparency").removeClass("disabled");
  7761 + $("#btnTranparency").css("pointer-events", "auto");
7734 $rootScope.isTransparencyBoxActivated = false; 7762 $rootScope.isTransparencyBoxActivated = false;
7735 $rootScope.isNormalMode = false; 7763 $rootScope.isNormalMode = false;
7736 7764
@@ -7738,6 +7766,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7738,6 +7766,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7738 $scope.CloseTransparencyBox(); 7766 $scope.CloseTransparencyBox();
7739 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { 7767 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7740 $("#btnExtract").addClass("disabled"); 7768 $("#btnExtract").addClass("disabled");
  7769 + $("#btnExtract").css("pointer-events", "none");
  7770 +
7741 $('#btnTranparency').addClass('tButtonActive'); 7771 $('#btnTranparency').addClass('tButtonActive');
7742 $('#btnTranparency').removeClass('btn-black'); 7772 $('#btnTranparency').removeClass('btn-black');
7743 } 7773 }
@@ -7979,7 +8009,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7979,7 +8009,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7979 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft; 8009 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
7980 8010
7981 $("#btnExtract").removeClass("disabled"); 8011 $("#btnExtract").removeClass("disabled");
  8012 + $("#btnExtract").css("pointer-events", "auto");
  8013 +
7982 $("#btnTranparency").removeClass("disabled"); 8014 $("#btnTranparency").removeClass("disabled");
  8015 + $("#btnTranparency").css("pointer-events", "auto");
  8016 +
7983 $rootScope.isTransparencyBoxActivated = false; 8017 $rootScope.isTransparencyBoxActivated = false;
7984 $rootScope.isNormalMode = false; 8018 $rootScope.isNormalMode = false;
7985 8019
@@ -7987,6 +8021,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7987,6 +8021,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7987 $scope.CloseTransparencyBox(); 8021 $scope.CloseTransparencyBox();
7988 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { 8022 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7989 $("#btnExtract").addClass("disabled"); 8023 $("#btnExtract").addClass("disabled");
  8024 + $("#btnExtract").css("pointer-events", "none");
  8025 +
7990 $('#btnTranparency').addClass('tButtonActive'); 8026 $('#btnTranparency').addClass('tButtonActive');
7991 $('#btnTranparency').removeClass('btn-black'); 8027 $('#btnTranparency').removeClass('btn-black');
7992 } 8028 }
@@ -8834,76 +8870,84 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -8834,76 +8870,84 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8834 8870
8835 $scope.loadListManger = function () { 8871 $scope.loadListManger = function () {
8836 var primaryLexiconIndex; 8872 var primaryLexiconIndex;
8837 - for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {  
8838 - if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {  
8839 - primaryLexiconIndex = i; 8873 + if ($rootScope.vocabTermDataArray != null && $rootScope.vocabTermDataArray != undefined && $rootScope.vocabTermDataArray.length > 0) {
  8874 +
  8875 + for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {
  8876 + if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {
  8877 + primaryLexiconIndex = i;
  8878 + }
8840 } 8879 }
8841 - }  
8842 - console.log($rootScope.vocabTermDataArray[primaryLexiconIndex].language);  
8843 - $rootScope.isListManagerMenuSelected = true; 8880 + console.log($rootScope.vocabTermDataArray[primaryLexiconIndex].language);
  8881 + $rootScope.isListManagerMenuSelected = true;
8844 8882
8845 - var vocabTermTxt = [];  
8846 - if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined && $rootScope.TermNumberData.length > 0) {  
8847 - angular.forEach($rootScope.TermNumberData.TermData.Term, function (value1, key1) { 8883 + var vocabTermTxt = [];
  8884 + if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined && $rootScope.TermNumberData.length > 0) {
  8885 + angular.forEach($rootScope.TermNumberData.TermData.Term, function (value1, key1) {
8848 8886
8849 - angular.forEach($rootScope.vocabTermDataArray[primaryLexiconIndex].VocabTermData.VocabTerms.Term, function (value2, key2) { 8887 + angular.forEach($rootScope.vocabTermDataArray[primaryLexiconIndex].VocabTermData.VocabTerms.Term, function (value2, key2) {
8850 8888
8851 8889
8852 - if (value1._ActualTermNumber === value2._ActualTermNumber) {  
8853 - vocabTermTxt.push( 8890 + if (value1._ActualTermNumber === value2._ActualTermNumber) {
  8891 + vocabTermTxt.push(
8854 8892
8855 - { 8893 + {
8856 8894
8857 - "_ActualTermNumber": value2._ActualTermNumber,  
8858 - "_TermText": value2._TermText,  
8859 - "_cdId": value2._cdId 8895 + "_ActualTermNumber": value2._ActualTermNumber,
  8896 + "_TermText": value2._TermText,
  8897 + "_cdId": value2._cdId
8860 8898
8861 - } 8899 + }
8862 8900
8863 - ); 8901 + );
8864 8902
8865 - } 8903 + }
8866 8904
8867 - }) 8905 + })
8868 8906
8869 8907
8870 8908
8871 - }) 8909 + })
8872 8910
8873 8911
8874 8912
8875 - $scope.VocabTermTxt = new jinqJs()  
8876 - .from(vocabTermTxt)  
8877 - .distinct('_TermText', '_ActualTermNumber')  
8878 - .orderBy([{ field: '_TermText', sort: 'asc' }])  
8879 - .select('_ActualTermNumber', '_TermText', '_cdId'); 8913 + $scope.VocabTermTxt = new jinqJs()
  8914 + .from(vocabTermTxt)
  8915 + .distinct('_TermText', '_ActualTermNumber')
  8916 + .orderBy([{ field: '_TermText', sort: 'asc' }])
  8917 + .select('_ActualTermNumber', '_TermText', '_cdId');
8880 8918
8881 - if ($scope.VocabTermTxt != null || $scope.VocabTermTxt != undefined) { 8919 + if ($scope.VocabTermTxt != null || $scope.VocabTermTxt != undefined) {
8882 8920
8883 8921
8884 - for (var j = 0; j < $scope.VocabTermTxt.length; j++) {  
8885 - var $el = $('<option title ="' + $scope.VocabTermTxt[j]._TermText + '" id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')  
8886 - $compile($el)($scope); 8922 + for (var j = 0; j < $scope.VocabTermTxt.length; j++) {
  8923 + var $el = $('<option title ="' + $scope.VocabTermTxt[j]._TermText + '" id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
  8924 + $compile($el)($scope);
8887 8925
8888 - } 8926 + }
8889 8927
8890 - $rootScope.isLoading = false;  
8891 - $('#spinner').css('visibility', 'hidden'); 8928 + $rootScope.isLoading = false;
  8929 + $('#spinner').css('visibility', 'hidden');
8892 8930
8893 - var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>';  
8894 - $("#totalTerms").empty();  
8895 - $('#totalTerms').append(termsTotal); 8931 + var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>';
  8932 + $("#totalTerms").empty();
  8933 + $('#totalTerms').append(termsTotal);
8896 8934
8897 8935
8898 8936
  8937 + }
  8938 + }
  8939 + else {
  8940 + console.log("$rootScope.TermNumberData NOT FOUND");
  8941 + $rootScope.loadSearchData();
  8942 +
8899 } 8943 }
8900 } 8944 }
8901 else { 8945 else {
8902 - console.log("$rootScope.TermNumberData NOT FOUND");  
8903 - $scope.loadSearchData(); 8946 + $rootScope.loadSearchData();
8904 8947
8905 } 8948 }
8906 } 8949 }
  8950 +
8907 8951
8908 8952
8909 $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { 8953 $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) {
@@ -9572,6 +9616,7 @@ function OnEnableNormalMode() { @@ -9572,6 +9616,7 @@ function OnEnableNormalMode() {
9572 console.log('OnEnableNormalMode is called outside '); 9616 console.log('OnEnableNormalMode is called outside ');
9573 9617
9574 $("#btnTranparency").removeClass("disabled"); 9618 $("#btnTranparency").removeClass("disabled");
  9619 + $("#btnTranparency").css("pointer-events", "auto");
9575 9620
9576 var scope = angular.element(document.getElementById("daView")).scope(); 9621 var scope = angular.element(document.getElementById("daView")).scope();
9577 scope.$apply(function () { 9622 scope.$apply(function () {
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
1 -๏ปฟ  
2 -<div class="bodyWrap row no-scroll">  
3 - <div ng-include=" 'app/widget/MainMenu.html' " />  
4 - <div class="main">  
5 - <div class="col-sm-12 stickey-area clsstickydiv">  
6 - <div class="breadcrumb">  
7 - <div class="row center-block">  
8 - <h5 class="text-center text-primary txt-white f15">Display Image By</h5>  
9 - <div class="col-md-2 col-sm-4 pad-lftrgt3">  
10 - <div class="form-group">  
11 - <h6 class="text-center text-primary txt-white f11">Body Region</h6>  
12 - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CIAllBodyRegion track by item">  
13 - <option value="">All</option>  
14 - </select>  
15 - </div>  
16 - </div>  
17 - <div class="col-md-2 col-sm-4 pad-lftrgt3">  
18 - <div class="form-group">  
19 - <h6 class="text-center text-primary txt-white f11">Body System</h6>  
20 - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CIAllBodySystem track by item">  
21 - <option value="">All</option>  
22 - </select>  
23 - </div>  
24 - </div>  
25 -  
26 - <div class="col-md-2 col-sm-4 pad-lftrgt3">  
27 - <div class="form-group">  
28 - <h6 class="text-center text-primary txt-white f11">View Orientation</h6>  
29 - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in CIAllOrientation track by item">  
30 - <option value="">All</option>  
31 - </select>  
32 - </div>  
33 - </div>  
34 - <div class="col-md-2 col-sm-4 pad-lftrgt3">  
35 - <div class="form-group">  
36 - <h6 class="text-center text-primary txt-white f11">Image Type</h6>  
37 - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in CIAllImageType track by item">  
38 - <option value="">All</option>  
39 - </select>  
40 - </div>  
41 - </div>  
42 - <div class="col-md-2 col-sm-4 pad-lftrgt3">  
43 - <div class="form-group">  
44 - <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6>  
45 - <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item">  
46 - <option value="">All</option>  
47 - </select>  
48 - </div>  
49 - </div>  
50 - <div class="col-md-2 col-sm-4 pad-lftrgt3">  
51 - <div class="form-group">  
52 - <h6 class="text-center text-primary txt-white f11">Search</h6>  
53 -  
54 - <div class="btn-group col-xs-12" style="padding:0;">  
55 - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>  
56 - <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)">  
57 - <i class="fa fa-search"></i>  
58 - </button>  
59 -  
60 - </div>  
61 -  
62 -  
63 -  
64 - <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->  
65 - </div>  
66 - </div>  
67 - </div>  
68 - </div>  
69 - </div>  
70 -  
71 -  
72 - <div class="row tab-content" style="padding-left:25px; width:99%">  
73 -  
74 - <!--<div role="tabpanel" class="tab-pane active" id="grid-view">--> 1 +๏ปฟ
  2 +<div class="bodyWrap row no-scroll">
  3 + <div ng-include=" 'app/widget/MainMenu.html' " />
  4 + <div class="main">
  5 + <div class="col-sm-12 stickey-area clsstickydiv">
  6 + <div class="breadcrumb">
  7 + <div class="row center-block">
  8 + <h5 class="text-center text-primary txt-white f15">Display Image By</h5>
  9 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  10 + <div class="form-group">
  11 + <h6 class="text-center text-primary txt-white f11">Body Region</h6>
  12 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CIAllBodyRegion track by item">
  13 + <option value="">All</option>
  14 + </select>
  15 + </div>
  16 + </div>
  17 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  18 + <div class="form-group">
  19 + <h6 class="text-center text-primary txt-white f11">Body System</h6>
  20 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CIAllBodySystem track by item">
  21 + <option value="">All</option>
  22 + </select>
  23 + </div>
  24 + </div>
  25 +
  26 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  27 + <div class="form-group">
  28 + <h6 class="text-center text-primary txt-white f11">View Orientation</h6>
  29 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in CIAllOrientation track by item">
  30 + <option value="">All</option>
  31 + </select>
  32 + </div>
  33 + </div>
  34 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  35 + <div class="form-group">
  36 + <h6 class="text-center text-primary txt-white f11">Image Type</h6>
  37 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in CIAllImageType track by item">
  38 + <option value="">All</option>
  39 + </select>
  40 + </div>
  41 + </div>
  42 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  43 + <div class="form-group">
  44 + <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6>
  45 + <select ng-change="hideListViewDiv()"class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item">
  46 + <option value="">All</option>
  47 + </select>
  48 + </div>
  49 + </div>
  50 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  51 + <div class="form-group">
  52 + <h6 class="text-center text-primary txt-white f11">Search</h6>
  53 +
  54 + <div class="btn-group col-xs-12" style="padding:0;">
  55 + <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
  56 + <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)">
  57 + <i class="fa fa-search"></i>
  58 + </button>
  59 +
  60 + </div>
  61 +
  62 +
  63 +
  64 + <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
  65 + </div>
  66 + </div>
  67 + </div>
  68 + </div>
  69 + </div>
  70 +
  71 +
  72 + <div class="row tab-content" style="padding-left:25px; width:99%">
  73 +
  74 + <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
75 <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view"> 75 <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
76 <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData"> 76 <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData">
77 <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)"> 77 <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
@@ -94,8 +94,8 @@ @@ -94,8 +94,8 @@
94 </div> 94 </div>
95 </div> 95 </div>
96 </div>--> 96 </div>-->
97 - </div>  
98 - <!--<div role="tabpanel" class="tab-pane" id="list-view">--> 97 + </div>
  98 + <!--<div role="tabpanel" class="tab-pane" id="list-view">-->
99 <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view"> 99 <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
100 <!--<div class="col-sm-12 table-responsive">--> 100 <!--<div class="col-sm-12 table-responsive">-->
101 <div class="panel col-sm-12 table-responsive"> 101 <div class="panel col-sm-12 table-responsive">
@@ -175,12 +175,12 @@ @@ -175,12 +175,12 @@
175 </div> 175 </div>
176 176
177 </div> 177 </div>
178 - </div>  
179 - </div>  
180 - </div> 178 + </div>
  179 + </div>
  180 + </div>
181 <div id="ciSpinner" class="spinner" ng-show="isLoading" style="visibility:hidden"> 181 <div id="ciSpinner" class="spinner" ng-show="isLoading" style="visibility:hidden">
182 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" /> 182 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" />
183 - </div>  
184 -</div>  
185 -  
186 - 183 + </div>
  184 +</div>
  185 +
  186 +