Commit 4dd781628af7b3c61eff35d727d30d66eb7447f4

Authored by Birendra Kumar
1 parent 894c2d19

Update CA on load slide

400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
1 -AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService",  
2 -function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) { 1 +AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService", "ModuleService", "$interval",
  2 +function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService, ModuleService, $interval) {
3 3
4 $scope.showTabButton = true; 4 $scope.showTabButton = true;
5 $scope.AnimationData; 5 $scope.AnimationData;
@@ -41,7 +41,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -41,7 +41,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
41 'AnimationData': [], 41 'AnimationData': [],
42 'searchCAListViewData': [], 42 'searchCAListViewData': [],
43 'CAImagePath': '', 43 'CAImagePath': '',
44 - // 'LowerSummary': '',  
45 'moduleName': '', 44 'moduleName': '',
46 'currentViewTitle': '', 45 'currentViewTitle': '',
47 'parentSlugName': '', 46 'parentSlugName': '',
@@ -51,7 +50,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -51,7 +50,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
51 'clickedCAVideo': '', 50 'clickedCAVideo': '',
52 'clickedCASummary': '', 51 'clickedCASummary': '',
53 'hostedFolderId': '', 52 'hostedFolderId': '',
54 - 'isShowBodyWithCBData': false 53 + 'isTextVisible': true
55 }); 54 });
56 55
57 } 56 }
@@ -71,7 +70,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -71,7 +70,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
71 'AnimationData': [], 70 'AnimationData': [],
72 'searchCAListViewData': [], 71 'searchCAListViewData': [],
73 'CAImagePath': '', 72 'CAImagePath': '',
74 - // 'LowerSummary': '',  
75 'moduleName': '', 73 'moduleName': '',
76 'currentViewTitle': '', 74 'currentViewTitle': '',
77 'parentSlugName': '', 75 'parentSlugName': '',
@@ -81,7 +79,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -81,7 +79,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
81 'clickedCAVideo': '', 79 'clickedCAVideo': '',
82 'clickedCASummary': '', 80 'clickedCASummary': '',
83 'hostedFolderId': '', 81 'hostedFolderId': '',
84 - 'isShowBodyWithCBData': false 82 + 'isTextVisible': true
85 }); 83 });
86 84
87 } 85 }
@@ -365,10 +363,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -365,10 +363,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
365 } 363 }
366 364
367 } 365 }
368 -  
369 -  
370 -  
371 - 366 +
372 $scope.hiderow = true; 367 $scope.hiderow = true;
373 if ($scope.filterstring == false) { 368 if ($scope.filterstring == false) {
374 369
@@ -457,10 +452,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -457,10 +452,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
457 452
458 $scope.filterstring = true; 453 $scope.filterstring = true;
459 454
460 - //while ($scope.searchCAListViewData.length) {  
461 - // $scope.searchCAListViewData.pop();  
462 - //}  
463 -  
464 $scope.SetCAwindowStoreData(windowviewid, 'searchCAListViewData', []); 455 $scope.SetCAwindowStoreData(windowviewid, 'searchCAListViewData', []);
465 456
466 filtercount = 0; 457 filtercount = 0;
@@ -488,8 +479,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -488,8 +479,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
488 localStorage.setItem("CACurSpeciality", ''); 479 localStorage.setItem("CACurSpeciality", '');
489 } 480 }
490 481
491 -  
492 -  
493 $scope.selectedCAListViewData = $scope.GetCAwindowStoreData(windowviewid, 'AnimationData'); 482 $scope.selectedCAListViewData = $scope.GetCAwindowStoreData(windowviewid, 'AnimationData');
494 483
495 $('#grid-view').empty(); 484 $('#grid-view').empty();
@@ -557,7 +546,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -557,7 +546,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
557 }); 546 });
558 547
559 548
560 - $scope.searchCAListViewData.push( 549 + calistviewdata.push(
561 { 550 {
562 "_id": value._id, 551 "_id": value._id,
563 "_ImageId": value._ImageId, 552 "_ImageId": value._ImageId,
@@ -595,8 +584,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -595,8 +584,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
595 $("html,body").scrollTop(0); 584 $("html,body").scrollTop(0);
596 } 585 }
597 586
598 -  
599 -  
600 $scope.openView = function ($event) { 587 $scope.openView = function ($event) {
601 var windowviewid = $rootScope.MULTI_VIEW_ID; 588 var windowviewid = $rootScope.MULTI_VIEW_ID;
602 589
@@ -624,18 +611,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -624,18 +611,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
624 $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', $rootScope.ViewTitle); 611 $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', $rootScope.ViewTitle);
625 $scope.SetCAwindowStoreData(windowviewid, 'imageId', $event.currentTarget.id); 612 $scope.SetCAwindowStoreData(windowviewid, 'imageId', $event.currentTarget.id);
626 613
627 - /// var imageName = selectedTileData[0]._ThumbnailImage;  
628 -  
629 - // $scope.SetCAwindowStoreData(windowviewid, 'imageName', imageName);  
630 -  
631 - // var imagePath = "~/../content/images/ca/thumbnails/" + imageName;  
632 -  
633 - // $scope.SetCAwindowStoreData(windowviewid, 'CAImagePath', imagePath);  
634 -  
635 - // var selectedImageCALowerSummary = selectedTileData[0]._LowerSummary  
636 -  
637 - // $scope.SetCAwindowStoreData(windowviewid, 'LowerSummary', selectedImageCALowerSummary);  
638 -  
639 var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist_mp4link.json') 614 var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist_mp4link.json')
640 promise.then( 615 promise.then(
641 function (result) { 616 function (result) {
@@ -727,7 +702,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -727,7 +702,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
727 $rootScope.MULTI_VIEW_ID += 1; 702 $rootScope.MULTI_VIEW_ID += 1;
728 var windowviewid = $rootScope.MULTI_VIEW_ID; 703 var windowviewid = $rootScope.MULTI_VIEW_ID;
729 704
730 - $scope.initializeCIWindowData(windowviewid, false, $scope.caOpenInOtherModules.currentWindowId); 705 + $scope.initializeCAWindowData(windowviewid, false, $scope.caOpenInOtherModules.currentWindowId);
731 706
732 var moduleName = $scope.caOpenInOtherModules.mType; 707 var moduleName = $scope.caOpenInOtherModules.mType;
733 $scope.SetCAwindowStoreData(windowviewid, 'moduleName', moduleName); 708 $scope.SetCAwindowStoreData(windowviewid, 'moduleName', moduleName);
@@ -737,27 +712,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -737,27 +712,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
737 function (result) { 712 function (result) {
738 713
739 $scope.CAlistViewData = result.root.CAData; 714 $scope.CAlistViewData = result.root.CAData;
740 - var id = $scope.GetCAwindowStoreData(windowviewid, 'imageId'); 715 + // serial no of imageid
  716 + var imageId = $scope.caOpenInOtherModules.id;
741 717
742 var clickedCAVideoData = []; 718 var clickedCAVideoData = [];
743 clickedCAVideoData = new jinqJs() 719 clickedCAVideoData = new jinqJs()
744 .from($scope.CAlistViewData) 720 .from($scope.CAlistViewData)
745 - .where('_id == ' + id) 721 + .where('_id == ' + imageId)
746 .select('_Video', '_LowerSummary', '_HostedFolderId'); 722 .select('_Video', '_LowerSummary', '_HostedFolderId');
747 723
748 - // serial no of imageid  
749 - var imageId = $scope.caOpenInOtherModules.id;  
750 - 724 + if (clickedCAVideoData.length == 0)
  725 + {
  726 + $rootScope.CAWindowLoadComplete = true
  727 + return;
  728 + }
  729 +
751 $scope.SetCAwindowStoreData(windowviewid, 'imageId', imageId); 730 $scope.SetCAwindowStoreData(windowviewid, 'imageId', imageId);
752 -  
753 - //var imageName = selectedTileData[0]._ThumbnailImage;  
754 -  
755 - // $scope.SetCAwindowStoreData(windowviewid, 'imageName', imageName);  
756 -  
757 - // var imagePath = "~/../content/images/ca/thumbnails/" + imageName;  
758 -  
759 - // $scope.SetCAwindowStoreData(windowviewid, 'CAImagePath', imagePath);  
760 - 731 +
761 var clickedCAVideo = clickedCAVideoData[0]._Video; 732 var clickedCAVideo = clickedCAVideoData[0]._Video;
762 var clickedCASummary = clickedCAVideoData[0]._LowerSummary; 733 var clickedCASummary = clickedCAVideoData[0]._LowerSummary;
763 var hostedFolderId = clickedCAVideoData[0]._HostedFolderId; 734 var hostedFolderId = clickedCAVideoData[0]._HostedFolderId;
@@ -767,9 +738,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -767,9 +738,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
767 $scope.SetCAwindowStoreData(windowviewid, 'hostedFolderId', hostedFolderId); 738 $scope.SetCAwindowStoreData(windowviewid, 'hostedFolderId', hostedFolderId);
768 739
769 740
770 - // var selectedImageCALowerSummary = selectedTileData[0]._LowerSummary 741 + var isTextVisible = $scope.caOpenInOtherModules.textVisible;
771 742
772 - // $scope.SetCAwindowStoreData(windowviewid, 'LowerSummary', selectedImageCALowerSummary); 743 + $scope.SetCAwindowStoreData(windowviewid, 'isTextVisible', isTextVisible);
773 744
774 var ciTitle = $scope.caOpenInOtherModules.anatomyTitle; 745 var ciTitle = $scope.caOpenInOtherModules.anatomyTitle;
775 $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', ciTitle); 746 $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
@@ -788,7 +759,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -788,7 +759,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
788 ); 759 );
789 } 760 }
790 else { 761 else {
791 - $scope.SetCAwindowStoreData($rootScope.MULTI_VIEW_ID, 'parentSlugName', 'clinical-illustrations'); 762 + $scope.SetCAwindowStoreData($rootScope.MULTI_VIEW_ID, 'parentSlugName', 'clinical-animations');
792 $scope.loadCAAnimation($rootScope.MULTI_VIEW_ID); 763 $scope.loadCAAnimation($rootScope.MULTI_VIEW_ID);
793 } 764 }
794 765
@@ -813,7 +784,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -813,7 +784,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
813 $rootScope.isLoading = true; 784 $rootScope.isLoading = true;
814 $('#spinner').css('visibility', 'visible'); 785 $('#spinner').css('visibility', 'visible');
815 786
816 - $scope.jsPanelID = 'caVideoPanel' + '_' + windowviewid; 787 + // $scope.jsPanelID = 'caVideoPanel' + '_' + windowviewid;
  788 + //changes to find the id by partail match
  789 + $scope.jsPanelID = 'caImagePanel' + '_' + windowviewid;
817 790
818 var clickedCAVideo = $scope.GetCAwindowStoreData(windowviewid, 'clickedCAVideo'); 791 var clickedCAVideo = $scope.GetCAwindowStoreData(windowviewid, 'clickedCAVideo');
819 var clickedCASummary = $scope.GetCAwindowStoreData(windowviewid, 'clickedCASummary'); 792 var clickedCASummary = $scope.GetCAwindowStoreData(windowviewid, 'clickedCASummary');
@@ -833,16 +806,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -833,16 +806,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
833 if ($rootScope.isCallFromOtherModule) { 806 if ($rootScope.isCallFromOtherModule) {
834 // open JS panel for curriculum with define cornonate in CB jason 807 // open JS panel for curriculum with define cornonate in CB jason
835 $scope.jsPanelWidth = $scope.caOpenInOtherModules.size.width;//1000; 808 $scope.jsPanelWidth = $scope.caOpenInOtherModules.size.width;//1000;
  809 + if ($scope.caOpenInOtherModules.size.width < 900)
  810 + $scope.jsPanelWidth = 900;
  811 +
836 $scope.jsPanelHeight = $scope.caOpenInOtherModules.size.height; 812 $scope.jsPanelHeight = $scope.caOpenInOtherModules.size.height;
837 - if ($scope.caOpenInOtherModules.size.height > 540)  
838 - $scope.jsPanelHeight = 540; 813 + if ($scope.caOpenInOtherModules.size.height > 510)
  814 + $scope.jsPanelHeight = 510;
839 $scope.jsPanelLeft = 320; 815 $scope.jsPanelLeft = 320;
840 $scope.jsPanelTop = $rootScope.cBModulejsPanelTop(); 816 $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
841 817
842 } 818 }
843 else { 819 else {
844 $scope.jsPanelWidth = $(window).outerWidth() - 10; 820 $scope.jsPanelWidth = $(window).outerWidth() - 10;
845 - $scope.jsPanelHeight = $(window).outerHeight() - 110; 821 + $scope.jsPanelHeight = $(window).outerHeight() - 105;
846 $scope.jsPanelLeft = 1; 822 $scope.jsPanelLeft = 1;
847 $scope.jsPanelTop = 70; 823 $scope.jsPanelTop = 70;
848 } 824 }
@@ -858,10 +834,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -858,10 +834,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
858 selector: '.caView', 834 selector: '.caView',
859 theme: 'success', 835 theme: 'success',
860 currentController: 'CAController', 836 currentController: 'CAController',
861 - parentSlug: 'clinical-animations',  
862 - content: '<script src="' + playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +  
863 - 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +  
864 - ' poster="' + poster + '"' + 837 + parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'),
  838 + content: '<script src="' + playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo_' + windowviewid + '").pause();$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");}});});</script>' +
  839 + '<div id="pid" class="row"><div id="divplayerinlineVideo_' + windowviewid + '" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
  840 + 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo_' + windowviewid + '" onloadstart="videoOnLoad(event)"' +
  841 + ' poster="' + poster + '"' +
