',
title: tittle,
position: {
@@ -890,17 +867,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
});
- $rootScope.currentSlug = 'clinical-animations-detail';
+ $scope.SetCAwindowStoreData(windowviewid, 'currentSlug', 'clinical-animations-detail');
$('html, body').animate({ scrollTop: 0 });
$rootScope.openViews.push(
{
"module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
- "slug": $rootScope.currentSlug
+ "slug": $scope.GetCAwindowStoreData(windowviewid, 'currentSlug')
});
var jspContentHeight = $('.jsPanel-content').height();
- var videoHeight = $('#divplayerinlineVideo div').height();
+ var videoHeight = $('#divplayerinlineVideo_'+ windowviewid +' div').height();
if (videoHeight <= 0)
videoHeight = 360;
var textH = $('.video-subtitle').height();
@@ -909,21 +886,56 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if ($('.jsPanel-content').length > 0) {
$('.video-subtitle').css('margin-bottom', blackBorderHeight);
- $('#divplayerinlineVideo').css('background', '#fff');
+ $('#divplayerinlineVideo_'+ windowviewid ).css('background', '#fff');
//Android > Clinical Animations > The animation does not fit to the screen in the Landscape mode.
var $ua = navigator.userAgent;
if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { $('.jsPanel-content').css("width", "100%"); }
}
+
+ }
+
+ if (!$rootScope.isCallFromOtherModule) {
+ $('#CAView').css("height", $(window).outerHeight() - 20);
+
+ $('#CAView').css("width", $(window).outerWidth() - 30);
}
+
+ }
+ $scope.videoOnLoad = function (windowviewid)
+ {
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
-
- //console.log($rootScope.openViews);
- $('#CAView').css("height", $(window).outerHeight());
+ if ($rootScope.isCallFromOtherModule) {
+ $scope.JsPanelclick(windowviewid);
+ $rootScope.CAWindowLoadComplete = true;
+ }
- $('#CAView').css("width", $(window).outerWidth()-20);
+ var isTextVisible = $scope.GetCAwindowStoreData(windowviewid, 'isTextVisible');
+
+ if(isTextVisible)
+ {
+ $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
+ }
+ else
+ {
+ $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
+
+ }
+
+ }
+
+ $scope.JsPanelclick = function (windowviewid) {
+ // call from while open module in CB
+ $("#caImagePanel_" + windowviewid).on('click', function (event) {
+
+ // var pnlName = event.currentTarget.id;
+ $scope.$emit("cBEnableDisableMenuOption", "");
+
+ });
}
$scope.loadCAPlayer = function (summary, link, vidNumber) {
@@ -975,10 +987,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
-}]
+}]);
+
+
+function videoOnLoad(event) {
+ console.log('video loaded')
+ var scope = angular.element(document.getElementById("CAView")).scope();
+ // var len = (event.target.id).split("_").length;
+ var windowviewid = (event.target.id).split("_")[1];
-);
+ scope.$apply(function () {
+ scope.videoOnLoad(windowviewid);
+ });
+}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 377c634..d3d5a65 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -65,7 +65,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
'currentSlug': '',
'imageId': '',
'imageName': '',
- 'isShowBodyWithCBData': false
+ 'isTextVisible': true
});
}
@@ -92,7 +92,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
'currentSlug': '',
'imageId': '',
'imageName': '',
- 'isShowBodyWithCBData':false
+ 'isTextVisible': true
});
}
@@ -758,6 +758,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.SetCIwindowStoreData(windowviewid, 'ImageSummary', selectedImageCISummary);
+ var isTextVisible = $scope.ciOpenInOtherModules.textVisible;
+
+ $scope.SetCIwindowStoreData(windowviewid, 'isTextVisible', isTextVisible);
+
var ciTitle = $scope.ciOpenInOtherModules.anatomyTitle;
$scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
localStorage.setItem("currentViewTitle", ciTitle);
@@ -883,8 +887,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.JsPanelclick(windowviewid);
}
- $scope.SetCIwindowStoreData(windowviewid, 'isShowBodyWithCBData', false);
$rootScope.CIWindowLoadComplete = true;
+
+ var isTextVisible = $scope.GetCIwindowStoreData(windowviewid, 'isTextVisible');
+
+
+ if (isTextVisible) {
+ $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
+ }
+ else {
+ $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
+
+ }
+
});
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 673bde2..59522f7 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -50,7 +50,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
//Added code by sandeep for fixed Bug-58066
var ddlViewerLen = $("#viwerSelect option").length;
- if (ddlViewerLen == 1) {
+ if (ddlViewerLen == 0) {
$('#viwerSelect').hide();
}
});
@@ -1209,7 +1209,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
var imageSourc;
var DawindowId = 0;
var AtlasWindowId = 0;
- var ClinicalWindowId = 0;
+ var CIWindowId = 0;
+ var CAWindowId = 0;
$scope.LoadModuleName = [];
$scope.Slidenumber = id;
@@ -1262,8 +1263,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
}
else if (windowData.mType == "CLINICAL_ILLUSTRATIONS") {
- ModuleService.setModuleData(windowData, ClinicalWindowId, $scope.Slidenumber);
- ClinicalWindowId = ClinicalWindowId + 1;
+ ModuleService.setModuleData(windowData, CIWindowId, $scope.Slidenumber);
+ CIWindowId = CIWindowId + 1;
+ var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
+ if (isFound == -1) {
+ $scope.LoadModuleName.push(windowData.mType);
+ }
+ }
+ else if (windowData.mType == "CLINICAL_ANIMATIONS") {
+ ModuleService.setModuleData(windowData, CAWindowId, $scope.Slidenumber);
+ CAWindowId = CAWindowId + 1;
var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
if (isFound == -1) {
$scope.LoadModuleName.push(windowData.mType);
@@ -1303,7 +1312,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
if (isFound == -1) {
$scope.LoadModuleName.push(windowData.mType);
}
- ModuleService.setModuleData(windowData, ClinicalWindowId, $scope.Slidenumber);
+ ModuleService.setModuleData(windowData, CIWindowId, $scope.Slidenumber);
+
+ }
+ else if (windowData.mType == "CLINICAL_ANIMATIONS") {
+ var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName)
+ if (isFound == -1) {
+ $scope.LoadModuleName.push(windowData.mType);
+ }
+ ModuleService.setModuleData(windowData, CAWindowId, $scope.Slidenumber);
}
@@ -1333,7 +1350,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
else { //Added Code by sandeep for user story-52696
var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
if (modulePanel != undefined && modulePanel != null) {
- $('#viwerSelect').append('');
+ // $('#viwerSelect').append('');
+
//Added code by sandeep for fixed Bug-58066
if (modulePanel.length > 0) {
$('#viwerSelect').show();
@@ -1347,10 +1365,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
$('#viwerSelect').append('');
}
-
- // cb panel loader for HomeContainerDiv
-
+
$scope.CBEnableUI();
+ // scroll down to first panel
+ var lastpanel = modulePanel[0].id;
+ $('body,html').animate({ scrollTop: $('#' + lastpanel).position().top }, 1000);
+
}
}
@@ -1385,8 +1405,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
}
+ else if (moduleName == "CLINICAL_ANIMATIONS") {
+ var CAData = ModuleService.getModuleData(moduleName);
+
+ if (CAData != undefined && CAData.length > 0) {
+ $scope.loadClinicalAnimationModule();
+ }
+
+ }
}
+ $scope.loadClinicalAnimationModule = function () {
+ $rootScope.isCallFromOtherModule = true;
+ $('#parentcustomDiv').append($(''));
+ $e = $('#caCustomModuleDiv' + $scope.Slidenumber).append("");
+ $compile($e)($scope);
+ }
$scope.loadClinicalIllustrationModule = function () {
$rootScope.isCallFromOtherModule = true;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 793eaa0..0ff499f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1526,8 +1526,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
if ($('#aiImagePanel').length > 0)
$('#aiImagePanel').remove();
- if ($('#caVideoPanel').length > 0)
- $('#caVideoPanel').remove();
+ //if ($('#caVideoPanel').length > 0)
+ // $('#caVideoPanel').remove();
+
+ if ($('#caImagePanel').length > 0)
+ $('#caImagePanel').remove();
if ($('#ImagePanel').length > 0)
$('#ImagePanel').remove();
@@ -5922,14 +5925,16 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
$('#printDivContent').empty();
}
var pageno = 0;
- // default to select all open module
- var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
+ // select all open module div.
+ // var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='3DImagePanel']");
+ var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']");
for (var i = 0 ; i < modulePanel.length; i++) {
- pageno = pageno + 1;
var paneld = modulePanel[i].id;
-
+
+ pageno = pageno + 1;
+
var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
$scope.GetDocumentPrintElementCB(paneld);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index b93dc8b..0b3856f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -581,16 +581,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
if (document.getElementById('aaBodyView') != null) {
//0.4 added some stylesheets
- $('#aaBodyView').css("height", $(window).outerHeight() - 65);
-
- $('#aaBodyView').css("width", $(window).outerWidth() - 15);
-
+
if ($rootScope.isCallFromOtherModule) {
var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 110;
}
else
{
- var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
+ var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
+
+ $('#aaBodyView').css("height", $(window).outerHeight() - 65);
+
+ $('#aaBodyView').css("width", $(window).outerWidth() - 15);
+
}
$('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js b/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js
index d5a8142..1bcad65 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js
@@ -18,4 +18,11 @@ AIA.directive('clinicalIllustrationDirective', function (ModuleService) {
templateUrl: 'app/views/ci/clinical-illustrations-detail.html',
}
+});
+AIA.directive('clinicalAnimationDirective', function (ModuleService) {
+ return {
+ //restrict: 'E',
+ templateUrl: 'app/views/ca/clinical-animations-detail.html',
+
+ }
});
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/clinical-animations-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/clinical-animations-detail.html
index fffd634..150e423 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/clinical-animations-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/clinical-animations-detail.html
@@ -1,4 +1,4 @@
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist.json b/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist.json
index 9ca3c4c..fa87a20 100644
--- a/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist.json
+++ b/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist.json
@@ -289,6 +289,18 @@
"_Summary": "This animation shows a vasectomy procedure.",
"_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."
},
+ {
+ "_id": "1130",
+ "_ImageId": "3403",
+ "_Title": "Low back pain",
+ "_Video": "ca_vid_3403.flv",
+ "_ThumbnailImage": "ca_tni_3403.jpg",
+ "_BodySystem": "Nervous, Skeletal",
+ "_BodyRegion": "Body Wall and Back, Pelvis and Perineum, Thorax",
+ "_MedicalSpecialty": "Chiropractic, Orthopedics, Osteopathy, Sports Medicine",
+ "_Summary": "This animation illustrates various parts of the spine and potential causes of low back pain.",
+ "_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. The vertebral column consists of 5 major divisions:7 cervical vertebrae 12 thoracic vertebrae 5 lumbar vertebrae SacrumCoccyx"
+ },
{
"_id": "1131",
"_ImageId": "3404",
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json b/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json
index c4cdd1b..6b96b4a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json
+++ b/400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json
@@ -313,6 +313,19 @@
"_Summary": "This animation shows a vasectomy procedure.",
"_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."
},
+ {
+ "_id": "1130",
+ "_ImageId": "3403",
+ "_Title": "Low back pain",
+ "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200148/200148.mp4",
+ "_HostedFolderId": "200148",
+ "_ThumbnailImage": "ca_tni_3403.jpg",
+ "_BodySystem": "Nervous, Skeletal",
+ "_BodyRegion": "Body Wall and Back, Pelvis and Perineum, Thorax",
+ "_MedicalSpecialty": "Chiropractic, Orthopedics, Osteopathy, Sports Medicine",
+ "_Summary": "This animation illustrates various parts of the spine and potential causes of low back pain.",
+ "_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. The vertebral column consists of 5 major divisions: 7 cervical vertebrae 12 thoracic vertebrae 5 lumbar vertebrae Sacrum Coccyx"
+ },
{
"_id": "1131",
"_ImageId": "3404",
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
index 77d2030..05db7e6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -891,7 +891,7 @@ var jsPanel = {
top: parseInt(80),
left: parseInt(320),
width: currentController == 'CIController' ? 1010 : 1025,
- height: currentController == 'CIController' ? 550 : 580,
+ height: currentController == 'CIController' ? 550 : currentController == 'CAController' ? 545: 580,
});
}
@@ -1070,7 +1070,7 @@ var jsPanel = {
var MultiWinId = (panel.option.id).split("_")[len - 1];
$('#canvasDivCI_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10) - 70));
- }
+ }
else
{
// add for other module like CI,AI when implemt for CB
@@ -1080,7 +1080,7 @@ var jsPanel = {
panel.css({
width: panel.option.size.width,
- height: currentController == 'CIController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
+ height: currentController == 'CIController' ? parseInt(panel.option.size.height, 10) : currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
top: panelTop,
left: panel.option.position.left
});
@@ -1090,8 +1090,8 @@ var jsPanel = {
else
{
panel.css({
- width: currentController == 'CIController' ? panel.option.size.width-18 : panel.option.size.width,
- height: parseInt(panel.option.size.height, 10) + 35,
+ width: currentController == 'CIController' ? panel.option.size.width - 18 : panel.option.size.width,
+ height: currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
top: panelTop,
left: panel.option.position.left
});