Fixed the more bug during verify functionalities

Birendra Kumar
1 parent 42aa9f6e
Showing 4 changed files with 71 additions and 27 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
@@ -77,8 +77,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
     $scope.loadSlideShowXmldata = function (e) {
-        //$rootScope.fileNames = e.target.id;
-        $scope.fileName = e.target.id.split('.');
+        $rootScope.AutherName="";
+        $rootScope.summary="";
+        $rootScope.FileTitle=e.target.text;
+        
+        $scope.fileName = e.target.id.split('.');      
         $('#modal-CurBuilder').css("display", "block");
         $("#CurBuilderbackground").css("display", "block");
         $http({ method: 'GET', url: 'content/data/json/cb/SlideShow/json/' + $scope.fileName[0] + '.json' }).success(function (data) {
@@ -96,8 +99,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         $("#opencbview").trigger("click");
         var fileupload = document.getElementById("opencbview");
-
-
+       
         fileupload.onchange = function () {
             var fileName = fileupload.value;
@@ -315,6 +317,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
     $rootScope.getCBsummary = function () {
         $rootScope.summary = $rootScope.cbJsonData.slideshow.content.element[0].summary;
+        $rootScope.AutherName = $rootScope.cbJsonData.slideshow.content.element[0].author;
         $rootScope.note = $rootScope.cbJsonData.slideshow.content.element;
         $rootScope.Auther = $rootScope.cbDynamicJsonData.slideshow.content.element;
@@ -42,7 +42,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $scope.BodyViewData;
             // This variable is used for unhighlight previously highlighted body portion, if multiAnnotation is false.
             $scope.machedIcolorInBodyRegion = [];
-            $scope.runningWorkers = [];
+            //$scope.runningWorkers = [];
             $scope.runningSearchWorkers = [];
             $scope.runningBodyViewWorkers = [];
@@ -1596,6 +1596,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 }
                 var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue');
+                if(ModestyValue=="Y")
+                {                 
+                    $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',true);
+                }
+                else
+                {
+                    $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',false);
+                }
+               
                 var navigatorManData = new jinqJs()
                                   .from(data.Navigtor.ViewOrientation)
                                   .where("_ViewOrientationId == " + currentBodyViewId)
@@ -2450,6 +2459,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 }
                 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false);
                 $('#typedTermName_' + windowviewid).val('');
+                $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
+                $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
                 if (evt.ctrlKey) {
                     $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
@@ -2950,8 +2961,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 if ($scope.isLayerChange == true) {
                     $scope.isLayerChange = false;
                 }
+
                 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false);
                 $('#typedTermName_' + windowviewid).val('');
+                $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
+                $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
+
                 if (evt.ctrlKey) {
                     $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
@@ -3410,8 +3425,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             }
             $scope.SetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData', false);
-            $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
-            $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
+           // $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
+           // $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
             $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', []);
                 // finish CB window load
             $rootScope.CBWindowLoadComplete = true;
@@ -3458,7 +3473,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $("#btnHighLight_" + windowviewid).addClass("btn-black");
             }
-
+            $scope.runningWorkers = [];
             //terminate previous running workers to create space for new workers
             $scope.SetwindowStoreData(windowviewid,'layerNumber',$("#txtLayerNumberDA_" + windowviewid).val()); 
@@ -3718,6 +3733,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             console.log('HighlightBodyByTermList is called');
             $scope.highlightedBR = [];
+            $scope.runningWorkers = [];
             $timeout(function () {
                 var MaskCanvasData=$scope.GetwindowStoreData(windowviewid,'MaskCanvasData');
@@ -6119,7 +6135,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     var canvasModesty = document.createElement('canvas');
                     canvasModesty.id = modestyTransCanvasId;
-                    canvasModesty.className = 'transModestyImg'
+                    canvasModesty.className = 'transModestyImg_'+windowviewid
                     canvasModesty.height = Height;
                     canvasModesty.width = Width;
                     canvasModesty.style.position = "absolute";
@@ -7880,11 +7896,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $('#sppeachBubble_'+windowviewid).remove();
             }
-            //4.
-            if ($scope.GetwindowStoreData(windowviewid,'isHighLight') == true) {
-
-                $timeout(function () { $scope.highLightBody(windowviewid) }, 50);
-            }
+           
         }
@@ -8144,10 +8156,27 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         $("#canvasDiv").scroll(function (event) {
             var len=  (event.currentTarget.id).split("_").length;
             var windowviewid = (event.currentTarget.id).split("_")[len-1];
-            
-            $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',$('#canvasDivDA_' + windowviewid).scrollLeft());
-            $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',$('#canvasDivDA_' + windowviewid).scrollTop());	
+            var candivScrollleft=$('#canvasDivDA_' + windowviewid).scrollLeft();
+            var candivScrollTop=$('#canvasDivDA_' + windowviewid).scrollTop();
+
+            // Fix Navigator position  by CanvasDiv Scrolling
+             var can = $("#canvasDivDA_" + windowviewid);
+             var canheight = can[0].scrollHeight;
+             var canwidth = can[0].scrollWidth;
+
+             var dragDivTop= (candivScrollTop/canheight)*($('#navigatorDiv_' + windowviewid).height());
+             var dragDivLeft= (candivScrollleft/canwidth)*($('#navigatorDiv_' + windowviewid).width());
+           
+             
+             $("#draggable_" + windowviewid).css('top', dragDivTop);
+             $("#draggable_" + windowviewid).css('left', dragDivLeft>40?40:dragDivLeft);
+            
+ 
+             $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',candivScrollleft);
+             $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',candivScrollTop);	
+            
+            
         });
         $scope.enableExtract = function (isCalledFromButton,windowviewid) {
@@ -8541,12 +8570,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                                         var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
                                                         if (isHighlightBodyWithCBTermData == true) {
                                                             $scope.SetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData', false);
-                                                            $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
-                                                            $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
+                                                           // $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
+                                                           // $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
                                                             $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', []);
                                                             // finish CB window load
                                                             $rootScope.CBWindowLoadComplete = true;
                                                         }
+                                                        else if ((previousHighlightList != null || previousHighlightList != undefined) && previousHighlightList.length > 0) {
+                                                            $scope.createTermListByPreviousTermsAndHighlight(windowviewid);
+                                                        }
                                                         $scope.EnableUI();
                                                     }
@@ -9382,6 +9414,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             }
             var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue');
