ADAM / AIAHTML5

Commit a134585ed4c00a7e01985e83cd6ba8903d153375

Authored by Sandeep Kumar
1 parent 879afe0f

resolve merge conflict

Inline Side-by-side
Showing 3 changed files with 61 additions and 206 deletions
.gitignore
  View file @a134585
... ... @@ -44,4 +44,5 @@ $tf*/
44 44 400-SOURCECODE/.vs/config/applicationhost.config
45 45 400-SOURCECODE/.vs/config/applicationhost.config
46 46 400-SOURCECODE/AIAHTML5.ADMIN.Web
47   -400-SOURCECODE/AIAHTML5.ADMIN.API/LogDetailsFile/LicenseCreation/LicenseCreation-30-11-18.txt
48 47 \ No newline at end of file
  48 +400-SOURCECODE/AIAHTML5.ADMIN.API/LogDetailsFile/LicenseCreation/LicenseCreation-30-11-18.txt
  49 +400-SOURCECODE/AIAHTML5.Web/Web.config
49 50 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/Web.config
  View file @a134585
... ... @@ -21,7 +21,7 @@
21 21  
22 22 </location>
23 23 <system.webServer>
24   - <rewrite>
  24 + <!--<rewrite>
25 25 <rules>
26 26 <rule name="AngularJS Routes" stopProcessing="true">
27 27 <match url=".*" />
... ... @@ -33,7 +33,7 @@
33 33 <action type="Rewrite" url="/" />
34 34 </rule>
35 35 </rules>
36   - </rewrite>
  36 + </rewrite>-->