865 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' + 842 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
866 ' ad="' + admp4 + '"' + 843 ' ad="' + admp4 + '"' +
867 ' nonad="' + clickedCAVideo + '"' + 844 ' nonad="' + clickedCAVideo + '"' +
@@ -874,7 +851,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -874,7 +851,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
874 ' kind="captions" srclang="en" label="On"><object width="640" height="360"' + 851 ' kind="captions" srclang="en" label="On"><object width="640" height="360"' +
875 ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' + 852 ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
876 ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' + 853 ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
877 - ' <param name="flashvars" ng-value="controls=true&amp;file=' + clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + clickedCASummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button></div></div></div>', 854 + ' <param name="flashvars" ng-value="controls=true&amp;file=' + clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid_' + windowviewid + '" align="left" style="height:40px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + clickedCASummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
878 855
879 title: tittle, 856 title: tittle,
880 position: { 857 position: {
@@ -890,17 +867,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -890,17 +867,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
890 }); 867 });
891 868
892 869
893 - $rootScope.currentSlug = 'clinical-animations-detail'; 870 + $scope.SetCAwindowStoreData(windowviewid, 'currentSlug', 'clinical-animations-detail');
894 $('html, body').animate({ scrollTop: 0 }); 871 $('html, body').animate({ scrollTop: 0 });
895 $rootScope.openViews.push( 872 $rootScope.openViews.push(
896 { 873 {
897 "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, 874 "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
898 - "slug": $rootScope.currentSlug 875 + "slug": $scope.GetCAwindowStoreData(windowviewid, 'currentSlug')
899 }); 876 });
900 877
901 878
902 var jspContentHeight = $('.jsPanel-content').height(); 879 var jspContentHeight = $('.jsPanel-content').height();
903 - var videoHeight = $('#divplayerinlineVideo div').height(); 880 + var videoHeight = $('#divplayerinlineVideo_'+ windowviewid +' div').height();
904 if (videoHeight <= 0) 881 if (videoHeight <= 0)
905 videoHeight = 360; 882 videoHeight = 360;
906 var textH = $('.video-subtitle').height(); 883 var textH = $('.video-subtitle').height();
@@ -909,21 +886,56 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -909,21 +886,56 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
909 886
910 if ($('.jsPanel-content').length > 0) { 887 if ($('.jsPanel-content').length > 0) {
911 $('.video-subtitle').css('margin-bottom', blackBorderHeight); 888 $('.video-subtitle').css('margin-bottom', blackBorderHeight);
912 - $('#divplayerinlineVideo').css('background', '#fff'); 889 + $('#divplayerinlineVideo_'+ windowviewid ).css('background', '#fff');
913 //Android > Clinical Animations > The animation does not fit to the screen in the Landscape mode. 890 //Android > Clinical Animations > The animation does not fit to the screen in the Landscape mode.
914 var $ua = navigator.userAgent; 891 var $ua = navigator.userAgent;
915 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { $('.jsPanel-content').css("width", "100%"); } 892 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { $('.jsPanel-content').css("width", "100%"); }
916 } 893 }
  894 +
  895 + }
  896 +
  897 + if (!$rootScope.isCallFromOtherModule) {
  898 + $('#CAView').css("height", $(window).outerHeight() - 20);
  899 +
  900 + $('#CAView').css("width", $(window).outerWidth() - 30);
917 901
918 } 902 }
  903 +
  904 + }
