diff --git a/.gitignore b/.gitignore index 6e642df..7525109 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ $tf*/ 300-PROTOTYPES/POC/AIAHTML5 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig -400-SOURCECODE/AIAHTML5.Web/index.html.orig \ No newline at end of file +400-SOURCECODE/AIAHTML5.Web/index.html.orig +400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css.orig \ No newline at end of file diff --git a/100-REQUIREMENTS/AtalusAnotamyFlow.txt b/100-REQUIREMENTS/AtalusAnotamyFlow.txt new file mode 100644 index 0000000..26a5804 --- /dev/null +++ b/100-REQUIREMENTS/AtalusAnotamyFlow.txt @@ -0,0 +1,7 @@ +file:///I:/13June2015FinalCode/Flex/v107/content/en_US/aa_img_2921.jpg + +aa_dat_pindata_2921.xml + +file:///I:/13June2015FinalCode/Flex/v107/content/en_US/aa_img_2921.jpg + +aa_img_2921.jpg \ No newline at end of file diff --git a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx new file mode 100644 index 0000000..724238a --- /dev/null +++ b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx diff --git a/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.Designer.cs b/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.Designer.cs new file mode 100644 index 0000000..4a50280 --- /dev/null +++ b/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.Designer.cs @@ -0,0 +1,73 @@ +namespace ModifyXml +{ + partial class AtlasAnatomy + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnBrowseFolder = new System.Windows.Forms.Button(); + this.lblInfo = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // btnBrowseFolder + // + this.btnBrowseFolder.Location = new System.Drawing.Point(288, 91); + this.btnBrowseFolder.Name = "btnBrowseFolder"; + this.btnBrowseFolder.Size = new System.Drawing.Size(132, 31); + this.btnBrowseFolder.TabIndex = 0; + this.btnBrowseFolder.Text = "Browse Folder"; + this.btnBrowseFolder.UseVisualStyleBackColor = true; + this.btnBrowseFolder.Click += new System.EventHandler(this.btnBrowseFolder_Click); + // + // lblInfo + // + this.lblInfo.AutoSize = true; + this.lblInfo.Location = new System.Drawing.Point(47, 100); + this.lblInfo.Name = "lblInfo"; + this.lblInfo.Size = new System.Drawing.Size(133, 13); + this.lblInfo.TabIndex = 1; + this.lblInfo.Text = "Please select zipped folder"; + // + // AtlasAnatomy + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(667, 380); + this.Controls.Add(this.lblInfo); + this.Controls.Add(this.btnBrowseFolder); + this.Name = "AtlasAnatomy"; + this.Text = "AtlasAnatomy"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnBrowseFolder; + private System.Windows.Forms.Label lblInfo; + } +} \ No newline at end of file diff --git a/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.cs b/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.cs new file mode 100644 index 0000000..352e7b2 --- /dev/null +++ b/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace ModifyXml +{ + public partial class AtlasAnatomy : Form + { + public AtlasAnatomy() + { + InitializeComponent(); + } + + private void btnBrowseFolder_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.resx b/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/350-UTILITIES/ModifyXml/ModifyXml/AtlasAnatomy.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/350-UTILITIES/ModifyXml/ModifyXml/ModifyXml.csproj b/350-UTILITIES/ModifyXml/ModifyXml/ModifyXml.csproj index 8a7e3b3..d39d6d4 100644 --- a/350-UTILITIES/ModifyXml/ModifyXml/ModifyXml.csproj +++ b/350-UTILITIES/ModifyXml/ModifyXml/ModifyXml.csproj @@ -1,90 +1,99 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {D8BF6120-CD3F-4440-9B5C-4DE0D86C741B} - WinExe - Properties - ModifyXml - ModifyXml - v4.0 - Client - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {D8BF6120-CD3F-4440-9B5C-4DE0D86C741B} + WinExe + Properties + ModifyXml + ModifyXml + v4.0 + Client + 512 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + Form + + + AtlasAnatomy.cs + + + Form + + + Form1.cs + + + + + AtlasAnatomy.cs + + + Form1.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + --> \ No newline at end of file diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo index 2d5b389..19af432 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2864.xml b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2864.xml new file mode 100644 index 0000000..23dbdd1 --- /dev/null +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2864.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2875.xml b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2875.xml new file mode 100644 index 0000000..e7846d2 --- /dev/null +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2875.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2920.xml b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2920.xml new file mode 100644 index 0000000..ca029ef --- /dev/null +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2920.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2921.xml b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2921.xml new file mode 100644 index 0000000..83e368e --- /dev/null +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/Upload/aa_dat_pindata_2921.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.dll b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.dll index dfbd9d8..c9ceea6 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.dll +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.dll diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.pdb b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.pdb index d9a2306..2e3d2ca 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.pdb +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/bin/XMLtoJSON_utility.pdb diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 239f28e..6fd6c85 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.csproj.FileListAbsolute.txt b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.csproj.FileListAbsolute.txt index a0ac968..d09316c 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.csproj.FileListAbsolute.txt +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.csproj.FileListAbsolute.txt @@ -10,3 +10,9 @@ D:\100-PROJECTS\003-AIAHTML5\AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XML D:\100-PROJECTS\003-AIAHTML5\AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\obj\Debug\XMLtoJSON_utility.csprojResolveAssemblyReference.cache D:\100-PROJECTS\003-AIAHTML5\AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\obj\Debug\XMLtoJSON_utility.dll D:\100-PROJECTS\003-AIAHTML5\AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\obj\Debug\XMLtoJSON_utility.pdb +I:\100-PROJECTS\001-AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\bin\XMLtoJSON_utility.dll.config +I:\100-PROJECTS\001-AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\bin\XMLtoJSON_utility.dll +I:\100-PROJECTS\001-AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\bin\XMLtoJSON_utility.pdb +I:\100-PROJECTS\001-AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\obj\Debug\XMLtoJSON_utility.csprojResolveAssemblyReference.cache +I:\100-PROJECTS\001-AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\obj\Debug\XMLtoJSON_utility.dll +I:\100-PROJECTS\001-AIAHTML5\350-UTILITIES\Parser\XMLtoJSON_utility\XMLtoJSON_utility\obj\Debug\XMLtoJSON_utility.pdb diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.dll b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.dll index dfbd9d8..c9ceea6 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.dll +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.dll diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.pdb b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.pdb index d9a2306..2e3d2ca 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.pdb +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility/obj/Debug/XMLtoJSON_utility.pdb diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index 8dac2ca..a49ec56 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -50,10 +50,12 @@ + + @@ -66,6 +68,7 @@ + @@ -75,6 +78,7 @@ + @@ -83,6 +87,11 @@ + + + + + @@ -116,6 +125,479 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43359,6 +43841,7 @@ + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js index b72e681..aee2947 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js @@ -8,7 +8,6 @@ AIA.controller("AuthenticationController", ["$scope", "$log", "$location", '$win $scope.login = function () { - // alert('called controller'); $scope.IsAuthenticated = AuthenticationService.authenticateUser('superadmin', 'education'); if ($scope.IsAuthenticated) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 6717bf4..9ef0aac 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -170,6 +170,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#MainImage').remove(); } $rootScope.currentActiveModuleTitle = Modules[0].Name; + + alert('mod name: ' + Modules[0].Name) + $("#bodyViewList").empty(); //for default load if ($event == null || $event == undefined) { @@ -265,7 +268,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.openView = function ($event) { - $rootScope.disableAnnotationTB = false; + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index 3f29507..ebd111e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -1,47 +1,47 @@ -'use strict'; - -AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams", -function ($scope, $rootScope, log, pages, $routeParams) { - - //$rootScope.currentActiveModuleTitle = Modules[10].Name; - //$rootScope.currentActiveModuleTitle = $routeParams.modname; - $scope.links = [ - new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"), - new link("IP-10", "IP 10", "http://182.19.10.91:92/IPWeb10/index.aspx", "100%", "750px"), - new link("indepth-reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"), - new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"), - new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"), - new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"), - new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px") - ]; - - $scope.$on('$viewContentLoaded', function (event) { - // code that will be executed ... - // every time this view is loaded - - for (var i = 0; i < $scope.links.length; i++) { - if ($scope.links[i].modname == $routeParams.modname) { - $rootScope.currentActiveModuleTitle = $scope.links[i].title; - $scope.objdata = $scope.links[i].objurl; - $scope.myObj = $scope.links[i].objstyle; - } - } - }); - - $scope.showme = false; - $scope.IsVisible = function () { - $scope.scroll(); - - } - - $scope.scroll = function () { - // $window.scrollTo(0, 0); - $("html,body").scrollTop(0); - //alert("scroll"); - } -}] - - -); - - +'use strict'; + +AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams", +function ($scope, $rootScope, log, pages, $routeParams) { + + //$rootScope.currentActiveModuleTitle = Modules[10].Name; + //$rootScope.currentActiveModuleTitle = $routeParams.modname; + $scope.links = [ + new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"), + new link("IP-10", "IP 10", "http://182.19.10.91:92/IPWeb10/index.aspx", "100%", "750px"), + new link("indepth-reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"), + new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"), + new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"), + new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"), + new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px") + ]; + + $scope.$on('$viewContentLoaded', function (event) { + // code that will be executed ... + // every time this view is loaded + + for (var i = 0; i < $scope.links.length; i++) { + if ($scope.links[i].modname == $routeParams.modname) { + $rootScope.currentActiveModuleTitle = $scope.links[i].title; + $scope.objdata = $scope.links[i].objurl; + $scope.myObj = $scope.links[i].objstyle; + } + } + }); + + $scope.showme = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } +}] + + +); + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js new file mode 100644 index 0000000..2f0ca3d --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -0,0 +1,136 @@ +'use strict'; + +AIA.controller("TileViewListController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "$timeout", "Modules", "$routeParams", "DataService","ModuleService" , +function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, BodySystems, ViewOrientations, ImageTypes, $timeout, Modules, $routeParam, DataService,ModuleService) +{ + var ATLAS_ANATOMY = 'Atlas Anatomy'; + var CLINICAL_ILLUSTRATION ='Clinical Illustrations'; + var CLINICAL_ANIMATION='Clinical Animations'; + + var moduleData = []; + + $scope.AllBodyRegion = []; + $scope.AllBodySystem = []; + $scope.AllOrientation = []; + $scope.AllImageType = []; + $scope.moduleData = []; + + $scope.loadForModuleById = function (moduleId) { + + $scope.moduleId = moduleId; + + console.log('loadForModuleById is called') + $scope.moduleName = Modules[moduleId].Name; + + $scope.loadDataForModule($scope.moduleName); + } + + $scope.loadDataForModule = function (moduleName) + { + + //0. load filter static data + + $scope.AllBodyRegion = BodyRegions; + $scope.AllBodySystem = BodySystems; + $scope.AllOrientation = ViewOrientations; + $scope.AllImageType = ImageTypes; + + //1. load dynamic data for module specific images + var jsonPath; + if(moduleName==ATLAS_ANATOMY) + { + jsonPath ='~/../content/data/json/aa/aa_dat_contentlist.json'; + } + else if(moduleName == CLINICAL_ANIMATION) + { + //to do, in next phase of project + jsonPath ='~/../content/data/json/ca/ca_dat_contentlist.json'; + } + else if(moduleName == CLINICAL_ILLUSTRATION) + { + //to do, in next phase of project + jsonPath ='~/../content/data/json/ci/ci_dat_contentlist.json'; + } + + var promise = DataService.getJson(jsonPath) + promise.then( + function (result) { + $scope.AtlasAnatomyData = result; + + $scope.data = new jinqJs() + .from($scope.AtlasAnatomyData.root.Item) + .orderBy([{ field: '_Title', sort: 'asc' }]) + .select(); + + //console.log($scope.selectedCIListViewData); + //$('#grid-view').empty(); + angular.forEach($scope.data, function (value, key) + { + // $rootScope.moduleData = []; + $scope.moduleData.push({ "id": value._Id, "imageID": value._ImageId, "TileName": value._TileImageName, "DivImageTitle": value._Title }); + // $scope.moduleData.push(value._ImageId); + // $scope.moduleData.push(value._TileImageName); + + $scope.ImageName = value._TileImageName; + $scope.imagePath = "~/../content/images/aa/thumbnails/" + value._TileImageName; + $scope.TileViewId = value._Id; + + var $el = $('
' + + '
' + + '' + + '

