ADAM / AIAHTML5

Commit 1fba8b603e56aab087881a95260dd85b6bf6b176

Authored by Amrita Vishnoi
2 parents e70fd522 e49ead4a

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 18 changed files with 157 additions and 213 deletions
150-DOCUMENTATION/Audit/Sprints/OND/Ebix-Estimation Model_Health_Dev-Product Sprint 44(01-May-18).xlsx 0 → 100644
View file @1fba8b6
No preview for this file type
400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs 0 → 100644
  View file @1fba8b6
  1 +using System;
  2 +using System.Collections.Generic;
  3 +using System.Linq;
  4 +using System.Net;
  5 +using System.Net.Http;
  6 +using System.Web.Http;
  7 +using System.Configuration;
  8 +namespace AIAHTML5.API.Controllers
  9 +{
  10 + public class ConfigurationController : ApiController
  11 + {
  12 + [Route("api/Configuration/GetConfigurationvalues")]
  13 + [HttpGet]
  14 + public HttpResponseMessage GetConfigurationvalues()
  15 + {
  16 + int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]);
  17 + HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year);
  18 + return response;
  19 + }
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html
  View file @1fba8b6
... ... @@ -57,7 +57,7 @@
57 57 <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td>
58 58 </tr>
59 59 <tr>
60   - <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; 2017 Ebix, Inc. All Rights Reserved. </em></td>
  60 + <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%> Ebix, Inc. All Rights Reserved. </em></td>
61 61 </tr>
62 62 </tbody>
63 63 </table>
... ...
400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
  View file @1fba8b6
... ... @@ -75,7 +75,7 @@
75 75 <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td>
76 76 </tr>
77 77 <tr>
78   - <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; 2017 Ebix, Inc. All Rights Reserved. </em></td>
  78 + <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>Give us a <b>call toll-free at 1-888-278-9614</b> or <em>send us an email</em> if you have any questions or if you need help. It will be our pleasure to help you.</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr><tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%> Ebix, Inc. All Rights Reserved. </em></td>
79 79 </tr>
80 80 </tbody>
81 81 </table>
... ...
400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html
  View file @1fba8b6
... ... @@ -77,7 +77,7 @@
77 77 <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr>
78 78 <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr>
79 79 <tr>
80   - <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; 2017 Ebix, Inc. All Rights Reserved. </em></td>
  80 + <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'><em>&copy; <%=Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"])%> Ebix, Inc. All Rights Reserved. </em></td>
81 81 </tr>
82 82 </tbody>
83 83 </table>
... ...
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @1fba8b6
... ... @@ -31,6 +31,8 @@
31 31 </log4net>
32 32  
33 33 <appSettings>
  34 + <add key="Copyrightyear" value="2018" />
  35 + <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
34 36 <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
35 37 <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
36 38 <add key="SenderPassword" value="" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @1fba8b6
... ... @@ -39,7 +39,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
39 39 ethnicity: null,
40 40 modesty: null
41 41 };
42   - $rootScope.current_year = AIAConstants.current_year;
  42 +
43 43 // 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.
44 44 $rootScope.refreshcheck = null;
45 45 var isCommingSoonModel = true;
... ... @@ -172,13 +172,19 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
172 172 $rootScope.promptUserForCookies();
173 173 }
174 174  
175   -
  175 + $rootScope.getConfigurationValues();
176 176 }
177   -
178   - $rootScope.AuthenticateUser = function (userInfo)
  177 + $rootScope.getConfigurationValues = function ()
