diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index 1b492e0..0334159 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -59,6 +59,7 @@ + @@ -81,6 +82,7 @@ + @@ -106,6 +108,14 @@ + + + + + + + + @@ -405,6 +415,7 @@ + @@ -43292,6 +43303,7 @@ + Web.config diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 7f7b754..6aaa6df 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -1,19 +1,97 @@ -AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", -function ($scope, $rootScope, pages, log) { - +AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", +function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { + $rootScope.currentActiveModuleTitle = pages[5].name; $scope.showme = true; + $scope.threedanatomyData; + $scope.Id; + $scope.$on('$viewContentLoaded', function (event) { + $scope.GetBodySystemNames(); + //$scope.scroll(); + }); + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } $scope.IsVisible = function () { - $scope.scroll(); + //$scope.scroll(); + $location.url("/3dAnatomy"); } - $scope.scroll = function () { // $window.scrollTo(0, 0); $("html,body").scrollTop(0); //alert("scroll"); } + // getting list of body system modules + $scope.GetBodySystemNames = function () { + + var ThreeDAModulePath = '~/../content/data/json/3da/3da_dat_contentlist.json'; + DataService.getAnotherJson(ThreeDAModulePath).then( + function (result) { + //debugger; + $scope.threedanatomyData = result; + $scope.selectedthreeDAdata = $scope.threedanatomyData.root.ThreeDAData; + }, + function (error) { + console.log(error.statusText) + } + ) + + } + + $scope.showDetails = function (id) { + + + //$scope.open3dImageView(id); + localStorage.setItem("currentBodyViewId", id); + $location.url("/3d-anatomy-details"); + } + + $scope.open3dImageView = function () + { + $scope.Id = localStorage.getItem("currentBodyViewId"); + var ThreeDAModulePath = '~/../content/data/json/3da/3da_dat_contentlist.json'; + DataService.getAnotherJson(ThreeDAModulePath).then( + function (result) { + $scope.threedanatomyData = result; + $scope.selectedthreeDAdata = $scope.threedanatomyData.root.ThreeDAData; + //alert(JSON.stringify($scope.selectedthreeDAdata)) + var clicked3dAview = []; + clicked3dAview = new jinqJs().from($scope.selectedthreeDAdata) + .where('_id == ' + $scope.Id) + .select('_Title', '_3dimagepath'); + $scope.SelectedCAthumbImage = clicked3dAview[0]._3dimagepath; + $scope.bodySystemTitle = clicked3dAview[0]._Title; + }, + function (error) { + console.log(error.statusText) + } + ) + localStorage.setItem("currentViewTitle", "3DAnatomy"); + //$.jsPanel({ + // id: 'daImagePanel', + // selector: '.daBodyView', + // theme: 'success', + // currentController: '3dAController', + // parentSlug: '3d-anatomy-details', + // ajax: { + // url: 'app/views/3dA/3d-anatomy-details.html' + // }, + // title: localStorage.getItem("currentViewTitle"), + // position: { + // top: 70, + // left: 1, + // }, + + // size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, + + //}); + } + + }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 6881786..717b52b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -1,6 +1,6 @@ /// -AIA.controller("LabExercController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', -function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce) { +AIA.controller("LabExercController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce',"$compile", +function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { $scope.$sce = $sce; $scope.LabExerciseName; $scope.LabExerciseQuiz = null; @@ -94,18 +94,19 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location if (result.LabExercise[index].Questions[index1].Number == $scope.quiznumber) { if (result.LabExercise[index].Questions[index1].ImagePath == "") { $("#imgblock").css("display", "none"); - $(".options").css("display", "none"); + $scope.IsVisible = false; $("#textblock").css("display", "block"); $scope.LabExerciseModules = result.LabExercise[index].Questions[index1]; $scope.deliberatelyTrustDangerousSnippet = function (html) { - return $sce.trustAsHtml(html); + //var htmltag= $compile(html)($scope); + return $sce.trustAsHtml(html); }; $scope.activityTitle = result.LabExercise[index].Questions[index1].activityTitle; $scope.Title = result.LabExercise[index].Questions[index1].Title; } else { $("#imgblock").css("display", "block"); - $(".options").css("display", "block"); + $scope.IsVisible = true; $("#textblock").css("display", "none"); $scope.LabExerciseModules = result.LabExercise[index].Questions[index1]; $scope.activityTitle = result.LabExercise[index].Questions[index1].activityTitle; @@ -188,6 +189,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location if ($scope.DraggedList[inx1].Value == item) { $scope.DraggedList.splice(inx1, 1); $('#block-' + Options[inx].OptionNumber).css("display", "block"); + $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important"); } }); } @@ -229,6 +231,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.DraggedList.push({ "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord }); //$('#' + $scope.dragableId).remove(); $('#' + $scope.dragableId).css("display", "none"); + $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important"); //$('#' + id).remove(); } }); @@ -318,7 +321,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location } }; - + }] ); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index ac3445b..425e466 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -159,7 +159,13 @@ AIA.constant('pages', [ pageController: 'LabExercController' }, - + { // id:3, + name: '3D Anatomy', + pageSlug: '3d-anatomy-details', + pageUrl: 'app/views/3dA/3d-anatomy-details.html', + pageController: '3dAController' + + }, ]); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html new file mode 100644 index 0000000..bb61647 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html @@ -0,0 +1,22 @@ + +
+
+
+
+ +

{{bodySystemTitle}}

+
+
+
+
+
+
+ + +
+
+
+
+
+ diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html index cb9fb61..0cca864 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html @@ -2,17 +2,17 @@
-
+
- - + +
-

3D Heart

+

{{threeDA._Title}}
-
+ diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html index 09e10fb..5457003 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html @@ -26,8 +26,8 @@
-
-
.
+
+