ADAM / AIAHTML5

Commit 107362d59584f6bd0f5bc2194824b11c6167c9e2

Authored by Birendra Kumar
1 parent 42aa9f6e

Fixed the more bug during verify functionalities

Inline Side-by-side
Showing 4 changed files with 71 additions and 27 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @107362d
... ... @@ -77,8 +77,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
77 77  
78 78  
79 79 $scope.loadSlideShowXmldata = function (e) {
80   - //$rootScope.fileNames = e.target.id;
81   - $scope.fileName = e.target.id.split('.');
  80 + $rootScope.AutherName="";
  81 + $rootScope.summary="";
  82 + $rootScope.FileTitle=e.target.text;
  83 +
  84 + $scope.fileName = e.target.id.split('.');
82 85 $('#modal-CurBuilder').css("display", "block");
83 86 $("#CurBuilderbackground").css("display", "block");
84 87 $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, $
96 99  
97 100 $("#opencbview").trigger("click");
98 101 var fileupload = document.getElementById("opencbview");
99   -
100   -
  102 +
101 103 fileupload.onchange = function () {
102 104  
103 105 var fileName = fileupload.value;
... ... @@ -315,6 +317,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
315 317  
316 318 $rootScope.getCBsummary = function () {
317 319 $rootScope.summary = $rootScope.cbJsonData.slideshow.content.element[0].summary;
  320 + $rootScope.AutherName = $rootScope.cbJsonData.slideshow.content.element[0].author;
318 321 $rootScope.note = $rootScope.cbJsonData.slideshow.content.element;
319 322 $rootScope.Auther = $rootScope.cbDynamicJsonData.slideshow.content.element;
320 323  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @107362d
... ... @@ -42,7 +42,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
42 42 $scope.BodyViewData;
43 43 // This variable is used for unhighlight previously highlighted body portion, if multiAnnotation is false.
44 44 $scope.machedIcolorInBodyRegion = [];
45   - $scope.runningWorkers = [];
  45 + //$scope.runningWorkers = [];
46 46 $scope.runningSearchWorkers = [];
47 47 $scope.runningBodyViewWorkers = [];
48 48  
... ... @@ -1596,6 +1596,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1596 1596 }
1597 1597 var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue');
1598 1598  
  1599 + if(ModestyValue=="Y")
  1600 + {
  1601 + $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',true);
  1602 + }
  1603 + else
  1604 + {
  1605 + $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',false);
  1606 + }
  1607 +
1599 1608 var navigatorManData = new jinqJs()
1600 1609 .from(data.Navigtor.ViewOrientation)
1601 1610 .where("_ViewOrientationId == " + currentBodyViewId)
... ... @@ -2450,6 +2459,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2450 2459 }
2451 2460 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false);
2452 2461 $('#typedTermName_' + windowviewid).val('');
  2462 + $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
  2463 + $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
2453 2464  
2454 2465 if (evt.ctrlKey) {
2455 2466 $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
... ... @@ -2950,8 +2961,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2950 2961 if ($scope.isLayerChange == true) {
2951 2962 $scope.isLayerChange = false;
2952 2963 }
  2964 +
2953 2965 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false);
2954 2966 $('#typedTermName_' + windowviewid).val('');
  2967 + $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
  2968 + $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
  2969 +
2955 2970 if (evt.ctrlKey) {
2956 2971 $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
2957 2972  
... ... @@ -3410,8 +3425,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3410 3425 }
3411 3426  
3412 3427 $scope.SetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData', false);
3413   - $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
3414   - $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
  3428 + // $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
  3429 + // $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
3415 3430 $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', []);
3416 3431 // finish CB window load
3417 3432 $rootScope.CBWindowLoadComplete = true;
... ... @@ -3458,7 +3473,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3458 3473 $("#btnHighLight_" + windowviewid).addClass("btn-black");
3459 3474 }
3460 3475  
3461   -
  3476 + $scope.runningWorkers = [];
3462 3477 //terminate previous running workers to create space for new workers
3463 3478 $scope.SetwindowStoreData(windowviewid,'layerNumber',$("#txtLayerNumberDA_" + windowviewid).val());
3464 3479  
... ... @@ -3718,6 +3733,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3718 3733 console.log('HighlightBodyByTermList is called');
3719 3734  
3720 3735 $scope.highlightedBR = [];
  3736 + $scope.runningWorkers = [];