37 37 <staticContent>
38 38  
39 39 <remove fileExtension=".mp3" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @a134585
1   -AIA.controller("CurrBuildController", ["$scope", "$rootScope", "pages", "$log", "Modules", "$http", "$compile", "$location", "$timeout", "ModuleService","$interval",
2   -function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $timeout, ModuleService,$interval) {
  1 +AIA.controller("CurrBuildController", ["$scope", "$rootScope", "pages", "$log", "Modules", "$http", "$compile", "$location", "$timeout", "ModuleService", "$interval",
  2 +function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $timeout, ModuleService, $interval) {
3 3  
4   - // $rootScope.currentActiveModuleTitle = pages[6].name;
  4 + // $rootScope.currentActiveModuleTitle = pages[6].name;
5 5 $scope.showTabButton = false;
6 6 $scope.listCurriculumBuilder = null;
7 7 $scope.dataPopup = null;
... ... @@ -538,11 +538,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
538 538 }
539 539  
540 540 $scope.openTinyMCE = function (nodeid) {
541   -<<<<<<< HEAD
542   -
543   -=======
544 541  
545   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
546 542 if ($scope.Currentselectednodeid == undefined || $scope.Currentselectednodeid != nodeid) {
547 543 console.log("instance create for id : " + nodeid);
548 544 $scope.Currentselectednodeid = nodeid;
... ... @@ -566,10 +562,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
566 562  
567 563 $scope.SelectedNotes = $scope.selectedNodeSingleObj.notes;
568 564  
569   - // clear module data
570   - ModuleService.ClearWinData();
571   - $('#CBSourceImagePanel').remove();
572   - $("#viwerSelect").empty();
  565 + // clear module data
  566 + ModuleService.ClearWinData();
  567 + $('#CBSourceImagePanel').remove();
  568 + $("#viwerSelect").empty();
573 569  
574 570 if ($('#parentcustomDiv').html() != "") {
575 571 $('#parentcustomDiv').empty();
... ... @@ -581,8 +577,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
581 577 setTimeout(function () {
582 578 if ($scope.selectedNodeSingleObj.windows != "") {
583 579 $scope.loadContentOfSelectedSlide($scope.selectedNodeSingleObj._id)
  580 +
584 581 }
585   - }, 200);
  582 + },200);
  583 +
586 584 }
587 585 else
588 586 {
... ... @@ -590,63 +588,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
590 588 }
591 589  
592 590 }
593   - }
594   -<<<<<<< HEAD
595   - $(document).on('click', '#CBTinyMCEPanel .jsglyph-remove', function () {
596   - tinymce.remove();
597   - });
598   -=======
599   -
600   - //Start Code commented by Sandeep
601   - //$scope.DropDownSelectNodeClick = function (nodeid) {
602   -
603   - // //var current_id = document.getElementById('cbSelect').value;
604   - // //traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
605   - // if ($scope.selectedNodeSingleObj._isBranch == "true") {
606   - // traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
607   - // $("#cbSelect").empty();
608   - // //for (i = 0; i < $scope.selectedNodeSingleObj.length; i++) {
609   - // localStorage.setItem("cbSelectId", nodeid);
610   - // if ($scope.selectedNodeSingleObj._id == nodeid) {
611   - // $scope.currentSlideNumber = i + 1;
612   - // $('#cbSelect').append('<option selected value="' + $scope.selectedNodeSingleObj._id + '">' + $scope.selectedNodeSingleObj._label + '</option>');
613   - // }
614   - // else {
615   - // $('#cbSelect').append('<option value="' + $scope.selectedNodeSingleObj._id + '">' + $scope.selectedNodeSingleObj._label + '</option>');
616   - // }
617   - // //}
618   - // document.getElementById("slideNumber").innerHTML = "Slide" + $scope.currentSlideNumber + " of " + $scope.selectedNodeSingleObj.length;
619   - // }
620   - // else {
621   - // traverse($rootScope.stru, nodeid);
622   - // $("#cbSelect").empty();
623   - // for (i = 0; i < $scope.selectedNodeSiblingObjs.length; i++) {
624   - // localStorage.setItem("cbSelectId", nodeid);
625   - // if ($scope.selectedNodeSiblingObjs[i]._id == nodeid) {
626   - // $scope.currentSlideNumber = i + 1;
627   - // $('#cbSelect').append('<option selected value="' + $scope.selectedNodeSiblingObjs[i]._id + '">' + $scope.selectedNodeSiblingObjs[i]._label + '</option>');
628   - // }
629   - // else {
630   - // $('#cbSelect').append('<option value="' + $scope.selectedNodeSiblingObjs[i]._id + '">' + $scope.selectedNodeSiblingObjs[i]._label + '</option>');
631   - // }
632   -
633   - // }
634   - // document.getElementById("slideNumber").innerHTML = "Slide" + $scope.currentSlideNumber + " of " + $scope.selectedNodeSiblingObjs.length;
635   - // }
636   - //}
637   - //End Code commented by Sandeep
638   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
639   -
640   - //$("CBBodyView").on("change", "#cbSelect", function () {
641   - // var datavalue = document.getElementById('cbSelect').value;
642   - // $('#jstree').jstree(true).deselect_all();
643   - // $('#jstree').jstree('select_node', datavalue);
644   - //});
  591 + }
645 592  
646 593 $rootScope.cbSelectOnChange = function (obj) {
647 594 $('#jstree').jstree(true).deselect_all();
648 595 $('#jstree').jstree('select_node', obj.value);
649   - }
  596 + }
