diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
index 73c49ce..d47a403 100644
--- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
+++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -111,14 +111,15 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
index ab137c3..cd32ef1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -1,111 +1,192 @@
-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 = false;
- $scope.threedanatomyData;
- $scope.Id;
- $scope.$on('$viewContentLoaded', function (event) {
-
- //get current path
- var currentURL = $location.path();
- var selectedModuleName = '';
- //set module title
- angular.forEach($rootScope.userModules, function (value, key) {
- if (value.slug === currentURL.replace('/', '')) {
- selectedModuleName = value.name;
- }
- $rootScope.currentActiveModuleTitle = selectedModuleName;
- })
-
- $scope.GetBodySystemNames();
- //$scope.scroll();
- });
- $scope.scroll = function () {
- // $window.scrollTo(0, 0);
- $("html,body").scrollTop(0);
- //alert("scroll");
- }
- $scope.IsVisible = function () {
- //$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 },
-
- //});
- }
-
-
-
-}]
-
-
-
+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 = false;
+ $scope.threeDAnatomyData;
+ $scope.Id;
+ $scope.$on('$viewContentLoaded', function (event) {
+ $scope.scroll();
+ var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json')
+ promise.then(
+ function (result) {
+ $scope.threeDAnatomyData = result;
+
+ // $scope.selectedThreeDAdata = $scope.threeDAnatomyData.root.ThreeDAData;
+
+ $scope.selectedThreeDAdata = new jinqJs()
+ .from($scope.threeDAnatomyData.root.ThreeDAData)
+ .orderBy([{ field: '_Title', sort: 'asc' }])
+ .select();
+
+ // console.log($scope.selectedCIListViewData);
+ $('#grid-view').empty();
+ angular.forEach($scope.selectedThreeDAdata, function (value, key) {
+ $scope.imagePath = "~/../content/images/3da/thumbnails/" + value._ThumbnailImage;
+
+ var $el = $('
-
-
-
-
-
-
-
{{bodySystemTitle}}
-
-
-
-
-
-
-
-
+
\ No newline at end of file
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 2a3e015..82a4005 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html
@@ -1,97 +1,7 @@
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/data/json/3da/3da_dat_contentlist.json b/400-SOURCECODE/AIAHTML5.Web/content/data/json/3da/3da_dat_contentlist.json
index 8106765..4cbfdbb 100644
--- a/400-SOURCECODE/AIAHTML5.Web/content/data/json/3da/3da_dat_contentlist.json
+++ b/400-SOURCECODE/AIAHTML5.Web/content/data/json/3da/3da_dat_contentlist.json
@@ -1,36 +1,121 @@
{
- "root": {
- "ThreeDAData": [
- {
- "_id": "1",
- "_Title": "3D Head and Neck",
- "_ThumbnailImage": "3d-3.jpg" ,
- "_3dimagepath" :"https://preview.biodigital.com/widget/?m=preview/v2_musculoskeletal_head_neck.json&ui-all=true&ui-tree=true&uaid=f7n"
- },
- {
- "_id": "2",
- "_Title": "3d Brain",
- "_ThumbnailImage": "3d-4.jpg" ,
- "_3dimagepath" :"https://preview.biodigital.com/widget/?m=public_preview/brain_whole_test.json&ui-tools=true&ui-panel=false&ui-all=true&ui-tree=true&uaid=f7n"
- },
- {
- "_id": "3",
- "_Title": "3D Heart",
- "_ThumbnailImage": "3d-1.jpg" ,
- "_3dimagepath" :"https://preview.biodigital.com/widget/?m=public_preview/whole_beating_healthy_heart.json&ui-tools=true&ui-tree=true&ui-panel=false&uaid=f7n"
- },
- {
- "_id": "4",
- "_Title": "3D Ear",
- "_ThumbnailImage": "3d-5.jpg" ,
- "_3dimagepath" :"https://human.biodigital.com/widget/?m=production/maleAdult/earCross.json&uaid=1KT9V&ui-tools=true&ui-panel=true"
- },
- {
- "_id": "5",
- "_Title": "3D Eye",
- "_ThumbnailImage": "3d-6.jpg" ,
- "_3dimagepath" :"https://human.biodigital.com/widget/?m=production/maleAdult/eyeAnatomyTour.json&ui-tree=true&ui-tools=true&uaid=1KT9V"
- }
- ]
- }
+ "root": {
+ "ThreeDAData": [{
+ "_id": "11",
+ "_ImageId": "3347",
+ "_Title": "3D Heart",
+ "_ThumbnailImage": "3d_tni_3347.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1XGM&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodyRegion": "Body Wall and Back",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Heart"
+ }, {
+ "_id": "12",
+ "_ImageId": "3348",
+ "_Title": "3D Lungs",
+ "_ThumbnailImage": "3d_tni_3348.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1XGN&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodyRegion": "Body Wall and Back",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Lungs"
+ }, {
+ "_id": "13",
+ "_ImageId": "3349",
+ "_Title": "3D Skull",
+ "_ThumbnailImage": "3d_tni_3349.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1Tg1&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Skull"
+ }, {
+ "_id": "14",
+ "_ImageId": "3350",
+ "_Title": "3D Brain",
+ "_ThumbnailImage": "3d_tni_3350.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1Tg2&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12&ui-info=true&ui-tools=true&ui-object-tree=true&ui-share=false",
+ "_BodyRegion": "Body Wall and Back",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Brain"
+ }, {
+ "_id": "15",
+ "_ImageId": "3351",
+ "_Title": "3D Ear",
+ "_ThumbnailImage": "3d_tni_3351.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1XGQ&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodyRegion": "Body Wall and Back",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Ear"
+ }, {
+ "_id": "16",
+ "_ImageId": "3352",
+ "_Title": "3D Eye",
+ "_ThumbnailImage": "3d_tni_3352.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1XGU&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodyRegion": "Body Wall and Back",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Eye"
+ }, {
+ "_id": "17",
+ "_ImageId": "3353",
+ "_Title": "3D Female Reproductive System",
+ "_ThumbnailImage": "3d_tni_3353.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1XGn&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodyRegion": "Body Wall and Back",
+ "_BodyRegionId": "3",
+ "_BodySystem": "Skeletal",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Female Reproductive System"
+ }, {
+ "_id": "18",
+ "_ImageId": "3354",
+ "_Title": "3D Male Reproductive System",
+ "_ThumbnailImage": "3d_tni_3354.jpg",
+ "_3dimagepath": "https://human.biodigital.com/widget/?be=1XGm&ui-info=true&ui-share=false&ui-fullscreen=false&ui-tools=true&ui-object-tree=true&dk=10e5f3e00a2187fbe1e74a6dd01162efcf118e12",
+ "_BodySystemId": "11",
+ "_ViewOrientation": "Non-standard",
+ "_ViewOrientationId": "7",
+ "_ImageType": "Cadaver Photograph",
+ "_ImageTypeId": "2",
+ "_Summary": "3D Male Reproductive System"
+ }]
+ }
}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-1.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-1.jpg
deleted file mode 100644
index 211b4b4..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-1.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-2.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-2.jpg
deleted file mode 100644
index 73901d3..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-2.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-3.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-3.jpg
deleted file mode 100644
index 426eab3..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-3.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-4.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-4.jpg
deleted file mode 100644
index 754267a..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-4.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-5.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-5.jpg
deleted file mode 100644
index 428ee88..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-5.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-6.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-6.jpg
deleted file mode 100644
index 729ba63..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-6.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-7.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-7.jpg
deleted file mode 100644
index 3b15a65..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-7.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-8.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-8.jpg
deleted file mode 100644
index 7a230af..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/3d-8.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3347.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3347.jpg
new file mode 100644
index 0000000..a379657
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3347.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3348.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3348.jpg
new file mode 100644
index 0000000..d9e119c
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3348.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3349.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3349.jpg
new file mode 100644
index 0000000..a43d203
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3349.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3350.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3350.jpg
new file mode 100644
index 0000000..ec3b58c
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3350.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3351.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3351.jpg
new file mode 100644
index 0000000..a45d1b9
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3351.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3352.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3352.jpg
new file mode 100644
index 0000000..deac88c
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3352.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3353.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3353.jpg
new file mode 100644
index 0000000..357f8bb
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3353.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3354.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3354.jpg
new file mode 100644
index 0000000..0175029
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_3354.jpg
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_skull.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_skull.jpg
new file mode 100644
index 0000000..6652ef4
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/3da/thumbnails/3d_tni_skull.jpg