diff --git a/150-DOCUMENTATION/Audit/Sprints/OND/Ebix-Estimation Model_Health_Dev-Product Sprint 44(01-May-18).xlsx b/150-DOCUMENTATION/Audit/Sprints/OND/Ebix-Estimation Model_Health_Dev-Product Sprint 44(01-May-18).xlsx new file mode 100644 index 0000000..1221a8e --- /dev/null +++ b/150-DOCUMENTATION/Audit/Sprints/OND/Ebix-Estimation Model_Health_Dev-Product Sprint 44(01-May-18).xlsx diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs new file mode 100644 index 0000000..7199fc0 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using System.Configuration; +namespace AIAHTML5.API.Controllers +{ + public class ConfigurationController : ApiController + { + [Route("api/Configuration/GetConfigurationvalues")] + [HttpGet] + public HttpResponseMessage GetConfigurationvalues() + { + int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]); + HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year); + return response; + } + } +} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html b/400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html index 33441a3..cdc6023 100644 --- a/400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html +++ b/400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html @@ -57,7 +57,7 @@   - Give us a call toll-free at 1-888-278-9614 or send us an email if you have any questions or if you need help. It will be our pleasure to help you.  © 2017 Ebix, Inc. All Rights Reserved. + Give us a call toll-free at 1-888-278-9614 or send us an email if you have any questions or if you need help. It will be our pleasure to help you.  © <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%> Ebix, Inc. All Rights Reserved. diff --git a/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html b/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html index 99a9102..f222317 100644 --- a/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html +++ b/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html @@ -75,7 +75,7 @@   - Give us a call toll-free at 1-888-278-9614 or send us an email if you have any questions or if you need help. It will be our pleasure to help you.  © 2017 Ebix, Inc. All Rights Reserved. + Give us a call toll-free at 1-888-278-9614 or send us an email if you have any questions or if you need help. It will be our pleasure to help you.  © <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%> Ebix, Inc. All Rights Reserved. diff --git a/400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html b/400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html index a076de8..8a63339 100644 --- a/400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html +++ b/400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html @@ -77,7 +77,7 @@     - © 2017 Ebix, Inc. All Rights Reserved. + © <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%> Ebix, Inc. All Rights Reserved. diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config index 490d784..ee162e6 100644 --- a/400-SOURCECODE/AIAHTML5.API/Web.config +++ b/400-SOURCECODE/AIAHTML5.API/Web.config @@ -31,6 +31,8 @@ + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index dc5cb13..9752f2d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -39,7 +39,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A ethnicity: null, modesty: null }; - $rootScope.current_year = AIAConstants.current_year; + // on refersh this variable will also get null that is why we are only checking this variable on initialize that if it is null that means page gets refershed. $rootScope.refreshcheck = null; var isCommingSoonModel = true; @@ -172,13 +172,19 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $rootScope.promptUserForCookies(); } - + $rootScope.getConfigurationValues(); } - - $rootScope.AuthenticateUser = function (userInfo) + $rootScope.getConfigurationValues = function () { - - + AuthenticationService.getCofigValue() + .then( + function (configresult) { + $rootScope.current_year = configresult; + + }); + } + $rootScope.AuthenticateUser = function (userInfo) + { if (navigator.cookieEnabled) { $rootScope.errorMessage = ""; if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) { @@ -372,9 +378,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A { $rootScope.promptUserForCookies(); } - + } - + $scope.saveRemeberMeDetails = function (result, userInfo) { localStorage.setItem('RememberMeLoginId', result.LoginId); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 8eb116c..51ace75 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -516,7 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.aaPinDataArray = []; $rootScope.isShowSelectedSystemPinsClicked = false; $scope.showAllPins = function () { - + $scope.allPinDataArray = []; var promise = ModuleService.getPinDataForImage($rootScope.imageName) .then( @@ -534,7 +534,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou //draw pins - $scope.aaPinData = result.data.Root.Item; if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { $rootScope.aaPinDataArray = $scope.aaPinData @@ -559,12 +558,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou console.log(' error in showAllPins: ' + error.statusText); } ) - if ($scope.isSliderChange == true) { + //if ($scope.isSliderChange == true) { $timeout(function () { - $scope.activePinOnLayerChange(); + $scope.activePinOnLayerChange(); }, 1000); - } + //} } @@ -821,11 +820,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou else { $scope.selectedSystemName = $scope.SelectedSystemTitle; + // get termText info var promise = ModuleService.getTermTextDataForPin($scope.moduleName) .then( function (response) { - + $scope.TermInfo = response.data.Terms.Term; //on gettng all required data, draw pins @@ -893,6 +893,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou { $scope.SelectedSystemID = event; $scope.SelectedSystemTitle = $("#bodySystemList li.activeAASystemSelect a").attr("title"); + $scope.typeOfEvent = typeof event; // $scope.isBodySystemSelected = true; $rootScope.isShowSelectedSystemPinsClicked = true; @@ -919,8 +920,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } else { - + $scope.selectedSystemName = $scope.SelectedSystemTitle; + // get termText info var promise = ModuleService.getTermTextDataForPin($scope.moduleName) .then( @@ -934,6 +936,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou .from($scope.aaPinData) .where("_BodySystemName == " + $scope.selectedSystemName) .select(); + + console.log($scope.selectedSystemPinData); + if ($scope.isHidePinBtnClicked) { // $scope.showAllPinsAfterHide($scope.selectedSystemPinData); $scope.showAllPinsAfterHide(); @@ -973,11 +978,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.activePinArray = []; $scope.isSearchOptionClicked = false; $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) { - + $scope.selectedPin = []; var isSameTermWithMultiPin = false; - var firstPinId = selectedPinData[0]._PinId; - var pinTermNumber = selectedPinData[0]._TermId; + + var firstPinId = selectedPinData[0]._PinId; + var pinTermNumber = selectedPinData[0]._TermId; //check if other pin have same termNumber if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { @@ -987,11 +993,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou .where("_TermId == " + pinTermNumber) .select(); - //if ($scope.isSearchOptionClicked == true) { - // $scope.activePinArray = []; - // $scope.clickedPins = []; - // $scope.isSearchOptionClicked = false; - //} + if ($scope.isBodySystemSelected == true) { $scope.isSelectedSystemSelectedAftrChange = true; @@ -1161,6 +1163,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.sliderVal = 100; $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, PinId) { + x = x * $scope.sliderPercentValue; y = y * $scope.sliderPercentValue; if ($("#canvasDiv").find("div").length > 0) { @@ -2003,18 +2006,37 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }, 1000); } - + $scope.highlightPinBasedOnSerachItem = function (id) { $scope.isSelectedSystemSelectedAftrChange = false; $scope.isSearchOptionClicked = true; $scope.listMangerID = []; $scope.searchItemId = id; - - $scope.searchItemText = $("#" + id).val(); + + // 30507 Atlas Anatomy > The pin selection should change in the below scenario. + $("div.tools div:eq(1) div").each(function () { + if ($(this).find("button").hasClass("btn-primary")) { + var btnID = $(this).find("button").attr("id") + if (btnID == "allPinBtn") { + } + else + { + $("div.tools div:eq(1) div").find("button").removeClass("btn-primary"); + $('#' + btnID).addClass("btn-black"); + $("#allPinBtn").removeClass("btn-black"); + $("#allPinBtn").addClass("btn-primary"); + $scope.showAllPinsAfterHide(); + } + } + }); + + + $scope.searchItemText = $("#" + id).val(); $rootScope.searchSelectedText = $("#" + id).val(); $('#termList option[selected="selected"]').prop("selected", false); $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); @@ -2024,13 +2046,45 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou //selectedTermName.placeholder = $("#" + id).text(); selectedTermName.value = $("#" + id).val(); selectedTermName.placeholder = "search... "; - - //get data from pindata for this trem + if ($("#bodySystemList li.activeAASystemSelect a").attr("id") == 0) { + // alert("All"); + } + else + { + $("#bodySystemList li").each(function () { + if ($(this).hasClass("disabledSelectedSystem") || $(this).hasClass("divider") || ($(this).find("a").attr("id") == 0)) { + } + else { + var promise = ModuleService.getTermTextDataForPin($scope.moduleName) + .then( + function (response) { + $scope.ListManagerTermInfo = response.data.Terms.Term; + $rootScope.selectedSystemList = $('#termList option[id="' + id + '"]').text(); + $scope.selectedSystemPinDataForList = new jinqJs() + .from($scope.ListManagerTermInfo) + .where("__TermText == " + $('#termList option[id="' + id + '"]').text()) + .select(); + $scope.showSelectedSystemPins($scope.selectedSystemPinDataForList[0].__BodySystemId); + }, + function (error) { + // handle errors here + console.log(' error: ' + error.statusText); + } + ) + } + + }); + } + + + //get data from pindata for this trem + var pinDataForTerm = new jinqJs() .from($scope.aaPinData) .where("_TermId == " + $scope.searchItemId) .select(); + $timeout(function () { //make all pin heads grey var radial = $('#aaDetailViewCanvas').createGradient({ x1: 50, y1: 50, @@ -2039,11 +2093,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou c1: 'rgba(100, 50, 0,0)', c2: 'rgb(216, 216, 216)' }); - - $('#aaDetailViewCanvas').setLayers({ fillStyle: radial, }).drawLayers(); + console.log(pinDataForTerm[0]._PinId); $scope.clickedPins = []; $scope.clickedPins.push({ 'id': pinDataForTerm[0]._PinId }); @@ -2051,9 +2104,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou var pinID = "PinArc_" + pinDataForTerm[0]._PinId; $scope.activePinArray.push({ 'id': pinID }); $scope.showAnnotation(pinDataForTerm, false, false, true); - // maintaing scroll position on selection of options in list manager. + // maintaing scroll position on selection of options in list manager. var annotationTopPos = $(".common-drag").css("top").split("p"); $("#canvasDiv").scrollTop(annotationTopPos[0]); + }, 700); + $scope.IsSearchVisible = false; } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index d340cdd..eac86ac 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -496,7 +496,6 @@ AIA.constant("UserModules", [ AIA.constant("AIAConstants", { "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.", "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.", - "current_year": 2018, "SAVED_LAB_EXERCISE_NOT_FOUND": "Saved Lab Exercise not found.", "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.", }) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js index b8d269d..ead3a7e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js @@ -108,7 +108,25 @@ $("#messageModal").modal('show'); }); return deferred.promise; - } + }, + getCofigValue: function() + { + var deferred = $q.defer(); + $http({ + method: 'GET', + url: 'API/api/Configuration/GetConfigurationvalues' + }).success(function (data, status, headers, config) + { + console.log('success' + data); + deferred.resolve(data); + }).error(function (data, status, headers, config) + { + console.log('error') + deferred.reject(data); + + }); + return deferred.promise; + } - } + } }); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig deleted file mode 100644 index 560c535..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig +++ /dev/null @@ -1,173 +0,0 @@ - - -
- -<<<<<<< HEAD -
-
-======= -
-
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f - -