' + value._Title + '

').appendTo('#grid-view'); + + + $compile($el)($scope); + + //$(".sidebar").mCustomScrollbar({ + // autoHideScrollbar: true, + // //theme:"rounded" + //}); + + + }); + + $scope.scroll(); + + }, + function (error) { + // handle errors here + console.log(' $scope.IllustrationData = ' + error.statusText); + } + ); + + + } + + $scope.scroll = function () { + $("html,body").scrollTop(0); + } + + $scope.openModuleItem = function ($event) { + + var moduleItemDataToBeSaved = []; + + + for(var i=0;i<=$scope.moduleData.length-1;i++) + { + + if ($scope.moduleData[i].DivImageTitle == event.target.id) + { + + alert($scope.moduleData[i].imageID); + + moduleItemDataToBeSaved.push($scope.moduleData[i].imageID, $scope.moduleData[i].id,$scope.moduleName); + } + + } + + + ModuleService.SaveOpenedModules(moduleItemDataToBeSaved); + + //var isSaved= ModuleService.SaveOpenedModules(moduleDetails); + //alert(isSaved); + + } + +}]); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 09d92d7..d112f26 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -24,6 +24,13 @@ AIA.constant('pages', [ pageUrl: 'app/views/da/da-body-view.html', pageController: 'DAController' }, + { + name: 'Tiny View List', + pageSlug: 'tile-view-list', + pageUrl: 'app/views/tile-view.html', + pageController: 'TileViewListController' + + }, { // id:3, name: 'Clinical Illustrations', pageSlug: 'clinical-illustrations', @@ -183,6 +190,7 @@ AIA.constant('DA', [ ]); + AIA.constant('Modules', [ { Id: 1, @@ -256,6 +264,7 @@ AIA.constant('Modules', [ }, ]); + AIA.constant('BodyViewws', [ { Id: 1, diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js new file mode 100644 index 0000000..32b1757 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -0,0 +1,81 @@ +var ATLAS_ANATOMY = 'Atlas Anatomy'; +var CLINICAL_ILLUSTRATION = 'Clinical Illustrations'; +var CLINICAL_ANIMATION = 'Clinical Animations'; +var OpenedModuleItemList = []; +var ModDetail = []; + +AIA.factory('ModuleService', function (DataService) +{ + return { + SaveOpenedModules: function (moduleDetails) + { + ModDetail = moduleDetails; + + OpenedModuleItemList.push("imageId: "+ moduleDetails[0]); + OpenedModuleItemList.push("moduleId:" + moduleDetails[1]); + OpenedModuleItemList.push("moduleName: " + moduleDetails[2]); + + + //var moduleId = moduleDetails.moduleId; + //OpenedModuleList.push(moduleId); + //OpenedModuleList.tileViewId = moduleDetails.TileViewId; + //OpenedModuleList.tileImageName = moduleDetails.imageName; + //OpenedModuleList.tileImageSRC = moduleDetails.imagePath; + + //moduleData.push($scope.moduleId); + //moduleData.push(value._Id); + //moduleData.push(value._ImageId); + //moduleData.push(value._Title); + //moduleData.push(value._ImageName); + //moduleData.push(value._BodySystem); + //moduleData.push(value._BodyRegion); + //moduleData.push(value._ViewOrientation); + //moduleData.push(value._ImageType); + //moduleData.push(value._TileImageName); + + + console.log('called service'); + + + this.renderModuleItemById(); + + }, + + renderModuleItemById : function () { + + var jsonFileForOpenModule; + + if (ModDetail[2] == ATLAS_ANATOMY) + { + this.loadPinData(); + + } + else if (ModDetail[2] == CLINICAL_ANIMATION) { + + } + else if (ModDetail[3] == CLINICAL_ILLUSTRATION) { + + } + + }, + loadPinData: function () { + var pinJsonFile = "/content/data/json/aa/aa_pin_data/aa_dat_pindata_" + ModDetail[0] + ".json"; + alert('pinJsonFile: ' + pinJsonFile); + var promise = DataService.getJson(pinJsonFile); + promise.then( + function (result) { + var AtlasAnatomyPinData = result; + + var data = new jinqJs() + .from(AtlasAnatomyPinData.root.Item) + //.orderBy([{ field: '_Title', sort: 'asc' }]) + .select(); + + }) + } + + }; + + + +}); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index cf41d36..39366e9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -345,6 +345,7 @@
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/module-item-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/module-item-view.html new file mode 100644 index 0000000..85ced9f --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/module-item-view.html @@ -0,0 +1,369 @@ + + + + + + + A.D.A.M. Interactive Anatomy + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + +

1st & 2nd Intercostal Spaces

+ +
+
+
+
+ +
+

Zoom

+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html new file mode 100644 index 0000000..47cb00c --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html @@ -0,0 +1,165 @@ +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TitleRegionSystemViewTypeSpecialty
+ {{item._Title}} + + {{item._BodyRegion}} + + {{item._BodySystem}} + + {{item._ViewOrientation}} + + {{item._ImageType}} + + {{item._MedicalSpecialty}} +
+ {{item._Title}} + + {{item._BodyRegion}} + + {{item._BodySystem}} + + {{item._ViewOrientation}} + + {{item._ImageType}} + + {{item._MedicalSpecialty}} +
No illustration found for the selected search criteria!
+
+
+
+
+
+ +
+
+
+

+ +
+
+ +
+
+
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html index a469c23..df9bb6e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -26,7 +26,7 @@