ADAM / AIAHTML5

Commit effa8c6f6425a8849056537a7fc9df21fd219015

Authored by Amrita Vishnoi
2 parents 4ce5e872 7d2b00c2

Merge branch 'copyrightyear' into Develop

Inline Side-by-side
Showing 9 changed files with 61 additions and 15 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs 0 → 100644
  View file @effa8c6
  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 \ No newline at end of file 22 \ No newline at end of file
400-SOURCECODE/AIAHTML5.API/Templates/Forgot-UserId.html
  View file @effa8c6
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td> 57 <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td>
58 </tr> 58 </tr>
59 <tr> 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 </tr> 61 </tr>
62 </tbody> 62 </tbody>
63 </table> 63 </table>
400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
  View file @effa8c6
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td> 75 <td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td>
76 </tr> 76 </tr>
77 <tr> 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 </tr> 79 </tr>
80 </tbody> 80 </tbody>
81 </table> 81 </table>
400-SOURCECODE/AIAHTML5.API/Templates/unblock-User.html
  View file @effa8c6
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr> 77 <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr>
78 <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr> 78 <tr><td style=' font-size:12px; font-family:Gotham, Helvetica, Arial, sans-serif; color:#000000;'>&nbsp;</td></tr>
79 <tr> 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 </tr> 81 </tr>
82 </tbody> 82 </tbody>
83 </table> 83 </table>
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @effa8c6
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
31 </log4net> 31 </log4net>
32 32
33 <appSettings> 33 <appSettings>
  34 + <add key="Copyrightyear" value="2018" />
  35 + <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
34 <add key="SenderEmailAddress" value="support@interactiveanatomy.com" /> 36 <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
35 <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" /> 37 <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
36 <add key="SenderPassword" value="" /> 38 <add key="SenderPassword" value="" />
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @effa8c6
@@ -39,7 +39,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A @@ -39,7 +39,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
39 ethnicity: null, 39 ethnicity: null,
40 modesty: null 40 modesty: null
41 }; 41 };
42 - $rootScope.current_year = AIAConstants.current_year; 42 +
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. 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 $rootScope.refreshcheck = null; 44 $rootScope.refreshcheck = null;
45 var isCommingSoonModel = true; 45 var isCommingSoonModel = true;
@@ -172,13 +172,19 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A @@ -172,13 +172,19 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
172 $rootScope.promptUserForCookies(); 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 if (navigator.cookieEnabled) { 188 if (navigator.cookieEnabled) {
183 $rootScope.errorMessage = ""; 189 $rootScope.errorMessage = "";
184 if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) { 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,9 +378,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
372 { 378 {
373 $rootScope.promptUserForCookies(); 379 $rootScope.promptUserForCookies();
374 } 380 }
375 - 381 +
376 } 382 }
377 - 383 +
378 $scope.saveRemeberMeDetails = function (result, userInfo) { 384 $scope.saveRemeberMeDetails = function (result, userInfo) {
379 385
380 localStorage.setItem('RememberMeLoginId', result.LoginId); 386 localStorage.setItem('RememberMeLoginId', result.LoginId);
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @effa8c6
@@ -496,7 +496,6 @@ AIA.constant(&quot;UserModules&quot;, [ @@ -496,7 +496,6 @@ AIA.constant(&quot;UserModules&quot;, [
496 AIA.constant("AIAConstants", { 496 AIA.constant("AIAConstants", {
497 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.", 497 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
498 "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.", 498 "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.",
499 - "current_year": 2018,  
500 "SAVED_LAB_EXERCISE_NOT_FOUND": "Saved Lab Exercise not found.", 499 "SAVED_LAB_EXERCISE_NOT_FOUND": "Saved Lab Exercise not found.",
501 "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.", 500 "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
502 }) 501 })
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
  View file @effa8c6
@@ -108,7 +108,25 @@ @@ -108,7 +108,25 @@
108 $("#messageModal").modal('show'); 108 $("#messageModal").modal('show');
109 }); 109 });
110 return deferred.promise; 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 \ No newline at end of file 133 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @effa8c6
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@
234 <img class="browserIcons" src="content/images/common/mozilla-icon.png" /> 234 <img class="browserIcons" src="content/images/common/mozilla-icon.png" />
235 <img class="browserIcons" src="content/images/common/safari-icon.png" /> 235 <img class="browserIcons" src="content/images/common/safari-icon.png" />
236 </div> 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 </footer> 238 </footer>
239 </div> 239 </div>
240 <!-- Forgot User ID (Small modal) --> 240 <!-- Forgot User ID (Small modal) -->