From d9702b98f44414d529e4c4514577e1dbeb725d77 Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Thu, 3 Nov 2016 18:27:10 +0530 Subject: [PATCH] In between code for calling module service --- 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj | 1 + 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 208 +++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js | 9 +++++++++ 400-SOURCECODE/AIAHTML5.Web/index.html | 3 ++- 5 files changed, 26 insertions(+), 197 deletions(-) create mode 100644 400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index e1f8f33..c3300e7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -55,6 +55,7 @@ + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index fbdf08c..222711d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -268,7 +268,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.openView = function ($event) { - + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 6da4ac0..d4cfe4c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -1,7 +1,7 @@ 'use strict'; -AIA.controller("TileViewListController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "$timeout", "Modules", "$routeParams", "DataService", -function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, BodySystems, ViewOrientations, ImageTypes, $timeout, Modules, $routeParam, DataService) +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'; @@ -15,6 +15,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod $scope.loadForModuleById = function (moduleId) { + $scope.moduleId = moduleId; + console.log('loadForModuleById is called') var moduleName = Modules[moduleId].Name; @@ -63,7 +65,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod angular.forEach($scope.data, function (value, key) { $scope.imagePath = "~/../content/images/aa/thumbnails/" + value._TinyImageName; - var $el = $('
' + var $el = $('
' + '
' + '' + '

' + value._Title + '

').appendTo('#grid-view'); @@ -95,200 +97,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod $("html,body").scrollTop(0); } - $scope.openModule = function (moduleId) { - - + $scope.openModuleItem = function (event) { + + alert('call on TileViewListController'); - } + var moduleDetails = []; + moduleDetails.push($scope.moduleId); + + var isSaved= ModuleService.SaveOpenedModules(); + alert(isSaved); - $scope.ApplySearch = function (query) { - - $scope.filterstring = true; - - while ($scope.searchCIListViewData.length) { - $scope.searchCIListViewData.pop(); - } - - //$('#grid-view').empty(); - - filtercount = 0; - if (typeof (query.selectedbodyregion) !== "undefined" && (query.selectedbodyregion !== null && query.selectedbodyregion !== "")) { - filtercount = filtercount + 1; - localStorage.setItem("CICurBodyRegion", query.selectedbodyregion); - } - else { - localStorage.setItem("CICurBodyRegion", ''); - } - - if (typeof (query.selectedbodysystem) !== "undefined" && (query.selectedbodysystem !== null && query.selectedbodysystem !== "")) { - filtercount = filtercount + 1; - localStorage.setItem("CICurBodySystem", query.selectedbodysystem); - } - else { - localStorage.setItem("CICurBodySystem", ''); - } - - if (typeof (query.selectedorientation) !== "undefined" && (query.selectedorientation !== null && query.selectedorientation !== '')) { - filtercount = filtercount + 1; - localStorage.setItem("CICurOrientation", query.selectedorientation); - } - else { - localStorage.setItem("CICurOrientation", ''); - } - - if (typeof (query.selectedimagetype) !== "undefined" && (query.selectedimagetype !== null && query.selectedimagetype !== '')) { - filtercount = filtercount + 1; - localStorage.setItem("CICurImageType", query.selectedimagetype); - } - else { - localStorage.setItem("CICurImageType", ''); - } - - if (typeof (query.selectedspecialty) !== "undefined" && (query.selectedspecialty !== null && query.selectedspecialty !== '')) { - filtercount = filtercount + 1; - localStorage.setItem("CICurSpeciality", query.selectedspecialty); - } - else { - localStorage.setItem("CICurSpeciality", ''); - } - - - var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json') - promise.then( - function (result) { - $scope.IllustrationData = result; - //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData; - - $scope.selectedCIListViewData = new jinqJs() - .from($scope.IllustrationData.root.CIData) - .orderBy([{ field: '_Title', sort: 'asc' }]) - .select(); - - $('#grid-view').empty(); - - angular.forEach($scope.selectedCIListViewData, function (value, key) { - - var selectimg = true; - var count = 0; - - - if (typeof (query.selectedbodyregion) !== "undefined" && (query.selectedbodyregion !== null && query.selectedbodyregion !== "")) { - var posbodyregion = value._BodyRegion.indexOf((query.selectedbodyregion.trim())); - if (posbodyregion > -1) { - selectimg = true; - count = count + 1; - - } - else { - selectimg = false; - count = count - 1; - } - - } - - if (typeof (query.selectedbodysystem) !== "undefined" && (query.selectedbodysystem !== null && query.selectedbodysystem !== "")) { - var posbodysystem = value._BodySystem.indexOf(query.selectedbodysystem); - if (posbodysystem > -1) { - count = count + 1; - selectimg = true; - } else { - selectimg = false; - count = count - 1; - } - } - - if (typeof (query.selectedorientation) !== "undefined" && (query.selectedorientation !== null && query.selectedorientation !== "")) { - var posorientation = value._ViewOrientation.indexOf(query.selectedorientation); - if (posorientation > -1) { - count = count + 1; - selectimg = true; - - } else { - selectimg = false; - count = count - 1; - } - - } - - if (typeof (query.selectedimagetype) !== "undefined" && (query.selectedimagetype !== null && query.selectedimagetype !== "")) { - var posimagetype = value._ImageType.indexOf(query.selectedimagetype); - if (posimagetype > -1) { - count = count + 1; - selectimg = true; - - } else { - selectimg = false; - count = count - 1; - } - - } - - if (typeof (query.selectedspecialty) !== "undefined" && (query.selectedspecialty !== null && query.selectedspecialty !== "")) { - var posspeciality = value._MedicalSpecialty.indexOf(query.selectedspecialty); - if (posspeciality > -1) { - count = count + 1; - selectimg = true; - } else { - selectimg = false; - count = count - 1; - } - - } - - if (selectimg === true && count >= filtercount) { - - - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage; - - var $el = $('
' - + '
' - + '' - + '

' + value._Title + '

').appendTo('#grid-view'); - - - $compile($el)($scope); - - $(".sidebar").mCustomScrollbar({ - autoHideScrollbar: true, - //theme:"rounded" - }); - - - $scope.searchCIListViewData.push( - { - "_id": value._id, - "_ImageId": value._ImageId, - "_Title": value._Title, - "_contentImage": value._contentImage, - "_ThumbnailImage": value._ThumbnailImage, - "_BodySystem": value._BodySystem, - "_BodyRegion": value._BodyRegion, - "_ViewOrientation": value._ViewOrientation, - "_MedicalSpecialty": value._MedicalSpecialty, - "_ImageType": value._ImageType, - "_Summary": value._Summary - - }); - - } - - - }); - - //Show Error Message in case of gridview if no data is found - if ($scope.searchCIListViewData.length == 0) { - - var $el = $('
No illustration found for the selected search criteria!
').appendTo('#grid-view'); - $compile($el)($scope); - } - }, - function (error) { - // handle errors here - console.log(' $scope.IllustrationData = ' + error.statusText); - } - ); - - } }]); 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..57a5e45 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -0,0 +1,9 @@ +AIA.service('ModuleService', function () { +this.SaveOpenedModules = function () { + return + { + true; +// alert('called service'); + } +}; +}); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index a7e732e..0cbaf2a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1138,7 +1138,8 @@ - + + -- libgit2 0.21.4