+            
+            if(ModestyValue=="Y")
+            {                 
+                $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',true);
+            }
+            else
+            {
+                $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',false);
+            }
             if (!$rootScope.isCallFromOtherModule) {
                 $scope.SetwindowStoreData(windowviewid,'curentEthnicity',$rootScope.globalSetting.ethnicity);
@@ -5665,13 +5665,13 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
                 }
             }
-            if ($('.transModestyImg') != null) {
+            if ($('.transModestyImg_'+MultiWinId) != null) {
                 if (($rootScope.globalSetting.modesty == 'Y')) {
-                    $('.transModestyImg').css('visibility', 'visible');
+                    $('.transModestyImg_'+MultiWinId).css('visibility', 'visible');
                 }
                 else {
-                    $('.transModestyImg').css('visibility', 'hidden');
+                    $('.transModestyImg_'+MultiWinId).css('visibility', 'hidden');
                 }
             }
             if ($rootScope.isLayerLessSeven == true) {
@@ -5688,13 +5688,13 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             if ($rootScope.isTBLayerLessSeven == true) {
                 if (($rootScope.globalSetting.modesty == 'Y')) {
-                    $('.transModestyImgif').css('visibility', 'visible');
+                    $('.transModestyImg_'+MultiWinId).css('visibility', 'visible');
                 }
             }
             else {
-                $('.transModestyImg').css('visibility', 'hidden');
+                $('.transModestyImg_'+MultiWinId).css('visibility', 'hidden');
             }
             $rootScope.changeNavigatorModesty();
         }
@@ -21,13 +21,13 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" ng-click="closeCurBulderModal()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">A.D.A.M. Curriculum Builder Guide</h4>
+                    <h4 class="modal-title"><b>{{FileTitle}}</b></h4>
                 </div>
                 <div class="modal-body">
                     <div class="row">
-                        <div class="col-sm-4"><img src="img/popup-img.jpg" alt="" title="" class="img-responsive"></div>
+                        <div class="col-sm-4"><img src="content/images/popup-img.jpg" alt="" title="" class="img-responsive"></div>
                         <div class="col-sm-8">
-                            <h4>A.D.A.M. Education</h4>
+                            <h5><b>{{AutherName}}</b></h5>
                             <p>{{summary}}</p>
                         </div>
                     </div>