Commit 32cc4b1ae8ffd20d098f6fff47622728dc9e8922
1 parent
8a2d116f
Changes for CI CA 3D module panel activity to Save CB
Showing
5 changed files
with
540 additions
and
86 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
... | ... | @@ -22,7 +22,13 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
22 | 22 | 'currentViewTitle': '', |
23 | 23 | 'parentSlugName': '', |
24 | 24 | 'currentSlug': '', |
25 | - 'imageId': '' | |
25 | + 'imageId': '', | |
26 | + 'top': 0, | |
27 | + 'left': 0, | |
28 | + 'width': 0, | |
29 | + 'height': 0, | |
30 | + 'minimised': false, | |
31 | + 'maximised': false | |
26 | 32 | |
27 | 33 | }); |
28 | 34 | |
... | ... | @@ -46,7 +52,13 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
46 | 52 | 'currentViewTitle': '', |
47 | 53 | 'parentSlugName': '', |
48 | 54 | 'currentSlug': '', |
49 | - 'imageId': '' | |
55 | + 'imageId': '', | |
56 | + 'top': 0, | |
57 | + 'left': 0, | |
58 | + 'width': 0, | |
59 | + 'height': 0, | |
60 | + 'minimised': false, | |
61 | + 'maximised': false | |
50 | 62 | |
51 | 63 | }); |
52 | 64 | |
... | ... | @@ -368,7 +380,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
368 | 380 | |
369 | 381 | |
370 | 382 | if (Selected3DImagePath.length > 0) { |
371 | - $.jsPanel({ | |
383 | + $scope.jsPanel3D = | |
384 | + $.jsPanel({ | |
372 | 385 | id: $scope.jsPanelID, |
373 | 386 | selector: '.threeDView', |
374 | 387 | theme: 'success', |
... | ... | @@ -388,7 +401,29 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
388 | 401 | height: $scope.jsPanelHeight |
389 | 402 | }, |
390 | 403 | |
391 | - }); | |
404 | + }); | |
405 | + //$scope.jsPanel3D.status = "minimized"; | |
406 | + var max = $scope.Get3DwindowStoreData(windowviewid, 'maximised'); | |
407 | + var min = $scope.Get3DwindowStoreData(windowviewid, 'minimised'); | |
408 | + if ($scope.jsPanel3D.status === "maximized" && max) { | |
409 | + $scope.jsPanel3D.maximize(); | |
410 | + $scope.Set3DwindowStoreData(windowviewid, 'maximised', true); | |
411 | + $scope.Set3DwindowStoreData(windowviewid, 'minimised', false); | |
412 | + } | |
413 | + else if ($scope.jsPanel3D.status === "minimized" && min) { | |
414 | + $scope.jsPanel3D.minimize(); | |
415 | + $scope.Set3DwindowStoreData(windowviewid, 'minimised', true); | |
416 | + $scope.Set3DwindowStoreData(windowviewid, 'maximised', false); | |
417 | + } | |
418 | + else { | |
419 | + $scope.jsPanel3D.normalize(); | |
420 | + $scope.Set3DwindowStoreData(windowviewid, 'maximised', false); | |
421 | + $scope.Set3DwindowStoreData(windowviewid, 'minimised', false); | |
422 | + } | |
423 | + $scope.Set3DwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); | |
424 | + $scope.Set3DwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); | |
425 | + $scope.Set3DwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); | |
426 | + $scope.Set3DwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); | |
392 | 427 | |
393 | 428 | $rootScope.currentSlug = '3d-anatomy-details'; |
394 | 429 | $scope.Set3DwindowStoreData(windowviewid, 'currentSlug', '3d-anatomy-details'); |
... | ... | @@ -408,8 +443,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
408 | 443 | $('#ThreeDView').css("width", $(window).outerWidth()-20); |
409 | 444 | |
410 | 445 | } |
411 | - | |
412 | - | |
446 | + //Calling methode for save Js Panel Activity for SaveCB | |
447 | + $scope.PanelActivity(); | |
413 | 448 | } |
414 | 449 | |
415 | 450 | $scope.AnimationOnLoad = function (windowviewid) { |
... | ... | @@ -437,7 +472,75 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
437 | 472 | |
438 | 473 | }); |
439 | 474 | |
440 | - } | |
475 | + } | |
476 | + | |
477 | + //Created method by Sandeep for Save JSPanel Activity on the CB module | |
478 | + $scope.PanelActivity = function () { | |
479 | + | |
480 | + $("#" + $scope.jsPanelID).resizable({ | |
481 | + stop: function (event, ui) { | |
482 | + var len = (event.currentTarget.id).split("_").length; | |
483 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
484 | + //var w = (this).offsetWidth; var h = (this).offsetHeight; | |
485 | + $scope.Set3DwindowStoreData(windowviewid, 'width', ui.size.width); | |
486 | + $scope.Set3DwindowStoreData(windowviewid, 'height', ui.size.height); | |
487 | + } | |
488 | + }); | |
489 | + | |
490 | + $("#" + $scope.jsPanelID).draggable({ | |
491 | + stop: function (event, ui) { | |
492 | + //var jsPanelID = $(this).attr("id"); | |
493 | + var len = (event.currentTarget.id).split("_").length; | |
494 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
495 | + //var offSets = $(this).offset(); var postions = (this).position(); (this).offsetTop (this).offsetLeft | |
496 | + $scope.Set3DwindowStoreData(windowviewid, 'top', ui.position.top); | |
497 | + $scope.Set3DwindowStoreData(windowviewid, 'left', ui.position.left); | |
498 | + } | |
499 | + }); | |
500 | + | |
501 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) { | |
502 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
503 | + var len = (currentPanelId).split("_").length; | |
504 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
505 | + for (var i in $rootScope.TheeDWindowData) { | |
506 | + if ($rootScope.TheeDWindowData[i] !== null && typeof ($rootScope.TheeDWindowData[i]) == "object") { | |
507 | + if ($rootScope.TheeDWindowData[i].multiwinid == windowviewid) { | |
508 | + $rootScope.TheeDWindowData.splice(i, 1); | |
509 | + } | |
510 | + } | |
511 | + } | |
512 | + //$(".tools").css("z-index", "15000"); | |
513 | + }); | |
514 | + | |
515 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function (event) { | |
516 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
517 | + var len = (currentPanelId).split("_").length; | |
518 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
519 | + $scope.Set3DwindowStoreData(windowviewid, 'maximised', true); | |
520 | + $scope.Set3DwindowStoreData(windowviewid, 'minimised', false); | |
521 | + | |
522 | + }); | |
523 | + | |
524 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function (event) { | |
525 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
526 | + var len = (currentPanelId).split("_").length; | |
527 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
528 | + $scope.Set3DwindowStoreData(windowviewid, 'maximised', false); | |
529 | + $scope.Set3DwindowStoreData(windowviewid, 'minimised', true); | |
530 | + | |
531 | + }); | |
532 | + | |
533 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function (event) { | |
534 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
535 | + var len = (currentPanelId).split("_").length; | |
536 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
537 | + $scope.Set3DwindowStoreData(windowviewid, 'maximised', false); | |
538 | + $scope.Set3DwindowStoreData(windowviewid, 'minimised', false); | |
539 | + | |
540 | + }); | |
541 | + | |
542 | + } | |
543 | + | |
441 | 544 | |
442 | 545 | }]); |
443 | 546 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
... | ... | @@ -50,7 +50,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
50 | 50 | 'clickedCAVideo': '', |
51 | 51 | 'clickedCASummary': '', |
52 | 52 | 'hostedFolderId': '', |
53 | - 'isTextVisible': true | |
53 | + 'isTextVisible': true, | |
54 | + 'top': 0, | |
55 | + 'left': 0, | |
56 | + 'width': 0, | |
57 | + 'height': 0, | |
58 | + 'minimised': false, | |
59 | + 'maximised': false | |
54 | 60 | }); |
55 | 61 | |
56 | 62 | } |
... | ... | @@ -79,7 +85,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
79 | 85 | 'clickedCAVideo': '', |
80 | 86 | 'clickedCASummary': '', |
81 | 87 | 'hostedFolderId': '', |
82 | - 'isTextVisible': true | |
88 | + 'isTextVisible': true, | |
89 | + 'top': 0, | |
90 | + 'left': 0, | |
91 | + 'width': 0, | |
92 | + 'height': 0, | |
93 | + 'minimised': false, | |
94 | + 'maximised': false | |
83 | 95 | }); |
84 | 96 | |
85 | 97 | } |
... | ... | @@ -829,13 +841,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
829 | 841 | $rootScope.isLoading = false; |
830 | 842 | $('#spinner').css('visibility', 'hidden'); |
831 | 843 | |
832 | - $.jsPanel({ | |
844 | + $scope.jsPanelCA = $.jsPanel({ | |
833 | 845 | id: $scope.jsPanelID, |
834 | 846 | selector: '.caView', |
835 | 847 | theme: 'success', |
836 | 848 | currentController: 'CAController', |
837 | 849 | 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>' + | |
850 | + 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");} GetTextVisibity(event); });});</script>' + | |
839 | 851 | '<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 | 852 | 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo_' + windowviewid + '" onloadstart="videoOnLoad(event)"' + |
841 | 853 | ' poster="' + poster + '"' + |
... | ... | @@ -863,9 +875,42 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
863 | 875 | width: $scope.jsPanelWidth, |
864 | 876 | height: $scope.jsPanelHeight |
865 | 877 | }, |
878 | + | |
866 | 879 | |
867 | 880 | }); |
868 | 881 | |
882 | + var max = $scope.GetCAwindowStoreData(windowviewid, 'maximised'); | |
883 | + var min = $scope.GetCAwindowStoreData(windowviewid, 'minimised'); | |
884 | + if ($scope.jsPanelCA.status === "maximized" && max) { | |
885 | + $scope.jsPanelCA.maximize(); | |
886 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised', true); | |
887 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised', false); | |
888 | + } | |
889 | + else if ($scope.jsPanelCA.status === "minimized" && min) { | |
890 | + $scope.jsPanelCA.minimize(); | |
891 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised', true); | |
892 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised', false); | |
893 | + } | |
894 | + else { | |
895 | + $scope.jsPanelCA.normalize(); | |
896 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised', false); | |
897 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised', false); | |
898 | + } | |
899 | + | |
900 | + //$scope.jsPanelCA.on('jspanelstatechange', function () { | |
901 | + // if ($scope.jsPanelCA.status === "maximized" || $scope.jsPanelCA.status === "normalized") { | |
902 | + // //mypanel2.content.append("<p style='...'><i>jsPanel</i>.status changed to: " + mypanel2.status + "</p>"); | |
903 | + // var offSet = $(this).offset(); var postions = (this).position(); event.currentTarget.offset.top; event.currentTarget.offsetleft; | |
904 | + // $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top); | |
905 | + // $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left); | |
906 | + // $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth); | |
907 | + // $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight); | |
908 | + // } | |
909 | + //}); | |
910 | + $scope.SetCAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); | |
911 | + $scope.SetCAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); | |
912 | + $scope.SetCAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); | |
913 | + $scope.SetCAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); | |
869 | 914 | |
870 | 915 | $scope.SetCAwindowStoreData(windowviewid, 'currentSlug', 'clinical-animations-detail'); |
871 | 916 | $('html, body').animate({ scrollTop: 0 }); |
... | ... | @@ -900,7 +945,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
900 | 945 | $('#CAView').css("width", $(window).outerWidth() - 30); |
901 | 946 | |
902 | 947 | } |
903 | - | |
948 | + //Calling methode for save Js Panel Activity for SaveCB | |
949 | + $scope.PanelActivity(); | |
904 | 950 | } |
905 | 951 | |
906 | 952 | $scope.videoOnLoad = function (windowviewid) |
... | ... | @@ -986,6 +1032,85 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
986 | 1032 | } |
987 | 1033 | } |
988 | 1034 | |
1035 | + $scope.GetTextVisiblity = function (windowviewid, btnTextValue) { | |
1036 | + var isVisible; | |
1037 | + if (btnTextValue == "Text On") { | |
1038 | + isVisible = false; | |
1039 | + $scope.SetCAwindowStoreData(windowviewid, 'isTextVisible', isVisible); | |
1040 | + } else { | |
1041 | + isVisible = true; | |
1042 | + $scope.SetCAwindowStoreData(windowviewid, 'isTextVisible', isVisible); | |
1043 | + } | |
1044 | + } | |
1045 | + | |
1046 | + //Created method by Sandeep for Save JSPanel Activity on the CB module | |
1047 | + $scope.PanelActivity = function () { | |
1048 | + | |
1049 | + $("#" + $scope.jsPanelID).resizable({ | |
1050 | + stop: function (event, ui) { | |
1051 | + var len = (event.currentTarget.id).split("_").length; | |
1052 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1053 | + //var w = (this).offsetWidth; var h = (this).offsetHeight; | |
1054 | + $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width); | |
1055 | + $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height); | |
1056 | + } | |
1057 | + }); | |
1058 | + | |
1059 | + $("#" + $scope.jsPanelID).draggable({ | |
1060 | + stop: function( event, ui ) { | |
1061 | + //var jsPanelID = $(this).attr("id"); | |
1062 | + var len = (event.currentTarget.id).split("_").length; | |
1063 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1064 | + //var offSets = $(this).offset(); var postions = (this).position(); (this).offsetTop (this).offsetLeft | |
1065 | + $scope.SetCAwindowStoreData(windowviewid, 'top', ui.position.top); | |
1066 | + $scope.SetCAwindowStoreData(windowviewid, 'left', ui.position.left); | |
1067 | + } | |
1068 | + }); | |
1069 | + | |
1070 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) { | |
1071 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1072 | + var len = (currentPanelId).split("_").length; | |
1073 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1074 | + for (var i in $rootScope.CAWindowData) { | |
1075 | + if ($rootScope.CAWindowData[i] !== null && typeof ($rootScope.CAWindowData[i]) == "object") { | |
1076 | + if ($rootScope.CAWindowData[i].multiwinid == windowviewid) { | |
1077 | + $rootScope.CAWindowData.splice(i, 1); | |
1078 | + } | |
1079 | + } | |
1080 | + } | |
1081 | + //$(".tools").css("z-index", "15000"); | |
1082 | + }); | |
1083 | + | |
1084 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function (event) { | |
1085 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1086 | + var len = (currentPanelId).split("_").length; | |
1087 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1088 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised', true); | |
1089 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised', false); | |
1090 | + | |
1091 | + }); | |
1092 | + | |
1093 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function (event) { | |
1094 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1095 | + var len = (currentPanelId).split("_").length; | |
1096 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1097 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised', false); | |
1098 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised', true); | |
1099 | + | |
1100 | + }); | |
1101 | + | |
1102 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function (event) { | |
1103 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1104 | + var len = (currentPanelId).split("_").length; | |
1105 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1106 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised', false); | |
1107 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised', false); | |
1108 | + | |
1109 | + }); | |
1110 | + | |
1111 | + } | |
1112 | + | |
1113 | + | |
989 | 1114 | |
990 | 1115 | }]); |
991 | 1116 | |
... | ... | @@ -1002,6 +1127,16 @@ function videoOnLoad(event) { |
1002 | 1127 | }); |
1003 | 1128 | } |
1004 | 1129 | |
1130 | +function GetTextVisibity(event) { | |
1131 | + var scope = angular.element(document.getElementById("CAView")).scope(); | |
1132 | + var windowviewid = (event.target.id).split("_")[1]; | |
1133 | + var btnTextValue = event.target.innerText; | |
1134 | + | |
1135 | + scope.$apply(function () { | |
1136 | + scope.GetTextVisiblity(windowviewid, btnTextValue); | |
1137 | + }); | |
1138 | +} | |
1139 | + | |
1005 | 1140 | |
1006 | 1141 | |
1007 | 1142 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
... | ... | @@ -835,7 +835,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
835 | 835 | |
836 | 836 | |
837 | 837 | |
838 | - $.jsPanel({ | |
838 | + $scope.jsPanelCI = $.jsPanel({ | |
839 | 839 | id: $scope.jsPanelID, |
840 | 840 | selector: '.ciView', |
841 | 841 | theme: 'success', |
... | ... | @@ -859,6 +859,24 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
859 | 859 | }, |
860 | 860 | |
861 | 861 | }); |
862 | + | |
863 | + var max = $scope.GetCIwindowStoreData(windowviewid, 'maximised'); | |
864 | + var min = $scope.GetCIwindowStoreData(windowviewid, 'minimised'); | |
865 | + if ($scope.jsPanelCI.status === "maximized" && max) { | |
866 | + $scope.jsPanelCI.maximize(); | |
867 | + $scope.SetCIwindowStoreData(windowviewid, 'maximised', true); | |
868 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
869 | + } | |
870 | + else if ($scope.jsPanelCI.status === "minimized" && min) { | |
871 | + $scope.jsPanelCI.minimize(); | |
872 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', true); | |
873 | + $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); | |
874 | + } | |
875 | + else { | |
876 | + $scope.jsPanelCI.normalize(); | |
877 | + $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); | |
878 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
879 | + } | |
862 | 880 | |
863 | 881 | $scope.SetCIwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); |
864 | 882 | $scope.SetCIwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); |
... | ... | @@ -917,6 +935,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
917 | 935 | |
918 | 936 | }); |
919 | 937 | |
938 | + //Calling methode for save Js Panel Activity for SaveCB | |
920 | 939 | $scope.PanelActivity(); |
921 | 940 | } |
922 | 941 | |
... | ... | @@ -1011,76 +1030,123 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
1011 | 1030 | |
1012 | 1031 | //Created method by Sandeep for Save JSPanel Activity on the CB module |
1013 | 1032 | $scope.PanelActivity = function () { |
1033 | + //$("#" + $scope.jsPanelID).resizable({ | |
1034 | + // resize: function (event, ui) { | |
1035 | + // var len = (event.currentTarget.id).split("_").length; | |
1036 | + // var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1037 | + // $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width); | |
1038 | + // $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height); | |
1039 | + | |
1040 | + // } | |
1041 | + //}); | |
1042 | + | |
1043 | + //$("#" + $scope.jsPanelID).mousemove(function (event) { | |
1044 | + // var len = (event.currentTarget.id).split("_").length; | |
1045 | + // var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1046 | + // var offSet = $(this).offset(); | |
1047 | + // $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top); | |
1048 | + // $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left); | |
1049 | + // $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth); | |
1050 | + // $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight); | |
1051 | + | |
1052 | + // console.log(offSet.top, offSet.left, event.currentTarget.offsetWidth, event.currentTarget.offsetHeight) | |
1053 | + //}); | |
1054 | + | |
1055 | + //$("#" + $scope.jsPanelID).draggable({ | |
1056 | + // drag: function (evt) { | |
1057 | + // //var currentPanelId = $(this).attr("id"); | |
1058 | + // var len = (event.currentTarget.id).split("_").length; | |
1059 | + // var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1060 | + // //var offSet = $(this).offset(); | |
1061 | + // $scope.SetCIwindowStoreData(windowviewid, 'top', (this).offsetTop); | |
1062 | + // $scope.SetCIwindowStoreData(windowviewid, 'left', (this).offsetLeft); | |
1063 | + // $scope.SetCIwindowStoreData(windowviewid, 'width', (this).offsetWidth); | |
1064 | + // $scope.SetCIwindowStoreData(windowviewid, 'height', (this).offsetHeight); | |
1065 | + // }, | |
1066 | + //}); | |
1067 | + | |
1014 | 1068 | $("#" + $scope.jsPanelID).resizable({ |
1015 | - resize: function (event, ui) { | |
1069 | + stop: function (event, ui) { | |
1016 | 1070 | var len = (event.currentTarget.id).split("_").length; |
1017 | - var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1018 | - //$scope.jsPanelWidth = ui.size.width; | |
1019 | - //$scope.jsPanelHeight = ui.size.height; | |
1071 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1020 | 1072 | $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width); |
1021 | 1073 | $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height); |
1022 | - //console.log($rootScope.jsPanelWidth, $rootScope.jsPanelHeight); | |
1023 | 1074 | } |
1024 | 1075 | }); |
1025 | 1076 | |
1026 | - $("#" + $scope.jsPanelID).mousemove(function (event) { | |
1027 | - var len = (event.currentTarget.id).split("_").length; | |
1028 | - var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1029 | - var offSet = $(this).offset(); | |
1030 | - $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top); | |
1031 | - $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left); | |
1032 | - $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth); | |
1033 | - $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight); | |
1034 | - | |
1035 | - console.log(offSet.top, offSet.left, event.currentTarget.offsetWidth, event.currentTarget.offsetHeight) | |
1077 | + $("#" + $scope.jsPanelID).draggable({ | |
1078 | + stop: function (event, ui) { | |
1079 | + //var jsPanelID = $(this).attr("id"); | |
1080 | + var len = (event.currentTarget.id).split("_").length; | |
1081 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
1082 | + //var offSets = $(this).offset(); var postions = (this).position(); (this).offsetTop (this).offsetLeft | |
1083 | + $scope.SetCIwindowStoreData(windowviewid, 'top', ui.position.top); | |
1084 | + $scope.SetCIwindowStoreData(windowviewid, 'left', ui.position.left); | |
1085 | + } | |
1036 | 1086 | }); |
1037 | 1087 | |
1038 | - $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { | |
1039 | - var len = ($scope.jsPanelID).split("_").length; | |
1040 | - var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
1041 | - $(".tools").css("z-index", "15000"); | |
1088 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) { | |
1089 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1090 | + var len = (currentPanelId).split("_").length; | |
1091 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1092 | + for (var i in $rootScope.CIWindowData) { | |
1093 | + if ($rootScope.CIWindowData[i] !== null && typeof ($rootScope.CIWindowData[i]) == "object") { | |
1094 | + if ($rootScope.CIWindowData[i].multiwinid == windowviewid) { | |
1095 | + $rootScope.CIWindowData.splice(i, 1); | |
1096 | + } | |
1097 | + } | |
1098 | + } | |
1099 | + //$(".tools").css("z-index", "15000"); | |
1042 | 1100 | }); |
1043 | 1101 | |
1044 | - $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function () { | |
1045 | - var len = ($scope.jsPanelID).split("_").length; | |
1046 | - var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
1102 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function (event) { | |
1103 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1104 | + var len = (currentPanelId).split("_").length; | |
1105 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1047 | 1106 | $scope.SetCIwindowStoreData(windowviewid, 'maximised', true); |
1048 | - $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
1049 | - | |
1107 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
1050 | 1108 | }); |
1051 | 1109 | |
1052 | - $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function () { | |
1053 | - var len = ($scope.jsPanelID).split("_").length; | |
1054 | - var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
1110 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function (event) { | |
1111 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1112 | + var len = (currentPanelId).split("_").length; | |
1113 | + windowviewid = $scope.jsPanelCI.on('jspanelstatechange' , event); | |
1055 | 1114 | $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); |
1056 | 1115 | $scope.SetCIwindowStoreData(windowviewid, 'minimised', true); |
1057 | 1116 | |
1058 | 1117 | }); |
1059 | 1118 | |
1060 | - $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function () { | |
1061 | - var len = ($scope.jsPanelID).split("_").length; | |
1062 | - var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
1119 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function (event) { | |
1120 | + var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id'); | |
1121 | + var len = (currentPanelId).split("_").length; | |
1122 | + var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1063 | 1123 | $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); |
1064 | 1124 | $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); |
1065 | 1125 | |
1066 | 1126 | }); |
1067 | 1127 | |
1068 | - } | |
1069 | - | |
1070 | - //$("#ciImagePanel_410 .ui-draggable-handle .jsPanel-btn-close").click(function () { | |
1071 | - // $(this).toggleClass('btn-plus'); | |
1072 | - // $("#ciImagePanel_410 .ui-draggable-handle .jsPanel-content jsPanel-theme-success").slideToggle(); | |
1073 | - //}); | |
1074 | - | |
1075 | - //$("#" + $scope.jsPanelID + " .ui-draggable-handle .jsPanel-btn-min").click(function () { | |
1076 | - // $(this).toggleClass('btn-plus'); | |
1077 | - // $("#ciImagePanel_410 .ui-draggable-handle .jsPanel-content jsPanel-theme-success").slideToggle(); | |
1078 | - //}); | |
1079 | - | |
1080 | - | |
1081 | - | |
1082 | - | |
1083 | - | |
1128 | + //$scope.jsPanelCI.on('jspanelstatechange', function (event) { | |
1129 | + //var currentPanelId = $(this).attr("id"); | |
1130 | + //var len = (currentPanelId).split("_").length; | |
1131 | + //var windowviewid = (currentPanelId).split("_")[len - 1]; | |
1132 | + //if ($scope.jsPanelCI.status === "maximized") { | |
1133 | + // $scope.SetCIwindowStoreData(windowviewid, 'maximised', true); | |
1134 | + // $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
1135 | + // //mypanel2.content.append("<p style='...'><i>jsPanel</i>.status changed to: " + mypanel2.status + "</p>"); | |
1136 | + //} | |
1137 | + //else if($scope.jsPanelCI.status === "minimized"){ | |
1138 | + // $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); | |
1139 | + // $scope.SetCIwindowStoreData(windowviewid, 'minimised', true); | |
1140 | + //} | |
1141 | + //else { | |
1142 | + // $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); | |
1143 | + // $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
1144 | + //} | |
1145 | + //}); | |
1146 | + | |
1147 | + | |
1148 | + | |
1149 | + } | |
1084 | 1150 | |
1085 | 1151 | }] |
1086 | 1152 | ); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
... | ... | @@ -2332,9 +2332,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2332 | 2332 | for (var i = 0; i < $rootScope.CIWindowData.length; i++) { |
2333 | 2333 | $scope.updatedWindowListForSaveCB.push({ |
2334 | 2334 | |
2335 | - containsCapturedContent: true,//$rootScope.CIWindowData[i] | |
2336 | - annotationData: "",//$rootScope.CIWindowData[i] | |
2337 | - contextMenu: { lockResize: false, hideTitleBar: false }, | |
2335 | + containsCapturedContent: true,//$rootScope.CIWindowData[i] // N | |
2336 | + annotationData: "",//$rootScope.CIWindowData[i] N | |
2337 | + contextMenu: { lockResize: false, hideTitleBar: false }, // N | |
2338 | 2338 | position: { |
2339 | 2339 | top: $rootScope.CIWindowData[i].top, |
2340 | 2340 | left: $rootScope.CIWindowData[i].left, |
... | ... | @@ -2349,19 +2349,82 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2349 | 2349 | windowTitle: $rootScope.CIWindowData[i].currentViewTitle, |
2350 | 2350 | maximised: $rootScope.CIWindowData[i].maximised, |
2351 | 2351 | mType: $rootScope.CIWindowData[i].moduleName, |
2352 | - id: $rootScope.CIWindowData[i].imageId,//$rootScope.CIWindowData[i].id, | |
2353 | - scrollPosition: { | |
2354 | - vertical: 0, | |
2355 | - horizontal: 0 | |
2356 | - }, | |
2357 | - windowListId: 0 //$rootScope.CIWindowData[i] | |
2352 | + id: $rootScope.CIWindowData[i].imageId, | |
2353 | + scrollPosition: { vertical: 0, horizontal: 0 },// N | |
2354 | + windowListId: 0 //$rootScope.CIWindowData[i] // N | |
2358 | 2355 | }); |
2359 | 2356 | |
2360 | 2357 | } |
2361 | 2358 | $rootScope.CIWindowData = []; |
2362 | 2359 | } |
2363 | 2360 | |
2364 | - } | |
2361 | + } | |
2362 | + | |
2363 | + $scope.saveCAWindowActivity = function (currentId) { | |
2364 | + if ($rootScope.CAWindowData != undefined && $rootScope.CAWindowData.length > 0) { | |
2365 | + for (var i = 0; i < $rootScope.CAWindowData.length; i++) { | |
2366 | + $scope.updatedWindowListForSaveCB.push({ | |
2367 | + | |
2368 | + containsCapturedContent: true,//$rootScope.CAWindowData[i] // N | |
2369 | + //annotationData: "",//$rootScope.CAWindowData[i] N | |
2370 | + contextMenu: { lockResize: false, hideToolBar: false, hideTitleBar: false },//N | |
2371 | + position: { | |
2372 | + top: $rootScope.CAWindowData[i].top, | |
2373 | + left: $rootScope.CAWindowData[i].left, | |
2374 | + }, | |
2375 | + size: { | |
2376 | + height: $rootScope.CAWindowData[i].height, | |
2377 | + width: $rootScope.CAWindowData[i].width | |
2378 | + }, | |
2379 | + textVisible: $rootScope.CAWindowData[i].isTextVisible, | |
2380 | + imageId: $rootScope.CAWindowData[i].imageId, | |
2381 | + minimised: $rootScope.CAWindowData[i].minimised, | |
2382 | + windowTitle: $rootScope.CAWindowData[i].currentViewTitle, | |
2383 | + maximised: $rootScope.CAWindowData[i].maximised, | |
2384 | + mType: $rootScope.CAWindowData[i].moduleName, | |
2385 | + id: $rootScope.CAWindowData[i].imageId, | |
2386 | + scrollFlvPosition: { vertical: 0, horizontal: 0 },// N | |
2387 | + windowListId: 0 //$rootScope.CAWindowData[i] // N | |
2388 | + }); | |
2389 | + | |
2390 | + } | |
2391 | + $rootScope.CAWindowData = []; | |
2392 | + } | |
2393 | + } | |
2394 | + | |
2395 | + $scope.save3DWindowActivity = function (currentId) { | |
2396 | + if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) { | |
2397 | + for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) { | |
2398 | + $scope.updatedWindowListForSaveCB.push({ | |
2399 | + | |
2400 | + containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N | |
2401 | + //annotationData: "",//$rootScope.TheeDWindowData[i] N | |
2402 | + contextMenu:{ lockResize: true, hideTitleBar: true, hideToolBar: false, hideLeftBar: false, hideTopToolBar: false }, | |
2403 | + position: { | |
2404 | + top: $rootScope.TheeDWindowData[i].top, | |
2405 | + left: $rootScope.TheeDWindowData[i].left, | |
2406 | + }, | |
2407 | + size: { | |
2408 | + height: $rootScope.TheeDWindowData[i].height, | |
2409 | + width: $rootScope.TheeDWindowData[i].width | |
2410 | + }, | |
2411 | + textVisible: $rootScope.TheeDWindowData[i].isTextVisible, | |
2412 | + imageId: $rootScope.TheeDWindowData[i].imageId, | |
2413 | + minimised: $rootScope.TheeDWindowData[i].minimised, | |
2414 | + windowTitle: $rootScope.TheeDWindowData[i].currentViewTitle, | |
2415 | + maximised: $rootScope.TheeDWindowData[i].maximised, | |
2416 | + mType: $rootScope.TheeDWindowData[i].moduleName, | |
2417 | + id: $rootScope.TheeDWindowData[i].imageId, | |
2418 | + windowListId: 0, //$rootScope.TheeDWindowData[i] // N | |
2419 | + threeDData: $rootScope.TheeDWindowData[i].threeDAnatomyData, | |
2420 | + contentPath: $rootScope.TheeDWindowData[i].ImagePath, | |
2421 | + scrollPosition: { vertical: $rootScope.TheeDWindowData[i].verticalScroll ? 0 : 0 , horizontal: 0 }, | |
2422 | + | |
2423 | + }); | |
2424 | + } | |
2425 | + $rootScope.TheeDWindowData = []; | |
2426 | + } | |
2427 | + } | |
2365 | 2428 | |
2366 | 2429 | $scope.saveAAWindowActivity = function () { |
2367 | 2430 | |
... | ... | @@ -2373,13 +2436,19 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2373 | 2436 | hideAllPins: $rootScope.AAWindowData[i].isHidePinBtnClicked, |
2374 | 2437 | selectedCallouts: $rootScope.AAWindowData[i].CBselectedpinCordinate, |
2375 | 2438 | annotationData: "",//No find in AA.js |
2376 | - minimised: false,//N | |
2377 | - scrollPosition: { vertical: 279, horizontal: 313 },//N | |
2439 | + minimised: $rootScope.AAWindowData[i].minimised, | |
2440 | + scrollPosition: { | |
2441 | + vertical: $rootScope.AAWindowData[i].verticalScroll, | |
2442 | + horizontal: $rootScope.AAWindowData[i].horizontalScroll | |
2443 | + }, | |
2378 | 2444 | selectedStructureID: 0,//N |
2379 | 2445 | selectedPins: $rootScope.AAWindowData[i].clickedPins, |
2380 | - maximised: false,//N | |
2381 | - size: { width: 800, height: 297 },//N | |
2382 | - id: "492",//N | |
2446 | + maximised: $rootScope.AAWindowData[i].maximised, | |
2447 | + size: { | |
2448 | + width: $rootScope.AAWindowData[i].width, | |
2449 | + height: $rootScope.AAWindowData[i].height | |
2450 | + }, | |
2451 | + id: $rootScope.AAWindowData[i].imageId, | |
2383 | 2452 | showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedSystemPinsClicked, |
2384 | 2453 | hideCallOuts: false,//N |
2385 | 2454 | showAllPins: $rootScope.AAWindowData[i].isShowBodyWithCBPinData,//N |
... | ... | @@ -2387,13 +2456,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2387 | 2456 | bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID, |
2388 | 2457 | windowListId: "0",//N |
2389 | 2458 | imageId: $rootScope.AAWindowData[i].imageId, |
2390 | - position: { x: 840, y: 263 },//N | |
2459 | + //position: { x: 840, y: 263 }, | |
2460 | + position: { | |
2461 | + top: $rootScope.AAWindowData[i].top, | |
2462 | + left: $rootScope.AAWindowData[i].left, | |
2463 | + }, | |
2391 | 2464 | mType: $rootScope.AAWindowData[i].moduleName, |
2392 | 2465 | containsCapturedContent: true, |
2393 | - contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, | |
2394 | - | |
2395 | - //position: { top: $rootScope.jsPanelTop, left: $rootScope.jsPanelLeft }, | |
2396 | - //size: { width: $rootScope.jsPanelWidth, height: $rootScope.jsPanelHeight } | |
2466 | + contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false } | |
2397 | 2467 | |
2398 | 2468 | |
2399 | 2469 | }); |
... | ... | @@ -2406,9 +2476,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2406 | 2476 | |
2407 | 2477 | //$scope.saveDAWindowActivity(); |
2408 | 2478 | //$scope.saveAAWindowActivity(currentId); |
2409 | - $scope.saveCIWindowActivity(currentId); | |
2479 | + //$scope.saveCIWindowActivity(currentId); | |
2410 | 2480 | //$scope.saveCAWindowActivity(); |
2411 | - //$scope.save3DWindowActivity(); | |
2481 | + $scope.save3DWindowActivity(); | |
2412 | 2482 | //$scope.savePicWindowActivity($scope.windowDataforCB); |
2413 | 2483 | if ($scope.updatedWindowListForSaveCB.length > 0) { |
2414 | 2484 | findKeyForChange($rootScope.contentNotesForSaveCB, currentId); |
... | ... | @@ -2421,7 +2491,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2421 | 2491 | $scope.updatedWindowListForSaveCB = []; |
2422 | 2492 | console.log($rootScope.contentNotesForSaveCB); |
2423 | 2493 | } |
2424 | - | |
2494 | + | |
2495 | + | |
2425 | 2496 | |
2426 | 2497 | //$rootScope.updateWindowsContentForSaveCB = function (windowData) { |
2427 | 2498 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... | ... | @@ -88,7 +88,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
88 | 88 | 'sliderVal':100, |
89 | 89 | 'speechBubbleDimaensions':[], |
90 | 90 | 'isShowBodyWithCBPinData':false, |
91 | - 'CBselectedpinCordinate':[] | |
91 | + 'CBselectedpinCordinate': [], | |
92 | + 'verticalScroll': 0, | |
93 | + 'horizontalScroll':0, | |
94 | + 'top': 0, | |
95 | + 'left': 0, | |
96 | + 'width': 0, | |
97 | + 'height': 0, | |
98 | + 'minimised': false, | |
99 | + 'maximised': false | |
92 | 100 | |
93 | 101 | }); |
94 | 102 | |
... | ... | @@ -134,7 +142,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
134 | 142 | 'sliderVal':100, |
135 | 143 | 'speechBubbleDimaensions':[], |
136 | 144 | 'isShowBodyWithCBPinData':false, |
137 | - 'CBselectedpinCordinate':[] | |
145 | + 'CBselectedpinCordinate': [], | |
146 | + 'verticalScroll': 0, | |
147 | + 'horizontalScroll': 0, | |
148 | + 'top': 0, | |
149 | + 'left': 0, | |
150 | + 'width': 0, | |
151 | + 'height': 0, | |
152 | + 'minimised': false, | |
153 | + 'maximised': false | |
138 | 154 | |
139 | 155 | }); |
140 | 156 | |
... | ... | @@ -659,6 +675,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
659 | 675 | }, 400); |
660 | 676 | |
661 | 677 | } |
678 | + //Calling methode for save Js Panel Activity for SaveCB | |
679 | + $scope.PanelActivity(); | |
662 | 680 | } |
663 | 681 | |
664 | 682 | |
... | ... | @@ -1967,8 +1985,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
1967 | 1985 | var windowviewid = (clickedSpeechBubbleId).split("_")[len-1]; |
1968 | 1986 | |
1969 | 1987 | var verticalScrollPosition = document.getElementById('canvasAADiv_'+windowviewid).scrollTop; |
1970 | - var horizontlScrollPosition = document.getElementById('canvasAADiv_'+windowviewid).scrollLeft; | |
1971 | - | |
1988 | + var horizontlScrollPosition = document.getElementById('canvasAADiv_' + windowviewid).scrollLeft; | |
1989 | + //Calling Method to save ScrollPosition for Save CB | |
1990 | + $scope.SetAAwindowStoreData(windowviewid, 'verticalScroll', verticalScrollPosition); | |
1991 | + $scope.SetAAwindowStoreData(windowviewid, 'horizontalScroll', horizontlScrollPosition); | |
1972 | 1992 | var sppechBubbleId = $(this).attr("id").substring(12); |
1973 | 1993 | var speechBubbleDraggedLineID = "speechBubbleDraggedLine" + sppechBubbleId; |
1974 | 1994 | |
... | ... | @@ -2948,6 +2968,65 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
2948 | 2968 | } |
2949 | 2969 | |
2950 | 2970 | }); |
2971 | + | |
2972 | + //Created method by Sandeep for Save JSPanel Activity on the CB module | |
2973 | + $scope.PanelActivity = function () { | |
2974 | + $("#" + $scope.jsPanelID).resizable({ | |
2975 | + resize: function (event, ui) { | |
2976 | + var len = (event.currentTarget.id).split("_").length; | |
2977 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
2978 | + //$scope.jsPanelWidth = ui.size.width; | |
2979 | + //$scope.jsPanelHeight = ui.size.height; | |
2980 | + $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width); | |
2981 | + $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height); | |
2982 | + //console.log($rootScope.jsPanelWidth, $rootScope.jsPanelHeight); | |
2983 | + } | |
2984 | + }); | |
2985 | + | |
2986 | + $("#" + $scope.jsPanelID).mousemove(function (event) { | |
2987 | + var len = (event.currentTarget.id).split("_").length; | |
2988 | + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; | |
2989 | + var offSet = $(this).offset(); | |
2990 | + $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top); | |
2991 | + $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left); | |
2992 | + $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth); | |
2993 | + $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight); | |
2994 | + | |
2995 | + console.log(offSet.top, offSet.left, event.currentTarget.offsetWidth, event.currentTarget.offsetHeight) | |
2996 | + }); | |
2997 | + | |
2998 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { | |
2999 | + var len = ($scope.jsPanelID).split("_").length; | |
3000 | + var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
3001 | + $(".tools").css("z-index", "15000"); | |
3002 | + }); | |
3003 | + | |
3004 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function () { | |
3005 | + var len = ($scope.jsPanelID).split("_").length; | |
3006 | + var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
3007 | + $scope.SetCIwindowStoreData(windowviewid, 'maximised', true); | |
3008 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
3009 | + | |
3010 | + }); | |
3011 | + | |
3012 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function () { | |
3013 | + var len = ($scope.jsPanelID).split("_").length; | |
3014 | + var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
3015 | + $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); | |
3016 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', true); | |
3017 | + | |
3018 | + }); | |
3019 | + | |
3020 | + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function () { | |
3021 | + var len = ($scope.jsPanelID).split("_").length; | |
3022 | + var windowviewid = ($scope.jsPanelID).split("_")[len - 1]; | |
3023 | + $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); | |
3024 | + $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); | |
3025 | + | |
3026 | + }); | |
3027 | + | |
3028 | + } | |
3029 | + | |
2951 | 3030 | }]); |
2952 | 3031 | |
2953 | 3032 | ... | ... |