650 597  
651 598 //Start Code by Sandeep for TicketNo: 49226(3)
652 599 $scope.DropDownSelectNodeClick = function (nodeid) {
... ... @@ -654,21 +601,21 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
654 601 //var current_id = document.getElementById('cbSelect').value;
655 602 traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
656 603 traverse($rootScope.stru, nodeid);
657   - if ($scope.selectedNodeSiblingObjs._isBranch == "true") {
658   - //traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
659   - $("#cbSelect").empty();
660   - //for (i = 0; i < $scope.selectedNodeSingleObj.length; i++) {
  604 + if ($scope.selectedNodeSingleObj._isBranch == "true") {
  605 +
  606 + $("#cbSelect").empty();
  607 +
661 608 localStorage.setItem("cbSelectId", nodeid);
662   - if ($scope.selectedNodeSiblingObjs._id == nodeid) {
  609 + if ($scope.selectedNodeSingleObj._id == nodeid) {
663 610 $scope.currentSlideNumber += 1;
664 611 $('#cbSelect').append('<option selected value="' + $scope.selectedNodeSingleObj._id + '">' + $scope.selectedNodeSingleObj._label + '</option>');
665 612 }
666 613 else {
667 614 $('#cbSelect').append('<option value="' + $scope.selectedNodeSingleObj._id + '">' + $scope.selectedNodeSingleObj._label + '</option>');
668 615 }
669   - //}
  616 +
670 617 if ($scope.selectedNodeSingleObj._isBranch == "true") {
671   - document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSiblingObjs).length;
  618 + document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length;
672 619 } else {
673 620 document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length;
674 621 }
... ... @@ -689,14 +636,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
689 636 document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSiblingObjs).length;
690 637 }
691 638 }
692   -<<<<<<< HEAD
693   -
694   - $rootScope.cbNext = function () {
695   -=======
696 639  
697 640 $rootScope.cbNext = function () {
698 641  
699   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
700 642 var cbCurrentId = document.getElementById('cbSelect').value;
701 643 traverse($rootScope.stru, cbCurrentId);
702 644 if ($scope.selectedNodeSiblingObjs.length == undefined) {
... ... @@ -708,35 +650,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
708 650 if ($scope.selectedNodeSiblingObjs[k]._id == cbCurrentId) {
709 651  
710 652 if ($scope.selectedNodeSiblingObjs[k]._isBranch == "true") {
711   -<<<<<<< HEAD
712 653 selectNextSpanId(cbCurrentId);
713 654 //$scope.nextCurrentId = $('#' + cbCurrentId).parent().next().find('span').attr('id'); // folder to child slide
714   -=======
715   -
716   - $scope.nextCurrentId = $('#' + cbCurrentId).parent().next().find('span').attr('id'); // folder to child slide
717   -
718   - }
719   - //$scope.nextCurrentId = $scope.selectedNodeSiblingObjs[k + 1]._id;
720   - else if (k + 1 >= $scope.selectedNodeSiblingObjs.length) {
721   - $scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().next().find('span').attr('id');//last slide to next parent folder
722   - //if ($scope.nextCurrentId == undefined) {
723   - // var parentLen = $('#' + cbCurrentId).parents().length;
724   - // for (i = 1; i < parentLen; i++) {
725   - // $scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().append(".parent().parent()")
726   - // .next().find('span').attr('id');
727   - // }
728   - //}
729   - if ($scope.nextCurrentId == undefined) {
730   - //$scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().next().find('span').attr('id');//next sibling
731   - $scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().parent().parent().next().find('span').attr('id');
732   - }
733   - if ($scope.nextCurrentId == undefined) {
734   - $scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().parent().parent().parent().parent().next().find('span').attr('id');
735   - }
736   - if ($scope.nextCurrentId == undefined) {
737   - $scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().parent().parent().parent().parent().parent().parent().next().find('span').attr('id');
738   - }
739   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
740 655 }
741 656 else {
742 657 selectNextSpanId(cbCurrentId);
... ... @@ -748,17 +663,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
748 663 $('#jstree').jstree('select_node', $scope.nextCurrentId);
749 664 }
750 665 }
751   -<<<<<<< HEAD
752 666  
753   - //Added code by sandeep
754 667 function selectNextSpanId(cbCurrentId) {
755 668 var counter = "0";
756   - $('.jstree-container-ul li a span').each(function () {
757   - //console.log($(this).attr("id"));
  669 + $('.jstree-container-ul li a span').each(function () {
758 670 var span_Id = $(this).attr("id");
759 671 if (span_Id == cbCurrentId) {
760 672 counter++;
761   - }
  673 + }
762 674 if (counter == 2) {
763 675 $scope.nextCurrentId = span_Id;
764 676 return false;
... ... @@ -769,25 +681,24 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
769 681 });
770 682 }
771 683  
772   - //Add code by sandeep
773 684 function selectPrevoiusSpanId(cbCurrentId) {
774 685 $scope.spanIds = [];
775 686 var counter = "0";
776 687 $('.jstree-container-ul li a span').each(function () {
  688 +
777 689 $scope.spanIds.push($(this).attr("id"));
778 690 });
779 691  
780   - for (var i = $scope.spanIds.length-1; i > 0; i--) {
781   - console.log($scope.spanIds[i]);
782   - if ($scope.spanIds[i] == cbCurrentId) {
783   - if ($scope.spanIds[1] == cbCurrentId)
784   - {
  692 + for (var a = $scope.spanIds.length - 1; a > 0; a--) {
  693 + //console.log($scope.spanIds[a]);
  694 + if ($scope.spanIds[a] == cbCurrentId) {
  695 + if ($scope.spanIds[1] == cbCurrentId){
785 696 $scope.backCurrentId = $scope.spanIds[1];
786 697 }
787 698 counter++;
788 699 }
789 700 if (counter == 2) {
790   - $scope.backCurrentId = $scope.spanIds[i];
  701 + $scope.backCurrentId = $scope.spanIds[a];
791 702 break;
792 703 }
793 704 if (counter == 1) {
... ... @@ -797,61 +708,24 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
797 708 }
798 709  
799 710 $rootScope.cbBack = function () {
800   -=======
801   - $rootScope.cbBack = function () {
802   -
803   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
804 711 var cbCurrentId = document.getElementById('cbSelect').value;
805 712 traverse($rootScope.stru, cbCurrentId);
806 713 for (var k = 0; k < $scope.selectedNodeSiblingObjs.length; k++) {
807 714 if ($scope.selectedNodeSiblingObjs[k]._id == cbCurrentId) {
808 715  
809   - if ($scope.selectedNodeSiblingObjs[k]._isBranch == "true") {
810   -
  716 + if ($scope.selectedNodeSiblingObjs[k]._isBranch == "true") {
811 717 $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().prev().find('span').attr('id'); // Privious child slide
812 718 selectPrevoiusSpanId(cbCurrentId);
813 719 }
814   -<<<<<<< HEAD
815   - else{
  720 + else {
816 721 selectPrevoiusSpanId(cbCurrentId);
817   - }
818   -=======
819   - else if (k == 0) { // frist to prev
820   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().prev().find('span').attr('id'); // frist slide to prev parent folder
821   - }
822   - else if (k == $scope.selectedNodeSiblingObjs.length - 1) { // last to prev parent
823   - //$scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().prev().find('span').attr('id'); // Cuurent prev parent
824   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().prev().find('span').attr('id');// Last slide to cuuent prev slide
825   - }
826   - else if (k - 1 >= $scope.selectedNodeSiblingObjs.length) {
827   - //$scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().next().find('span').attr('id');//last slide to next parent folder
828   -
829   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().prev().find('span').attr('id');
830   -
831   - if ($scope.backCurrentId == undefined) {
832   - //$scope.nextCurrentId = $('#' + cbCurrentId).parent().parent().next().find('span').attr('id');//next sibling
833   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().parent().parent().prev().find('span').attr('id');
834   - }
835   - if ($scope.backCurrentId == undefined) {
836   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().parent().parent().parent().parent().prev().find('span').attr('id');
837   - }
838   - if ($scope.backCurrentId == undefined) {
839   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().parent().parent().parent().parent().parent().parent().parent().parent().prev().find('span').attr('id');
840   - }
841   - }
842   - else if (k - 1 < $scope.selectedNodeSiblingObjs.length) {
843   -
844   - $scope.backCurrentId = $('#' + cbCurrentId).parent().parent().prev().find('span').attr('id'); //prev sibling
845   - }
846   -
847   -
848   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
  722 + }
849 723 }
850 724 }
851 725 $('#jstree').jstree(true).deselect_all();
852 726 $('#jstree').jstree('select_node', $scope.backCurrentId);
853 727 }
854   - //End Code by Sandeep for TicketNo: 49226
  728 + //End Code by Sandeep for TicketNo: 49226(3)
855 729  
856 730 function traverse(o, current_id) {
857 731 for (var i in o) {
... ... @@ -1271,6 +1145,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1271 1145 }
1272 1146  
1273 1147 }
  1148 +
  1149 +
1274 1150 }
1275 1151 function traverseTreeSelectedSingleObj(o, current_id) {
1276 1152  
... ... @@ -1292,12 +1168,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1292 1168 });
1293 1169  
1294 1170  
1295   -<<<<<<< HEAD
1296   - $scope.loadContentOfSelectedSlide = function (id) {
1297   -=======
1298 1171 $scope.loadContentOfSelectedSlide = function (id) {
1299   -
1300   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
1301 1172 // alert("Id" + id);
1302 1173 console.log("id= " + id)
1303 1174 var content = $rootScope.cbJsonData.slideshow.content.element;
... ... @@ -1326,17 +1197,18 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1326 1197 // imageSourc = subS1[1];
1327 1198  
1328 1199  
1329   - windowData = JSON.parse(allwindowData[i]);
  1200 + windowData = JSON.parse(allwindowData[i])
1330 1201  
1331 1202 if (windowData.mType == "MY_PICTURES") {
1332 1203 $rootScope.windowsimageSource = windowData.imageSource;
1333 1204 $rootScope.windowstitle = windowData.windowTitle;
1334   - $scope.openImagePanel();
  1205 + $scope.openImagePanel();
1335 1206 }
1336 1207 }
1337 1208 else {
1338 1209  
1339   - windowData = JSON.parse(allwindowData[i]);
  1210 + windowData = JSON.parse(allwindowData[i])
  1211 +
1340 1212  
1341 1213 // **** Use this code when all module complted
1342 1214 // var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
... ... @@ -1352,7 +1224,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1352 1224 if (isFound == -1) {
1353 1225 $scope.LoadModuleName.push(windowData.mType);
1354 1226  
1355   - }
  1227 + }
1356 1228  
1357 1229 }
1358 1230 else if (windowData.mType == "ATLAS_ANATOMY") {
... ... @@ -1360,8 +1232,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1360 1232 AtlasWindowId = AtlasWindowId + 1;
1361 1233 var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
1362 1234 if (isFound == -1) {
1363   - $scope.LoadModuleName.push(windowData.mType);
1364   - }
  1235 + $scope.LoadModuleName.push(windowData.mType);
  1236 + }
1365 1237 }
1366 1238  
1367 1239 }
... ... @@ -1372,17 +1244,17 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1372 1244 windowData = JSON.parse(allwindowData);
1373 1245  
1374 1246 if (windowData.mType != "MY_PICTURES") {
1375   - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
  1247 + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
1376 1248 if (isFound == -1) {
1377 1249 $scope.LoadModuleName.push(windowData.mType);
1378 1250 }
1379   - }
  1251 + }
1380 1252  
1381 1253 if (windowData.mType == "MY_PICTURES") {
1382 1254 $rootScope.windowsimageSource = windowData.imageSource;
1383 1255 $rootScope.windowstitle = windowData.windowTitle;
1384 1256 $scope.openImagePanel();
1385   -
  1257 +
1386 1258 }
1387 1259 else if (windowData.mType == "DISSECTIBLE_ANATOMY") {
1388 1260 ModuleService.setModuleData(JSON.parse(allwindowData), DawindowId, $scope.Slidenumber);
... ... @@ -1394,25 +1266,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1394 1266 }
1395 1267  
1396 1268 // intially call module at index 0
1397   -<<<<<<< HEAD
1398   - $scope.$emit("LoadModuleComplete", "", $scope.Slidenumber);
1399   -
1400   - }
1401   -
1402   - $scope.$on("LoadModuleComplete", function (evt, name,slideno) {
1403   -
1404   -=======
1405 1269 $scope.$emit("LoadModuleComplete", "", $scope.Slidenumber);
1406 1270  
1407 1271 }
1408 1272  
1409   - $scope.$on("LoadModuleComplete", function (evt, name,slideno) {
  1273 + $scope.$on("LoadModuleComplete", function (evt, name, slideno) {
1410 1274  
1411   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
1412 1275 if ($scope.LoadModuleName != undefined) {
1413 1276  
1414   - if (slideno == $scope.Slidenumber)
1415   - {
  1277 + if (slideno == $scope.Slidenumber) {
1416 1278 var index = $scope.LoadModuleName.indexOf(name);
1417 1279 if (index != -1) {
1418 1280 // remove module which one is loaded
... ... @@ -1424,7 +1286,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1424 1286 $scope.loadModuleWithCB(nextmodulename);
1425 1287  
1426 1288 }
1427   -<<<<<<< HEAD
1428 1289 else { //Added Code by sandeep for user story-52696
1429 1290 var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
1430 1291 if (modulePanel != undefined && modulePanel != null) {
... ... @@ -1432,16 +1293,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1432 1293 }
1433 1294 for (var i = 0 ; i < modulePanel.length; i++) {
1434 1295 var paneld = modulePanel[i].id;
1435   - var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
  1296 + var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
1436 1297 $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>');
1437 1298 }
1438   -
1439   -
1440   - }
1441   -
1442   -=======
1443 1299  
1444   ->>>>>>> b3db3c0a747c649118f69f413eace8609710474d
  1300 +
  1301 + }
  1302 +
1445 1303 }
1446 1304  
1447 1305 }
... ... @@ -1451,8 +1309,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1451 1309  
1452 1310 $scope.loadModuleWithCB = function (moduleName) {
1453 1311  
1454   - if(moduleName=="DISSECTIBLE_ANATOMY")
1455   - {
  1312 + if (moduleName == "DISSECTIBLE_ANATOMY") {
1456 1313 var DAData = ModuleService.getModuleData(moduleName);
1457 1314  
1458 1315 if (DAData != undefined && DAData.length > 0) {
... ... @@ -1460,8 +1317,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1460 1317 }
1461 1318  
1462 1319 }
1463   - else if(moduleName=="ATLAS_ANATOMY")
1464   - {
  1320 + else if (moduleName == "ATLAS_ANATOMY") {
1465 1321 var AAData = ModuleService.getModuleData(moduleName);
1466 1322  
1467 1323 if (AAData != undefined && AAData.length > 0) {
... ... @@ -1470,14 +1326,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1470 1326  
1471 1327 }
1472 1328  
1473   -
1474 1329 }
1475 1330  
1476 1331 $scope.loadAtlasAnatomyModule = function () {
1477 1332 $rootScope.isCallFromOtherModule = true;
1478 1333 //slide number to terminate last load module on prev slide
1479 1334 // aaCustomModuleDiv new div create for new slide load
1480   - $('#parentcustomDiv').append($('<div id="aaCustomModuleDiv'+$scope.Slidenumber+'"></div>'));
  1335 + $('#parentcustomDiv').append($('<div id="aaCustomModuleDiv' + $scope.Slidenumber + '"></div>'));
1481 1336 $e = $('#aaCustomModuleDiv' + $scope.Slidenumber).append("<atlas-anatomy-directive></atlas-anatomy-directive>");
1482 1337 $compile($e)($scope);
1483 1338 }
... ... @@ -1492,17 +1347,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1492 1347  
1493 1348 $compile($e)($scope);
1494 1349  
1495   - }
  1350 + }
1496 1351  
1497 1352 //Added code by sandeep for user story-52696
1498   - $rootScope.viwerSelectOnChange = function (obj) {
  1353 + $rootScope.viwerSelectOnChange = function (obj) {
  1354 + //var selectedText = $("#viwerSelect option:selected").text();
1499 1355 var selected_Id = $("#viwerSelect option:selected").val();
1500 1356 if (selected_Id != "0") {
1501 1357 $('body,html').animate({ scrollTop: $('#' + selected_Id).position().top }, 2000);
1502   - }
1503   -
  1358 + }
1504 1359 }
1505   -
1506   -
1507 1360 }]
1508 1361 );
  1362 +
... ...