179 178 {
180   -
181   -
  179 + AuthenticationService.getCofigValue()
  180 + .then(
  181 + function (configresult) {
  182 + $rootScope.current_year = configresult;
  183 +
  184 + });
  185 + }
  186 + $rootScope.AuthenticateUser = function (userInfo)
  187 + {
182 188 if (navigator.cookieEnabled) {
183 189 $rootScope.errorMessage = "";
184 190 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
372 378 {
373 379 $rootScope.promptUserForCookies();
374 380 }
375   -
  381 +
376 382 }
377   -
  383 +
378 384 $scope.saveRemeberMeDetails = function (result, userInfo) {
379 385  
380 386 localStorage.setItem('RememberMeLoginId', result.LoginId);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @1fba8b6
... ... @@ -516,7 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
516 516 $rootScope.aaPinDataArray = [];
517 517 $rootScope.isShowSelectedSystemPinsClicked = false;
518 518 $scope.showAllPins = function () {
519   -
  519 +
520 520 $scope.allPinDataArray = [];
521 521 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
522 522 .then(
... ... @@ -534,7 +534,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
534 534  
535 535 //draw pins
536 536  
537   -
538 537 $scope.aaPinData = result.data.Root.Item;
539 538 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
540 539 $rootScope.aaPinDataArray = $scope.aaPinData
... ... @@ -559,12 +558,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
559 558 console.log(' error in showAllPins: ' + error.statusText);
560 559 }
561 560 )
562   - if ($scope.isSliderChange == true) {
  561 + //if ($scope.isSliderChange == true) {
563 562 $timeout(function () {
564   - $scope.activePinOnLayerChange();
  563 + $scope.activePinOnLayerChange();
565 564 }, 1000);
566 565  
567   - }
  566 + //}
568 567  
569 568 }
570 569  
... ... @@ -821,11 +820,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
821 820 else {
822 821  
823 822 $scope.selectedSystemName = $scope.SelectedSystemTitle;
  823 +
824 824 // get termText info
825 825 var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
826 826 .then(
827 827 function (response) {
828   -
  828 +
829 829 $scope.TermInfo = response.data.Terms.Term;
830 830  
831 831 //on gettng all required data, draw pins
... ... @@ -893,6 +893,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
893 893 {
894 894 $scope.SelectedSystemID = event;
895 895 $scope.SelectedSystemTitle = $("#bodySystemList li.activeAASystemSelect a").attr("title");
  896 +
896 897 $scope.typeOfEvent = typeof event;
897 898 // $scope.isBodySystemSelected = true;
898 899 $rootScope.isShowSelectedSystemPinsClicked = true;
... ... @@ -919,8 +920,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
919 920 }
920 921 }
921 922 else {
922   -
  923 +
923 924 $scope.selectedSystemName = $scope.SelectedSystemTitle;
  925 +
924 926 // get termText info
925 927 var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
926 928 .then(
... ... @@ -934,6 +936,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
934 936 .from($scope.aaPinData)
935 937 .where("_BodySystemName == " + $scope.selectedSystemName)
936 938 .select();
  939 +
  940 + console.log($scope.selectedSystemPinData);
  941 +
937 942 if ($scope.isHidePinBtnClicked) {
938 943 // $scope.showAllPinsAfterHide($scope.selectedSystemPinData);
939 944 $scope.showAllPinsAfterHide();
... ... @@ -973,11 +978,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
973 978 $scope.activePinArray = [];
974 979 $scope.isSearchOptionClicked = false;
975 980 $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) {
976   -
  981 +
977 982 $scope.selectedPin = [];
978 983 var isSameTermWithMultiPin = false;
979   - var firstPinId = selectedPinData[0]._PinId;
980   - var pinTermNumber = selectedPinData[0]._TermId;
  984 +
  985 + var firstPinId = selectedPinData[0]._PinId;
  986 + var pinTermNumber = selectedPinData[0]._TermId;
981 987  
982 988 //check if other pin have same termNumber
983 989 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
... ... @@ -987,11 +993,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
987 993 .where("_TermId == " + pinTermNumber)
988 994 .select();
989 995  
990   - //if ($scope.isSearchOptionClicked == true) {
991   - // $scope.activePinArray = [];
992   - // $scope.clickedPins = [];
993   - // $scope.isSearchOptionClicked = false;
994   - //}
  996 +
995 997 if ($scope.isBodySystemSelected == true) {
996 998  
997 999 $scope.isSelectedSystemSelectedAftrChange = true;
... ... @@ -1161,6 +1163,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1161 1163 }
1162 1164 $scope.sliderVal = 100;
1163 1165 $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, PinId) {
  1166 +
1164 1167 x = x * $scope.sliderPercentValue;
1165 1168 y = y * $scope.sliderPercentValue;
1166 1169 if ($("#canvasDiv").find("div").length > 0) {
... ... @@ -2003,18 +2006,37 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2003 2006 }, 1000);
2004 2007  
2005 2008 }
2006   -
  2009 +
2007 2010 $scope.highlightPinBasedOnSerachItem = function (id) {
2008 2011  
2009 2012 $scope.isSelectedSystemSelectedAftrChange = false;
2010 2013 $scope.isSearchOptionClicked = true;
2011 2014 $scope.listMangerID = [];
2012 2015 $scope.searchItemId = id;
2013   -
2014   - $scope.searchItemText = $("#" + id).val();
  2016 +
  2017 + // 30507 Atlas Anatomy > The pin selection should change in the below scenario.
  2018 + $("div.tools div:eq(1) div").each(function () {
  2019 + if ($(this).find("button").hasClass("btn-primary")) {
  2020 + var btnID = $(this).find("button").attr("id")
  2021 + if (btnID == "allPinBtn") {
  2022 + }
  2023 + else
  2024 + {
  2025 + $("div.tools div:eq(1) div").find("button").removeClass("btn-primary");
  2026 + $('#' + btnID).addClass("btn-black");
  2027 + $("#allPinBtn").removeClass("btn-black");
  2028 + $("#allPinBtn").addClass("btn-primary");
  2029 + $scope.showAllPinsAfterHide();
  2030 + }
  2031 + }
  2032 + });
  2033 +
  2034 +
  2035 + $scope.searchItemText = $("#" + id).val();
2015 2036 $rootScope.searchSelectedText = $("#" + id).val();
2016 2037 $('#termList option[selected="selected"]').prop("selected", false);
2017 2038 $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  2039 +
2018 2040 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
2019 2041 $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
2020 2042  
... ... @@ -2024,13 +2046,45 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2024 2046 //selectedTermName.placeholder = $("#" + id).text();
2025 2047 selectedTermName.value = $("#" + id).val();
2026 2048 selectedTermName.placeholder = "search... ";
2027   -
2028   - //get data from pindata for this trem
  2049 + if ($("#bodySystemList li.activeAASystemSelect a").attr("id") == 0) {
  2050 + // alert("All");
  2051 + }
  2052 + else
  2053 + {
  2054 + $("#bodySystemList li").each(function () {
  2055 + if ($(this).hasClass("disabledSelectedSystem") || $(this).hasClass("divider") || ($(this).find("a").attr("id") == 0)) {
  2056 + }
  2057 + else {
  2058 + var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
  2059 + .then(
  2060 + function (response) {
  2061 + $scope.ListManagerTermInfo = response.data.Terms.Term;
  2062 + $rootScope.selectedSystemList = $('#termList option[id="' + id + '"]').text();
  2063 + $scope.selectedSystemPinDataForList = new jinqJs()
  2064 + .from($scope.ListManagerTermInfo)
  2065 + .where("__TermText == " + $('#termList option[id="' + id + '"]').text())
  2066 + .select();
  2067 + $scope.showSelectedSystemPins($scope.selectedSystemPinDataForList[0].__BodySystemId);
  2068 + },
  2069 + function (error) {
  2070 + // handle errors here
  2071 + console.log(' error: ' + error.statusText);
  2072 + }
  2073 + )
  2074 + }
  2075 +
  2076 + });
  2077 + }
2029 2078  
  2079 +
  2080 +
  2081 + //get data from pindata for this trem
  2082 +
2030 2083 var pinDataForTerm = new jinqJs()
2031 2084 .from($scope.aaPinData)
2032 2085 .where("_TermId == " + $scope.searchItemId)
2033 2086 .select();
  2087 + $timeout(function () {
2034 2088 //make all pin heads grey
2035 2089 var radial = $('#aaDetailViewCanvas').createGradient({
2036 2090 x1: 50, y1: 50,
... ... @@ -2039,11 +2093,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2039 2093 c1: 'rgba(100, 50, 0,0)',
2040 2094 c2: 'rgb(216, 216, 216)'
2041 2095 });
2042   -
2043   -
2044 2096 $('#aaDetailViewCanvas').setLayers({
2045 2097 fillStyle: radial,
2046 2098 }).drawLayers();
  2099 +
2047 2100 console.log(pinDataForTerm[0]._PinId);
2048 2101 $scope.clickedPins = [];
2049 2102 $scope.clickedPins.push({ 'id': pinDataForTerm[0]._PinId });
... ... @@ -2051,9 +2104,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2051 2104 var pinID = "PinArc_" + pinDataForTerm[0]._PinId;
2052 2105 $scope.activePinArray.push({ 'id': pinID });
2053 2106 $scope.showAnnotation(pinDataForTerm, false, false, true);
2054   - // maintaing scroll position on selection of options in list manager.
  2107 + // maintaing scroll position on selection of options in list manager.
2055 2108 var annotationTopPos = $(".common-drag").css("top").split("p");
2056 2109 $("#canvasDiv").scrollTop(annotationTopPos[0]);
  2110 + }, 700);
  2111 +
2057 2112 $scope.IsSearchVisible = false;
2058 2113 }
2059 2114  
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @1fba8b6
... ... @@ -496,7 +496,6 @@ AIA.constant(&quot;UserModules&quot;, [
496 496 AIA.constant("AIAConstants", {
497 497 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
498 498 "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.",
499   - "current_year": 2018,
500 499 "SAVED_LAB_EXERCISE_NOT_FOUND": "Saved Lab Exercise not found.",
501 500 "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
502 501 })
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
  View file @1fba8b6
... ... @@ -108,7 +108,25 @@
108 108 $("#messageModal").modal('show');
109 109 });
110 110 return deferred.promise;
111   - }
  111 + },
  112 + getCofigValue: function()
  113 + {
  114 + var deferred = $q.defer();
  115 + $http({
  116 + method: 'GET',
  117 + url: 'API/api/Configuration/GetConfigurationvalues'
  118 + }).success(function (data, status, headers, config)
  119 + {
  120 + console.log('success' + data);
  121 + deferred.resolve(data);
  122 + }).error(function (data, status, headers, config)
  123 + {
  124 + console.log('error')
  125 + deferred.reject(data);
  126 +
  127 + });
  128 + return deferred.promise;
  129 + }
112 130  
113   - }
  131 + }
