ADAM / AIAHTML5

Commit 6aa1d9c9b0ca6dfa5e1c9a1738bbec5a9561e706

Authored by Utkarsh Singh
1 parent c30c6bdd

Committed code. Refs: #15245, 15885

Inline Side-by-side
Showing 5 changed files with 12 additions and 34 deletions
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
  View file @6aa1d9c
... ... @@ -10,7 +10,7 @@ namespace AIAHTML5.API.Constants
10 10 public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details.";
11 11 public const string USER_NOT_FOUND = "User not found.";
12 12 public const string MAIL_NOT_SENT = "Mail not sent.";
13   - public const string MAIL_SENT = "Mail has been sent.";
  13 + public const string MAIL_SENT = "Mail sent.";
14 14  
15 15  
16 16 }
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
  View file @6aa1d9c
... ... @@ -30,7 +30,7 @@
30 30 </root>
31 31 </log4net>
32 32  
33   - <!--<appSettings>
  33 + <appSettings>
34 34 <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
35 35 <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
36 36 <add key="SenderPassword" value="" />
... ... @@ -39,20 +39,8 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="false"/>
  42 + <add key="isUserAuthenticated" value="True"/>
43 43 <add key="AdminSupport" value=""/>
44   - </appSettings>-->
45   - <appSettings>
46   - <add key="SenderEmailAddress" value="utkarsh.singh@ebix.com" />
47   - <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
48   - <add key="SenderPassword" value="utkarsh@3bix" />
49   - <add key="SMTPAddress" value="smtp.emailsrvr.com" />
50   - <add key="SMTPPort" value="587" />
51   - <add key="EnableSSL" value="false" />
52   - <add key="Site_Url" value ="//192.168.86.34:82/AIA"/>
53   - <add key ="HostAddress" value="10.100.12.13" />
54   - <add key="isUserAuthenticated" value="false"/>
55   - <add key="AdminSupport" value="utkarsh.singh@ebix.com"/>
56 44 </appSettings>
57 45 <system.web>
58 46 <compilation debug="true" targetFramework="4.5" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @6aa1d9c
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @6aa1d9c
... ... @@ -3313,30 +3313,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3313 3313 userInfo.emailId = $rootScope.userData.emailId;
3314 3314 }
3315 3315  
3316   - if (userInfo.userMessage != undefined && userInfo.userMessage != '' && userInfo.userMessage != null) {
3317   -
3318   - AdminService.SendAdminAccessRequestMail(userInfo)
  3316 + AdminService.SendAdminAccessRequestMail(userInfo)
3319 3317 .then(function (result) {
3320   - if (result == AdminConstants.MAIL_SENT) {
3321   - $("#adminModal").fadeOut();
3322   - $("#adminModal").modal('hide');
3323   - $("adminAccessTextArea").text('');
  3318 + if (result == AdminConstants.MAIL_SENT) {
  3319 + $("#adminModal").fadeOut();
  3320 + $("#adminModal").modal('hide');
  3321 + $("adminAccessTextArea").text('');
3324 3322  
3325   - $rootScope.errorMassage = AdminConstants.ADMIN_ACCESS_REQUEST_SUCCESS;
3326   - $("#messageModal").modal('show');
3327   - }
  3323 + $rootScope.errorMassage = AdminConstants.MAIL_SENT;
  3324 + $("#messageModal").modal('show');
  3325 + }
3328 3326 },
3329 3327 function (error) {
3330 3328 console.log(' Error in sending mail to admin support = ' + error.statusText);
3331 3329 $rootScope.errorMassage = AdminConstants.ERROR_IN_SENDING_MAIL;
3332 3330 $("#messageModal").modal('show');
3333 3331 });
3334   - }
3335   - else {
3336   - $rootScope.errorMassage = AdminConstants.EMPTY_MESSAGE;
3337   - $("#spnError").text(AdminConstants.EMPTY_MESSAGE);
3338   -
3339   - }
3340 3332 };
3341 3333  
3342 3334 $rootScope.CloseAAModal = function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @6aa1d9c
... ... @@ -311,10 +311,8 @@ AIA.constant(&quot;LoginMessageConstants&quot;, {
311 311  
312 312 })
313 313 AIA.constant("AdminConstants", {
314   - "ADMIN_ACCESS_REQUEST_SUCCESS": "Mail has been sent to referenced authority.",
315   - "EMPTY_MESSAGE": "Please, type some message before submitting.",
316 314 "ERROR_IN_SENDING_MAIL": "Some internal error occured.",
317   - "MAIL_SENT": "Mail has been sent."
  315 + "MAIL_SENT": "Mail sent."
318 316 })
319 317 AIA.constant("UserTypeConstants", {
320 318 "SUPER_ADMIN": "Super Admin",
... ...