919 905
  906 + $scope.videoOnLoad = function (windowviewid)
  907 + {
  908 + $rootScope.isLoading = false;
  909 + $('#spinner').css('visibility', 'hidden');
920 910
921 -  
922 - //console.log($rootScope.openViews);  
923 - $('#CAView').css("height", $(window).outerHeight()); 911 + if ($rootScope.isCallFromOtherModule) {
  912 + $scope.JsPanelclick(windowviewid);
  913 + $rootScope.CAWindowLoadComplete = true;
  914 + }
924 915
925 - $('#CAView').css("width", $(window).outerWidth()-20); 916 + var isTextVisible = $scope.GetCAwindowStoreData(windowviewid, 'isTextVisible');
926 917
  918 +
  919 + if(isTextVisible)
  920 + {
  921 + $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
  922 + }
  923 + else
  924 + {
  925 + $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
  926 +
  927 + }
  928 +
  929 + }
  930 +
  931 + $scope.JsPanelclick = function (windowviewid) {
  932 + // call from while open module in CB
  933 + $("#caImagePanel_" + windowviewid).on('click', function (event) {
  934 +
  935 + // var pnlName = event.currentTarget.id;
  936 + $scope.$emit("cBEnableDisableMenuOption", "");
  937 +
  938 + });
927 } 939 }
928 940
929 $scope.loadCAPlayer = function (summary, link, vidNumber) { 941 $scope.loadCAPlayer = function (summary, link, vidNumber) {
@@ -975,10 +987,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -975,10 +987,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
975 } 987 }
976 988
977 989
978 -}] 990 +}]);
  991 +
  992 +
  993 +function videoOnLoad(event) {
979 994
  995 + console.log('video loaded')
  996 + var scope = angular.element(document.getElementById("CAView")).scope();
  997 + // var len = (event.target.id).split("_").length;
  998 + var windowviewid = (event.target.id).split("_")[1];
980 999
981 -); 1000 + scope.$apply(function () {
  1001 + scope.videoOnLoad(windowviewid);
  1002 + });
  1003 +}