114 132 });
115 133 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig deleted
View file @e70fd52
1   -<!--Body-->
2   -<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js"></script>
3   -<div class="bodyWrap row" ng-controller="LabExercController">
4   -
5   -<<<<<<< HEAD
6   - <div class="" ng-init="GetQuizByTopic()">
7   - <div class="col-sm-12 pageHeading" id="LabExPageHeading">
8   -=======
9   - <div class="" ng-init="InitializeLabExercise()">
10   - <div class="col-sm-12 pageHeading">
11   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
12   - <!--<button type="button" class="btn btn-default pull-left toggleBar hidden-lg"> <i class="fa fa-bars"></i> </button>
13   - <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
14   - <h4 class="pull-left">Lab Exercise - {{LabExerciseName}}</h4>
15   - <div class="pull-right btn-group paddTop4"> <a href="#" class="btn btn-xs btn-default" ng-click="minLabExPanel()"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
16   - <div class="clearfix"></div>
17   - </div>
18   -
19   - <div class="col-sm-12">
20   - <div class="pull-left btn-group LabEx-Panel-state-minimized" id="LabExMinimizedId">
21   - <p class="pull-left" style="color:#fff">LAB Ex ...</p>
22   - <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default" ng-click="maxLabExPanel()"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a>
23   - </div>
24   - </div>
25   -
26   - <div class="col-sm-12">
27   -
28   - <div class="container-fluid main-full">
29   - <div class="row">
30   -<<<<<<< HEAD
31   - <div class="panel panel-default" id="labExPanel">
32   -=======
33   - <div class="panel panel-default" id="questionHtml">
34   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
35   - <div class="panel-heading">
36   - {{activityTitle}}<p style="margin:-20px 474px -1px;" class="text-primary">{{Title}}</p>
37   - <div class="pull-right" style="margin: -20px 20px;">
38   - <p>Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>
39   - </div>
40   - </div>
41   - <div class="panel-body" style="padding:2px;overflow:scroll">
42   - <div id="textblock" style="margin: 80px 20px; display block;">
43   - <div style="margin: 20px;" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}">
44   - <div ng-bind-html="deliberatelyTrustDangerousSnippet(optionbox.QuizText)"></div>
45   - </div>
46   - <!--<ul>
47   -<<<<<<< HEAD
48   - <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
49   - </ul>-->
50   -=======
51   - <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
52   - </ul>-->
53   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
54   - </div>
55   - <div align="center" class="dragger">
56   - <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true">
57   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
58   - </div>
59   - <div class="col-sm-9">
60   - <div style="position: relative; margin-left: 85px;" id="imgdiv">
61   - <div id="imgblock">
62   - <img id="droppable" ng-src="content/images/LE/{{Imagepath}}" alt="" ng-click="onClick()" imageonload />
63   - </div>
64   -
65   - <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute', 'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div>
66   - <div draggable="true" ng-repeat="ans in DraggedList" droppable="true" class="droppable ui-droppable answerdroppable" id="blockans-{{ans.id}}" ng-style="{'top':{{ans.topcoord}}, 'left':{{ans.leftcoord}},'position': 'absolute', 'width': '158px', 'height':'30px', 'border':'0px solid #333', 'background': 'transparent','font-size': '12px','border-color':'#FF0000','padding-top':'5px'}">{{ans.Value}}</div>
67   - </div>
68   -
69   -<<<<<<< HEAD
70   - <div class="col-sm-12" style="margin-left: 200px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
71   -=======
72   - <div class="col-sm-12" style="margin-left: 215px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
73   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
74   - <!--<div class="col-sm-3 col-lg-3 ui-draggable" >-->
75   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'bottom'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
76   - <!--</div>-->
77   - </div>
78   - </div>
79   - <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divright" droppable="true">
80   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'right'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
81   - </div>
82   - </div>
83   - </div>
84   - <div class="panel-footer">
85   - <div class="pull-left">
86   - <!--<p>Question <strong>{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>-->
87   - </div>
88   - <div class="pull-right">
89   - <div class="btn-group pull-left marginR5">
90   - <button class="btn btn-sm btn-primary" style="display:none;" ng-click="SubmitAttempt()" id="quizSubmitBtn">Submit</button>
91   - <button class="btn btn-sm btn-primary" style="display:none;" id="reportBtn" ng-click="ReportGen()">Report</button>
92   - <button class="btn btn-sm btn-primary" id="saveBtn" ng-click="SaveAnswer()">Save</button>
93   - <button class="btn btn-sm btn-primary" id="reviewBtn" ng-click="ReviewAttempt()">Review Your Attempt</button>
94   - <button class="btn btn-sm btn-primary" id="resetBtn" ng-click="OnResetClick()">Reset</button>
95   - </div>
96   - <div class="btn-group">
97   - <button class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button>
98   - <button class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button>
99   - </div>
100   - </div>
101   - <div class="clearfix"></div>
102   - </div>
103   -
104   - </div>
105   -
106   -
107   - <div class="panel panel-default" id="submitResultHtml" style="display:none;">
108   - <div class="panel-heading">
109   - <div class="row">
110   - <div class="col-sm-4 text-left"><strong>Cardiovascula System</strong></div>
111   - <div class="col-sm-4 text-center">Performace Report</div>
112   - <div class="col-sm-4 text-right">Score:{{scoreResult}}% </div>
113   - </div>
114   - </div>
115   - <div class="panel-body no-padding">
116   - <div class="row">
117   - <div class="col-sm-12 table-responsive ">
118   - <table class="table table-hover table-condensed bg-white">
119   - <thead>
120   - <tr class="active">
121   - <th class="text-center">Total Question</th>
122   - <th class="text-center">Correct Answers</th>
123   - <th class="text-center">Incorrect Answers</th>
124   - </tr>
125   - </thead>
126   - <tbody>
127   - <tr class="text-center">
128   - <td>{{TotalNumberofQuiz}}</td>
129   - <td>{{CorrectAnswer}}</td>
130   - <td>{{inCorrectAnswer}}</td>
131   - </tr>
132   - </tbody>
133   - </table>
134   -
135   - </div>
136   - <div class="col-sm-12 table-responsive">
137   - <table class="table table-hover table-condensed bg-white">
138   - <thead>
139   - <tr class="active">
140   - <th>Question</th>
141   - <th>Activity Title</th>
142   - <th>Status</th>
143   - <th>Action</th>
144   - </tr>
145   - </thead>
146   - <tbody id="resultLabData"></tbody>
147   - </table>
148   - </div>
149   - </div>
150   - </div>
151   - <div class="panel-footer">
152   - <div class="text-center">
153   - <button class="btn btn-sm btn-primary">
154   - Email
155   - </button>
156   -
157   - </div>
158   - <div class="clearfix"></div>
159   - </div>
160   -
161   - </div>
162   -
163   -
164   - </div>
165   - </div>
166   - </div>
167   -
168   -
169   -
170   - </div>
171   -</div>
172   -
173   -
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @1fba8b6
... ... @@ -234,7 +234,7 @@
234 234 <img class="browserIcons" src="content/images/common/mozilla-icon.png" />
235 235 <img class="browserIcons" src="content/images/common/safari-icon.png" />
236 236 </div>
237   - <div class="container-fluid text-center">Copyright &copy; 2017 Ebix Inc. All rights reserved.</div>
  237 + <div class="container-fluid text-center">Copyright &copy; {{current_year}} Ebix Inc. All rights reserved.</div>
238 238 </footer>
239 239 </div>
240 240 <!-- Forgot User ID (Small modal) -->
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql
  View file @1fba8b6
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql
  View file @1fba8b6
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql
  View file @1fba8b6
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql
  View file @1fba8b6
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql 0 → 100644
  View file @1fba8b6
  1 +
  2 +CREATE PROCEDURE [dbo].[usp_GetProductEditionByLicense]
  3 + -- Add the parameters for the stored procedure here
  4 + @iLicenseId int
  5 +AS
  6 +BEGIN
  7 + -- SET NOCOUNT ON added to prevent extra result sets from
  8 + -- interfering with SELECT statements.
  9 + SET NOCOUNT ON;
  10 + SELECT Edition.Id, Edition.Title, Edition.IsActive, Edition.Priority
  11 + FROM Edition
  12 + INNER JOIN LicenseToEdition ON Edition.Id = LicenseToEdition.EditionId
  13 + WHERE LicenseToEdition.LicenseId =@iLicenseId
  14 +END
  15 +
  16 +
... ...
500-DBDump/additionalScript/UpdateModuleName.sql
  View file @1fba8b6
1   -UPdate ResourceModule set Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE'
2   -where Title='CAM';
3 1 \ No newline at end of file
  2 +UPdate ResourceModule set Title='Complementary and Alternative Medicine'
  3 +where Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE';
4 4 \ No newline at end of file
... ...