3721 3737  
3722 3738 $timeout(function () {
3723 3739 var MaskCanvasData=$scope.GetwindowStoreData(windowviewid,'MaskCanvasData');
... ... @@ -6119,7 +6135,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6119 6135  
6120 6136 var canvasModesty = document.createElement('canvas');
6121 6137 canvasModesty.id = modestyTransCanvasId;
6122   - canvasModesty.className = 'transModestyImg'
  6138 + canvasModesty.className = 'transModestyImg_'+windowviewid
6123 6139 canvasModesty.height = Height;
6124 6140 canvasModesty.width = Width;
6125 6141 canvasModesty.style.position = "absolute";
... ... @@ -7880,11 +7896,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7880 7896 $('#sppeachBubble_'+windowviewid).remove();
7881 7897 }
7882 7898  
7883   - //4.
7884   - if ($scope.GetwindowStoreData(windowviewid,'isHighLight') == true) {
7885   -
7886   - $timeout(function () { $scope.highLightBody(windowviewid) }, 50);
7887   - }
  7899 +
7888 7900 }
7889 7901  
7890 7902  
... ... @@ -8144,10 +8156,27 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8144 8156 $("#canvasDiv").scroll(function (event) {
8145 8157 var len= (event.currentTarget.id).split("_").length;
8146 8158 var windowviewid = (event.currentTarget.id).split("_")[len-1];
8147   -
8148   - $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',$('#canvasDivDA_' + windowviewid).scrollLeft());
8149   - $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',$('#canvasDivDA_' + windowviewid).scrollTop());
8150 8159  
  8160 + var candivScrollleft=$('#canvasDivDA_' + windowviewid).scrollLeft();
  8161 + var candivScrollTop=$('#canvasDivDA_' + windowviewid).scrollTop();
  8162 +
  8163 + // Fix Navigator position by CanvasDiv Scrolling
  8164 + var can = $("#canvasDivDA_" + windowviewid);
  8165 + var canheight = can[0].scrollHeight;
  8166 + var canwidth = can[0].scrollWidth;
  8167 +
  8168 + var dragDivTop= (candivScrollTop/canheight)*($('#navigatorDiv_' + windowviewid).height());
  8169 + var dragDivLeft= (candivScrollleft/canwidth)*($('#navigatorDiv_' + windowviewid).width());
  8170 +
  8171 +
  8172 + $("#draggable_" + windowviewid).css('top', dragDivTop);
  8173 + $("#draggable_" + windowviewid).css('left', dragDivLeft>40?40:dragDivLeft);
  8174 +
  8175 +
  8176 + $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',candivScrollleft);
  8177 + $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',candivScrollTop);
  8178 +
  8179 +
8151 8180 });
8152 8181  
8153 8182 $scope.enableExtract = function (isCalledFromButton,windowviewid) {
... ... @@ -8541,12 +8570,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8541 8570 var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
8542 8571 if (isHighlightBodyWithCBTermData == true) {
8543 8572 $scope.SetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData', false);
8544   - $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
8545   - $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
  8573 + // $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
  8574 + // $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
8546 8575 $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', []);
8547 8576 // finish CB window load
8548 8577 $rootScope.CBWindowLoadComplete = true;
8549 8578 }
  8579 + else if ((previousHighlightList != null || previousHighlightList != undefined) && previousHighlightList.length > 0) {
  8580 + $scope.createTermListByPreviousTermsAndHighlight(windowviewid);
  8581 + }
8550 8582  
8551 8583 $scope.EnableUI();
8552 8584 }
... ... @@ -9382,6 +9414,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9382 9414  
9383 9415 }
9384 9416 var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue');
  9417 +
  9418 + if(ModestyValue=="Y")
  9419 + {
  9420 + $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',true);
  9421 + }
  9422 + else
  9423 + {
  9424 + $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'isModestyOn',false);
  9425 + }
9385 9426  
9386 9427 if (!$rootScope.isCallFromOtherModule) {
9387 9428 $scope.SetwindowStoreData(windowviewid,'curentEthnicity',$rootScope.globalSetting.ethnicity);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @107362d
... ... @@ -5665,13 +5665,13 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5665 5665 }
5666 5666 }
5667 5667  
5668   - if ($('.transModestyImg') != null) {
  5668 + if ($('.transModestyImg_'+MultiWinId) != null) {
5669 5669 if (($rootScope.globalSetting.modesty == 'Y')) {
5670   - $('.transModestyImg').css('visibility', 'visible');
  5670 + $('.transModestyImg_'+MultiWinId).css('visibility', 'visible');
5671 5671 }
5672 5672  
5673 5673 else {
5674   - $('.transModestyImg').css('visibility', 'hidden');
  5674 + $('.transModestyImg_'+MultiWinId).css('visibility', 'hidden');
5675 5675 }
5676 5676 }
5677 5677 if ($rootScope.isLayerLessSeven == true) {
... ... @@ -5688,13 +5688,13 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5688 5688 if ($rootScope.isTBLayerLessSeven == true) {
5689 5689 if (($rootScope.globalSetting.modesty == 'Y')) {
5690 5690  
5691   - $('.transModestyImgif').css('visibility', 'visible');
  5691 + $('.transModestyImg_'+MultiWinId).css('visibility', 'visible');
5692 5692 }
5693 5693  
5694 5694  
5695 5695 }
5696 5696 else {
5697   - $('.transModestyImg').css('visibility', 'hidden');
  5697 + $('.transModestyImg_'+MultiWinId).css('visibility', 'hidden');
5698 5698 }
5699 5699 $rootScope.changeNavigatorModesty();
5700 5700 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
  View file @107362d
... ... @@ -21,13 +21,13 @@
21 21 <div class="modal-content">
22 22 <div class="modal-header">
23 23 <button type="button" class="close" ng-click="closeCurBulderModal()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
24   - <h4 class="modal-title">A.D.A.M. Curriculum Builder Guide</h4>
  24 + <h4 class="modal-title"><b>{{FileTitle}}</b></h4>
25 25 </div>
26 26 <div class="modal-body">
27 27 <div class="row">
28   - <div class="col-sm-4"><img src="img/popup-img.jpg" alt="" title="" class="img-responsive"></div>
  28 + <div class="col-sm-4"><img src="content/images/popup-img.jpg" alt="" title="" class="img-responsive"></div>
29 29 <div class="col-sm-8">
30   - <h4>A.D.A.M. Education</h4>
  30 + <h5><b>{{AutherName}}</b></h5>
31 31 <p>{{summary}}</p>
32 32 </div>
33 33 </div>
... ...