982 1004
983 1005
984 1006
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -65,7 +65,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -65,7 +65,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
65 'currentSlug': '', 65 'currentSlug': '',
66 'imageId': '', 66 'imageId': '',
67 'imageName': '', 67 'imageName': '',
68 - 'isShowBodyWithCBData': false 68 + 'isTextVisible': true
69 }); 69 });
70 70
71 } 71 }
@@ -92,7 +92,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -92,7 +92,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
92 'currentSlug': '', 92 'currentSlug': '',
93 'imageId': '', 93 'imageId': '',
94 'imageName': '', 94 'imageName': '',
95 - 'isShowBodyWithCBData':false 95 + 'isTextVisible': true
96 }); 96 });
97 97
98 } 98 }
@@ -758,6 +758,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -758,6 +758,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
758 758
759 $scope.SetCIwindowStoreData(windowviewid, 'ImageSummary', selectedImageCISummary); 759 $scope.SetCIwindowStoreData(windowviewid, 'ImageSummary', selectedImageCISummary);
760 760
  761 + var isTextVisible = $scope.ciOpenInOtherModules.textVisible;
  762 +
  763 + $scope.SetCIwindowStoreData(windowviewid, 'isTextVisible', isTextVisible);
  764 +
761 var ciTitle = $scope.ciOpenInOtherModules.anatomyTitle; 765 var ciTitle = $scope.ciOpenInOtherModules.anatomyTitle;
762 $scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle); 766 $scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
763 localStorage.setItem("currentViewTitle", ciTitle); 767 localStorage.setItem("currentViewTitle", ciTitle);
@@ -883,8 +887,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -883,8 +887,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
883 $scope.JsPanelclick(windowviewid); 887 $scope.JsPanelclick(windowviewid);
884 } 888 }
885 889
886 - $scope.SetCIwindowStoreData(windowviewid, 'isShowBodyWithCBData', false);  
887 $rootScope.CIWindowLoadComplete = true; 890 $rootScope.CIWindowLoadComplete = true;
  891 +
  892 + var isTextVisible = $scope.GetCIwindowStoreData(windowviewid, 'isTextVisible');
  893 +
  894 +
  895 + if (isTextVisible) {
  896 + $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
  897 + }
  898 + else {
  899 + $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
  900 +
  901 + }
  902 +