Lab Exercise - {{LabExerciseName}}

-
-
-
- -
-
-

LAB Ex ...

- -
-
- -
- -
-
-<<<<<<< HEAD -
-======= -
->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f -
- {{activityTitle}}

{{Title}}

-
-

Question {{quiznumber}} of {{TotalNumberofQuiz}}

-
-
-
-
-
-
-
- -======= -
  • - --> ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f -
    -
    -
    -
    {{option.OptionTitle}}
    -
    -
    -
    -
    - -
    - -
    {{optionbox.Answervalue}}
    -
    {{ans.Value}}
    -
    - -<<<<<<< HEAD -
    -======= -
    ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f - -
    {{option.OptionTitle}}
    - -
    -
    -
    -
    {{option.OptionTitle}}
    -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - -
    -
    - - -
    -
    -
    -
    - -
    - - - - - -
    -
    -
    - - - -
    -
    - - diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index f44a0e6..f3df5d8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -234,7 +234,7 @@
    -
    Copyright © 2017 Ebix Inc. All rights reserved.
    +
    Copyright © {{current_year}} Ebix Inc. All rights reserved.
    diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql index ea21cdb..a649d86 100644 --- a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql +++ b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql index 19bbd19..615d3f1 100644 --- a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql +++ b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql index be224c0..546fbd6 100644 --- a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql +++ b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql index d41e156..ad339b2 100644 --- a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql +++ b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql diff --git a/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql b/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql new file mode 100644 index 0000000..ec352ed --- /dev/null +++ b/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql @@ -0,0 +1,16 @@ + +CREATE PROCEDURE [dbo].[usp_GetProductEditionByLicense] + -- Add the parameters for the stored procedure here + @iLicenseId int +AS +BEGIN + -- SET NOCOUNT ON added to prevent extra result sets from + -- interfering with SELECT statements. + SET NOCOUNT ON; + SELECT Edition.Id, Edition.Title, Edition.IsActive, Edition.Priority + FROM Edition + INNER JOIN LicenseToEdition ON Edition.Id = LicenseToEdition.EditionId + WHERE LicenseToEdition.LicenseId =@iLicenseId +END + + diff --git a/500-DBDump/additionalScript/UpdateModuleName.sql b/500-DBDump/additionalScript/UpdateModuleName.sql index 2475b3a..1d57b50 100644 --- a/500-DBDump/additionalScript/UpdateModuleName.sql +++ b/500-DBDump/additionalScript/UpdateModuleName.sql @@ -1,2 +1,2 @@ -UPdate ResourceModule set Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE' -where Title='CAM'; \ No newline at end of file +UPdate ResourceModule set Title='Complementary and Alternative Medicine' +where Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE'; \ No newline at end of file