888 }); 903 });
889 904
890 } 905 }
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -50,7 +50,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -50,7 +50,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
50 } 50 }
51 //Added code by sandeep for fixed Bug-58066 51 //Added code by sandeep for fixed Bug-58066
52 var ddlViewerLen = $("#viwerSelect option").length; 52 var ddlViewerLen = $("#viwerSelect option").length;
53 - if (ddlViewerLen == 1) { 53 + if (ddlViewerLen == 0) {
54 $('#viwerSelect').hide(); 54 $('#viwerSelect').hide();
55 } 55 }
56 }); 56 });
@@ -1209,7 +1209,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1209,7 +1209,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1209 var imageSourc; 1209 var imageSourc;
1210 var DawindowId = 0; 1210 var DawindowId = 0;
1211 var AtlasWindowId = 0; 1211 var AtlasWindowId = 0;
1212 - var ClinicalWindowId = 0; 1212 + var CIWindowId = 0;
  1213 + var CAWindowId = 0;
1213 $scope.LoadModuleName = []; 1214 $scope.LoadModuleName = [];
1214 $scope.Slidenumber = id; 1215 $scope.Slidenumber = id;
1215 1216
@@ -1262,8 +1263,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1262,8 +1263,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1262 } 1263 }
1263 } 1264 }
1264 else if (windowData.mType == "CLINICAL_ILLUSTRATIONS") { 1265 else if (windowData.mType == "CLINICAL_ILLUSTRATIONS") {
1265 - ModuleService.setModuleData(windowData, ClinicalWindowId, $scope.Slidenumber);  
1266 - ClinicalWindowId = ClinicalWindowId + 1; 1266 + ModuleService.setModuleData(windowData, CIWindowId, $scope.Slidenumber);
  1267 + CIWindowId = CIWindowId + 1;
  1268 + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
  1269 + if (isFound == -1) {
  1270 + $scope.LoadModuleName.push(windowData.mType);
  1271 + }
  1272 + }
  1273 + else if (windowData.mType == "CLINICAL_ANIMATIONS") {
  1274 + ModuleService.setModuleData(windowData, CAWindowId, $scope.Slidenumber);
  1275 + CAWindowId = CAWindowId + 1;
1267 var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) 1276 var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
1268 if (isFound == -1) { 1277 if (isFound == -1) {
1269 $scope.LoadModuleName.push(windowData.mType); 1278 $scope.LoadModuleName.push(windowData.mType);
@@ -1303,7 +1312,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1303,7 +1312,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1303 if (isFound == -1) { 1312 if (isFound == -1) {
1304 $scope.LoadModuleName.push(windowData.mType); 1313 $scope.LoadModuleName.push(windowData.mType);
1305 } 1314 }
1306 - ModuleService.setModuleData(windowData, ClinicalWindowId, $scope.Slidenumber); 1315 + ModuleService.setModuleData(windowData, CIWindowId, $scope.Slidenumber);
  1316 +
  1317 + }
  1318 + else if (windowData.mType == "CLINICAL_ANIMATIONS") {
  1319 + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
  1320 + if (isFound == -1) {
  1321 + $scope.LoadModuleName.push(windowData.mType);
  1322 + }
  1323 + ModuleService.setModuleData(windowData, CAWindowId, $scope.Slidenumber);
1307 1324
1308 } 1325 }
1309 1326
@@ -1333,7 +1350,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1333,7 +1350,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1333 else { //Added Code by sandeep for user story-52696 1350 else { //Added Code by sandeep for user story-52696
1334 var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); 1351 var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
1335 if (modulePanel != undefined && modulePanel != null) { 1352 if (modulePanel != undefined && modulePanel != null) {
1336 - $('#viwerSelect').append('<option selected value="' + 0 + '">' + "Select Viewer" + '</option>'); 1353 + // $('#viwerSelect').append('<option selected value="' + 0 + '">' + "Select Viewer" + '</option>');
  1354 +
1337 //Added code by sandeep for fixed Bug-58066 1355 //Added code by sandeep for fixed Bug-58066
1338 if (modulePanel.length > 0) { 1356 if (modulePanel.length > 0) {
1339 $('#viwerSelect').show(); 1357 $('#viwerSelect').show();
@@ -1347,10 +1365,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1347,10 +1365,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1347 var panelTitle = document.getElementById(paneld).childNodes[0].innerText; 1365 var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
1348 $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>'); 1366 $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>');
1349 } 1367 }
1350 -  
1351 - // cb panel loader for HomeContainerDiv  
1352 - 1368 +
1353 $scope.CBEnableUI(); 1369 $scope.CBEnableUI();
  1370 + // scroll down to first panel
  1371 + var lastpanel = modulePanel[0].id;
  1372 + $('body,html').animate({ scrollTop: $('#' + lastpanel).position().top }, 1000);
  1373 +
1354 } 1374 }
1355 1375
1356 } 1376 }
@@ -1385,8 +1405,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ @@ -1385,8 +1405,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1385 } 1405 }
1386 1406
1387 } 1407 }
  1408 + else if (moduleName == "CLINICAL_ANIMATIONS") {
  1409 + var CAData = ModuleService.getModuleData(moduleName);
  1410 +
  1411 + if (CAData != undefined && CAData.length > 0) {
  1412 + $scope.loadClinicalAnimationModule();
  1413 + }
  1414 +
  1415 + }
1388 1416
1389 } 1417 }
  1418 + $scope.loadClinicalAnimationModule = function () {
  1419 + $rootScope.isCallFromOtherModule = true;
  1420 + $('#parentcustomDiv').append($('<div id="caCustomModuleDiv' + $scope.Slidenumber + '"></div>'));
  1421 + $e = $('#caCustomModuleDiv' + $scope.Slidenumber).append("<clinical-animation-directive></clinical-animation-directive>");
  1422 + $compile($e)($scope);
  1423 + }
1390 1424
1391 $scope.loadClinicalIllustrationModule = function () { 1425 $scope.loadClinicalIllustrationModule = function () {
1392 $rootScope.isCallFromOtherModule = true; 1426 $rootScope.isCallFromOtherModule = true;
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1526,8 +1526,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A @@ -1526,8 +1526,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
1526 if ($('#aiImagePanel').length > 0) 1526 if ($('#aiImagePanel').length > 0)
1527 $('#aiImagePanel').remove(); 1527 $('#aiImagePanel').remove();
1528 1528
1529 - if ($('#caVideoPanel').length > 0)  
1530 - $('#caVideoPanel').remove(); 1529 + //if ($('#caVideoPanel').length > 0)
  1530 + // $('#caVideoPanel').remove();
  1531 +
  1532 + if ($('#caImagePanel').length > 0)
  1533 + $('#caImagePanel').remove();
1531 1534
1532 if ($('#ImagePanel').length > 0) 1535 if ($('#ImagePanel').length > 0)
1533 $('#ImagePanel').remove(); 1536 $('#ImagePanel').remove();
@@ -5922,14 +5925,16 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A @@ -5922,14 +5925,16 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5922 $('#printDivContent').empty(); 5925 $('#printDivContent').empty();
5923 } 5926 }
5924 var pageno = 0; 5927 var pageno = 0;
5925 - // default to select all open module  
5926 - var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); 5928 + // select all open module div.
  5929 + // var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='3DImagePanel']");
  5930 + var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']");
5927 5931
5928 for (var i = 0 ; i < modulePanel.length; i++) { 5932 for (var i = 0 ; i < modulePanel.length; i++) {
5929 5933
5930 - pageno = pageno + 1;  
5931 var paneld = modulePanel[i].id; 5934 var paneld = modulePanel[i].id;
5932 - 5935 +
  5936 + pageno = pageno + 1;
  5937 +
5933 var panelTitle = document.getElementById(paneld).childNodes[0].innerText; 5938 var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
5934 5939
5935 $scope.GetDocumentPrintElementCB(paneld); 5940 $scope.GetDocumentPrintElementCB(paneld);
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -581,16 +581,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -581,16 +581,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
581 if (document.getElementById('aaBodyView') != null) { 581 if (document.getElementById('aaBodyView') != null) {
582 582
583 //0.4 added some stylesheets 583 //0.4 added some stylesheets
584 - $('#aaBodyView').css("height", $(window).outerHeight() - 65);  
585 -  
586 - $('#aaBodyView').css("width", $(window).outerWidth() - 15);  
587 - 584 +
588 if ($rootScope.isCallFromOtherModule) { 585 if ($rootScope.isCallFromOtherModule) {
589 var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 110; 586 var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 110;
590 } 587 }
591 else 588 else
592 { 589 {
593 - var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90; 590 + var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
  591 +
  592 + $('#aaBodyView').css("height", $(window).outerHeight() - 65);
  593 +
  594 + $('#aaBodyView').css("width", $(window).outerWidth() - 15);
  595 +
594 } 596 }
595 597
596 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight); 598 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js
@@ -18,4 +18,11 @@ AIA.directive(&#39;clinicalIllustrationDirective&#39;, function (ModuleService) { @@ -18,4 +18,11 @@ AIA.directive(&#39;clinicalIllustrationDirective&#39;, function (ModuleService) {
18 templateUrl: 'app/views/ci/clinical-illustrations-detail.html', 18 templateUrl: 'app/views/ci/clinical-illustrations-detail.html',
19 19
20 } 20 }
  21 +});
  22 +AIA.directive('clinicalAnimationDirective', function (ModuleService) {
  23 + return {
  24 + //restrict: 'E',
  25 + templateUrl: 'app/views/ca/clinical-animations-detail.html',
  26 +
  27 + }
21 }); 28 });
22 \ No newline at end of file 29 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/app/views/ca/clinical-animations-detail.html
1 <div> 1 <div>
2 <div ng-include="aap/widget/MainMenu.html"></div> 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 - <div ng-init="openBodyView()" id="CAView" class="caView" ng-controller="CAController"></div> 3 + <div ng-init="openBodyViewMain()" id="CAView" class="caView" ng-controller="CAController"></div>
4 </div> 4 </div>
400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist.json
@@ -289,6 +289,18 @@ @@ -289,6 +289,18 @@
289 "_Summary": "This animation shows a vasectomy procedure.", 289 "_Summary": "This animation shows a vasectomy procedure.",
290 "_LowerSummary": "A vasectomy is a procedure to cause permanent sterility in a man by preventing the transport of sperm out of the testes. A small incision is made in the scrotum and each vas deferens is tied off and cut apart preventing sperm from being released within the ejaculate. The small skin incision is stitched closed and the surgery does not affect a man's sexual function." 290 "_LowerSummary": "A vasectomy is a procedure to cause permanent sterility in a man by preventing the transport of sperm out of the testes. A small incision is made in the scrotum and each vas deferens is tied off and cut apart preventing sperm from being released within the ejaculate. The small skin incision is stitched closed and the surgery does not affect a man's sexual function."
291 }, 291 },
  292 + {
  293 + "_id": "1130",
  294 + "_ImageId": "3403",
  295 + "_Title": "Low back pain",
  296 + "_Video": "ca_vid_3403.flv",
  297 + "_ThumbnailImage": "ca_tni_3403.jpg",
  298 + "_BodySystem": "Nervous, Skeletal",
  299 + "_BodyRegion": "Body Wall and Back, Pelvis and Perineum, Thorax",
  300 + "_MedicalSpecialty": "Chiropractic, Orthopedics, Osteopathy, Sports Medicine",
  301 + "_Summary": "This animation illustrates various parts of the spine and potential causes of low back pain.",
  302 + "_LowerSummary": "The vertebral column, also called the spine, provides support for the trunk of the body, protects the spinal cord, and provides attachment points for the ribs and muscles of the back and trunk. <BodyRegion/><BodyRegion/>The spine has 4 natural curves. This 'S' shape allows for it to act more like a spring for the body rather than a straight stiff rod and helps to provide resilience for bearing the weight and motion of the body. <BodyRegion/><BodyRegion/> The vertebral column consists of 5 major divisions:<BodyRegion/><BodyRegion/>7 cervical vertebrae <BodyRegion/><BodyRegion/>12 thoracic vertebrae <BodyRegion/><BodyRegion/>5 lumbar vertebrae <BodyRegion/><BodyRegion/>Sacrum<BodyRegion/><BodyRegion/>Coccyx"
  303 + },
292 { 304 {
293 "_id": "1131", 305 "_id": "1131",
294 "_ImageId": "3404", 306 "_ImageId": "3404",
400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json
@@ -313,6 +313,19 @@ @@ -313,6 +313,19 @@
313 "_Summary": "This animation shows a vasectomy procedure.", 313 "_Summary": "This animation shows a vasectomy procedure.",
314 "_LowerSummary": "A vasectomy is a procedure to cause permanent sterility in a man by preventing the transport of sperm out of the testes. <BodyRegion/><BodyRegion/>A small incision is made in the scrotum and each vas deferens is tied off and cut apart preventing sperm from being released within the ejaculate. The small skin incision is stitched closed and the surgery does not affect a man's sexual function." 314 "_LowerSummary": "A vasectomy is a procedure to cause permanent sterility in a man by preventing the transport of sperm out of the testes. <BodyRegion/><BodyRegion/>A small incision is made in the scrotum and each vas deferens is tied off and cut apart preventing sperm from being released within the ejaculate. The small skin incision is stitched closed and the surgery does not affect a man's sexual function."
315 }, 315 },
  316 + {
  317 + "_id": "1130",
  318 + "_ImageId": "3403",
  319 + "_Title": "Low back pain",
  320 + "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200148/200148.mp4",
  321 + "_HostedFolderId": "200148",
  322 + "_ThumbnailImage": "ca_tni_3403.jpg",
  323 + "_BodySystem": "Nervous, Skeletal",
  324 + "_BodyRegion": "Body Wall and Back, Pelvis and Perineum, Thorax",
  325 + "_MedicalSpecialty": "Chiropractic, Orthopedics, Osteopathy, Sports Medicine",
  326 + "_Summary": "This animation illustrates various parts of the spine and potential causes of low back pain.",
  327 + "_LowerSummary": "The vertebral column, also called the spine, provides support for the trunk of the body, protects the spinal cord, and provides attachment points for the ribs and muscles of the back and trunk.The spine has 4 natural curves. This 'S' shape allows for it to act more like a spring for the body rather than a straight stiff rod and helps to provide resilience for bearing the weight and motion of the body. <br> The vertebral column consists of 5 major divisions:<br>7 cervical vertebrae <br>12 thoracic vertebrae <br>5 lumbar vertebrae <br>Sacrum <br>Coccyx"
  328 + },
316 { 329 {
317 "_id": "1131", 330 "_id": "1131",
318 "_ImageId": "3404", 331 "_ImageId": "3404",
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -891,7 +891,7 @@ var jsPanel = { @@ -891,7 +891,7 @@ var jsPanel = {
891 top: parseInt(80), 891 top: parseInt(80),
892 left: parseInt(320), 892 left: parseInt(320),
893 width: currentController == 'CIController' ? 1010 : 1025, 893 width: currentController == 'CIController' ? 1010 : 1025,
894 - height: currentController == 'CIController' ? 550 : 580, 894 + height: currentController == 'CIController' ? 550 : currentController == 'CAController' ? 545: 580,
895 }); 895 });
896 896
897 } 897 }
@@ -1070,7 +1070,7 @@ var jsPanel = { @@ -1070,7 +1070,7 @@ var jsPanel = {
1070 var MultiWinId = (panel.option.id).split("_")[len - 1]; 1070 var MultiWinId = (panel.option.id).split("_")[len - 1];
1071 $('#canvasDivCI_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10) - 70)); 1071 $('#canvasDivCI_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10) - 70));
1072 1072
1073 - } 1073 + }
1074 else 1074 else
1075 { 1075 {
1076 // add for other module like CI,AI when implemt for CB 1076 // add for other module like CI,AI when implemt for CB
@@ -1080,7 +1080,7 @@ var jsPanel = { @@ -1080,7 +1080,7 @@ var jsPanel = {
1080 1080
1081 panel.css({ 1081 panel.css({
1082 width: panel.option.size.width, 1082 width: panel.option.size.width,
1083 - height: currentController == 'CIController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35, 1083 + height: currentController == 'CIController' ? parseInt(panel.option.size.height, 10) : currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
1084 top: panelTop, 1084 top: panelTop,
1085 left: panel.option.position.left 1085 left: panel.option.position.left
1086 }); 1086 });
@@ -1090,8 +1090,8 @@ var jsPanel = { @@ -1090,8 +1090,8 @@ var jsPanel = {
1090 else 1090 else
1091 { 1091 {
1092 panel.css({ 1092 panel.css({
1093 - width: currentController == 'CIController' ? panel.option.size.width-18 : panel.option.size.width,  
1094 - height: parseInt(panel.option.size.height, 10) + 35, 1093 + width: currentController == 'CIController' ? panel.option.size.width - 18 : panel.option.size.width,
  1094 + height: currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
1095 top: panelTop, 1095 top: panelTop,
1096 left: panel.option.position.left 1096 left: panel.option.position.left
1097 }); 1097 });