Merge branch 'US_15245_15885' into Develop

Amrita Vishnoi
2 parents ce5f7c39 6aa1d9c9
Showing 15 changed files with 279 additions and 46 deletions
400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
400-SOURCECODE/AIAHTML5.API/Controllers/AdminAccessController.cs
400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
400-SOURCECODE/AIAHTML5.API/Models/ResetUser.cs → 400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/services/AdminService.js
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -106,13 +106,14 @@
   <ItemGroup>
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Constants\AIAConstants.cs" />
+    <Compile Include="Controllers\AdminAccessController.cs" />
     <Compile Include="Controllers\AuthenticateController.cs" />
     <Compile Include="Controllers\ForgotUserController.cs" />
     <Compile Include="Controllers\ResetPasswordController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-    <Compile Include="Models\ResetUser.cs" />
+    <Compile Include="Models\UserUtility.cs" />
     <Compile Include="Models\Users.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
@@ -10,7 +10,7 @@ namespace AIAHTML5.API.Constants
        public  const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details.";
        public const string USER_NOT_FOUND = "User not found.";
        public const string MAIL_NOT_SENT = "Mail not sent.";
-
+       public const string MAIL_SENT = "Mail sent.";
     }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using AIAHTML5.API.Constants;
+using log4net;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using AIAHTML5.API.Models;
+using AIAHTML5.API.Utility;
+
+namespace AIAHTML5.API.Controllers
+{
+    public class AdminAccessController : ApiController
+    {
+        public HttpResponseMessage Post([FromBody]JObject userInfo)
+        {
+            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
+
+            bool isMailSent = AIAHTML5.API.Models.UserUtility.SendAdminRequestEmail(userInfo);
+
+            if (isMailSent)
+            {
+                logger.Debug("AdminAccessRequest mail sent for User: " + userInfo["firstName"] + " " + userInfo["lastName"] + "& mail id = " + userInfo["emailId"]);
+                return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.MAIL_SENT) };
+            }
+            else
+            {
+                logger.Debug("AdminAccessRequest mail sent for User: " + userInfo["firstName"] + " " + userInfo["lastName"] + "& mail id = " + userInfo["emailId"]);
+                return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.MAIL_NOT_SENT) };
+            }
+        }
+    }
+}
 \ No newline at end of file
@@ -45,17 +45,17 @@ namespace AIAHTML5.API.Controllers
                 logger.Debug("1. inside if in ForgotUserController userDetails= " + userDetails);
-                if (Convert.ToBoolean(userInfo["isPassword"]))
+                if (Convert.ToBoolean(userInfo["havePassword"]))
                 {
-                    logger.Debug("2.  isPassword= " + Convert.ToBoolean(userInfo["isPassword"]));
+                    logger.Debug("2.  havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
-                    isMailSent = AIAHTML5.API.Models.ResetUser.SendEmail(userData, true);
+                    isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, true);
                 }
                 else
                 {
-                    logger.Debug("3. isPassword= " + Convert.ToBoolean(userInfo["isPassword"]));
+                    logger.Debug("3. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
-                    isMailSent = AIAHTML5.API.Models.ResetUser.SendEmail(userData, false);
+                    isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, false);
                 }
                 logger.Debug("isMailSent= " + isMailSent);
                 if (isMailSent)
@@ -12,16 +12,16 @@ using AIAHTML5.API.Utility;
 using System.Text;
 using System.IO;
 using System.Net.Mime;
-using System.Configuration;
+using System.Configuration;
 namespace AIAHTML5.API.Models
 {
-    public class ResetUser
+    public class UserUtility
     {
-        public static bool SendEmail(dynamic UserDetails, bool isPassword)
-        {
-            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
-            logger.Debug("inside SendEmail in  for isPassword =" + isPassword);
+        public static bool SendEmail(dynamic UserDetails, bool havePassword)
+        {
+            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
+            logger.Debug("inside SendEmail in  for isPassword =" + havePassword);
             try
             {
@@ -38,19 +38,19 @@ namespace AIAHTML5.API.Models
                 string lName = string.Empty;
                 string site_url = Convert.ToString(ConfigurationManager.AppSettings["Site_URL"]);
-                foreach (KeyValuePair<string, object> kvp in UserDetails)
+                foreach (KeyValuePair<string, object> userObj in UserDetails)
                 {
-                    if (kvp.Key == "loginId")
-                        userId = kvp.Value.ToString();
+                    if (userObj.Key == "loginId")
+                        userId = userObj.Value.ToString();
-                    if (kvp.Key == "emailId")
-                        userMail = kvp.Value.ToString();
+                    if (userObj.Key == "emailId")
+                        userMail = userObj.Value.ToString();
-                    if (kvp.Key == "firstName")
-                        fName = kvp.Value.ToString();
+                    if (userObj.Key == "firstName")
+                        fName = userObj.Value.ToString();
-                    if (kvp.Key == "lastName")
-                        lName = kvp.Value.ToString();
+                    if (userObj.Key == "lastName")
+                        lName = userObj.Value.ToString();
                 }
                 string fullName = fName + " " + lName;
@@ -60,21 +60,21 @@ namespace AIAHTML5.API.Models
                 string templatePath = string.Empty;
                 string resetPasswordLink = string.Empty;
-                if (isPassword)
+                if (havePassword)
                 {
                     templatePath = "~/Templates/forgot-Password.html";
                     resetPasswordLink = site_url + "?em:" + HttpUtility.UrlEncode(userMail);
                 }
                 else
-                    templatePath = "~/Templates/forgot-UserId.html";
-
+                    templatePath = "~/Templates/forgot-UserId.html";                    
+
                 logger.Debug("inside SendEmail for templatePath= " + templatePath + ", userId= " + userId + ", userMail= " + userMail + ",fullName= " + fullName + ",resetPasswordLink= " + resetPasswordLink);
-                string mailBody = ResetUser.GetMailBodyTextFromTemplate(templatePath, userId, userMail, fullName, resetPasswordLink);
+                string mailBody = UserUtility.GetMailBodyTextFromTemplate(templatePath, userId, userMail, fullName, resetPasswordLink);
                 lstToAddress.Add(userMail);
-                emailText = mailBody;
-
+                emailText = mailBody;
+
                 logger.Debug("emailText= " + emailText);
                 // for embedding images in email
                 if (emailText.Contains("<img"))
@@ -93,17 +93,17 @@ namespace AIAHTML5.API.Models
                 }
                 string mailSubject = string.Empty;
-                if(!isPassword)
+                if (!havePassword)
                     mailSubject = "UserID recovery mail for: ";
                 else
-                    mailSubject = "Password recovery mail for: ";
-
+                    mailSubject = "Password recovery mail for: ";
+                
+
                 emailUtility.sHostName = Convert.ToString(ConfigurationManager.AppSettings["HostAddress"]);
                 emailUtility.sFromAddress = Convert.ToString(ConfigurationManager.AppSettings["SenderEmailAddress"]);
                 emailUtility.bIsBodyHtml = true;
                 emailUtility.bEnableSsl = false;
                 emailUtility.sSubject = mailSubject + userMail;
-                //sEmailUtility.sBodyText = sEmailText;
                 emailUtility.iPort = 25;
                 emailUtility.sToAddresses = lstToAddress;
                 emailUtility.sBccAddresses = lstBccAddress;
@@ -119,9 +119,9 @@ namespace AIAHTML5.API.Models
         }
         protected static string GetMailBodyTextFromTemplate(string templatePath, string userId, string userMail, string fullName, string resetPasswordUrl)
-        {
-            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
-            logger.Debug("inside GetMailBodyTextFromTemplate for templatePath= " + templatePath + ", userId= " + userId + ", userMail= " + userMail + ",fullName= " + fullName + ",resetPasswordLink= " + resetPasswordUrl);
+        {
+            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
+            logger.Debug("Inside GetMailBodyTextFromTemplate for templatePath= " + templatePath + ", userId= " + userId + ", userMail= " + userMail + ",fullName= " + fullName + ",resetPasswordLink= " + resetPasswordUrl);
             string fileToRead = string.Empty;
             string emailBody = string.Empty;
@@ -145,10 +145,67 @@ namespace AIAHTML5.API.Models
             }
             catch (Exception e)
             {
-                emailBody = "Exception: " + e.Message;
+                emailBody = "Exception: " + e.Message;
                 logger.Fatal("exception in GetMailBodyTextFromTemplate. msg= " + e.Message + ", stacktrace= " + e.StackTrace);
             }
             return emailBody;
         }
+
+        public static bool SendAdminRequestEmail(Newtonsoft.Json.Linq.JObject userInfo)
+        {
+            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
+            logger.Debug("Inside SendAdminRequestEmail for email =" + userInfo["emailId"]);
+
+            try
+            {
+                EmailUtility emailUtility = new EmailUtility();
+                List<string> lstToAddress = new List<string>();
+                List<string> lstBccAddress = new List<string>();
+
+                string userMail = string.Empty;
+                string fullName = string.Empty;
+                string emailMessage = string.Empty;
+                
+                string[] mailToArr = (ConfigurationManager.AppSettings["AdminSupport"]).Split(',');
+                if (mailToArr.Length > 0)
+                {
+                    for (int i = 0; i < mailToArr.Length; i++)
+                    {
+                        lstToAddress.Add(mailToArr[i].ToString());
+                    }
+                }
+
+                fullName = userInfo["firstName"].ToString() + " " + userInfo["lastName"].ToString();
+                userMail = userInfo["emailId"].ToString();
+                emailMessage = userInfo["userMessage"].ToString();
+
+                lstToAddress.Add(userMail);
+                
+                emailMessage = emailMessage.Replace("\n", "<br/>");
+
+                emailMessage += "<br/><br/>";
+
+                string mailSubject = "Admin Support request initiated for:";
+
+                emailUtility.sHostName = Convert.ToString(ConfigurationManager.AppSettings["HostAddress"]);
+                emailUtility.sFromAddress = Convert.ToString(ConfigurationManager.AppSettings["SenderEmailAddress"]);
+                emailUtility.bIsBodyHtml = true;
+                emailUtility.bEnableSsl = false;
+                emailUtility.sSubject = mailSubject + " " + userMail;
+                emailUtility.sBodyText = emailMessage;
+                emailUtility.iPort = 25;
+                emailUtility.sToAddresses = lstToAddress;
+                emailUtility.sBccAddresses = lstBccAddress;
+
+                emailUtility.SendSmtpEmail();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.Fatal("exception in GetMailBodyTextFromTemplate. msg= " + ex.Message + ", stacktrace= " + ex.StackTrace);
+                return false;
+            }
+        }
+
     }
 }
 \ No newline at end of file
@@ -39,7 +39,8 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="//52.2.38.120"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="false"/>
+    <add key="isUserAuthenticated" value="True"/>
+    <add key="AdminSupport" value=""/>
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
@@ -39,7 +39,8 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="//52.2.38.120"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="false"/>
+    <add key="isUserAuthenticated" value="True"/>
+    <add key="AdminSupport" value=""/>
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
 'use strict';
-AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants","UserModules","LoginMessageConstants",
-function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants) {
+AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants","UserModules","LoginMessageConstants","AdminService", "AdminConstants", "UserTypeConstants",
+function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, AdminConstants, UserTypeConstants) {
     //$scope.pageToOpen = {
     //    name: 'MainMenu'
@@ -75,14 +75,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         username: null,
         password: null,
         emailId: null,
-        isPassword: null,
+        havePassword: null,
         newPassword: null,
-        confirmPassword: null
+        confirmPassword: null,
+        userMessage: null
     };
     $rootScope.userData;
     $rootScope.userModules;
     $rootScope.errorMesaage;
     $rootScope.isVisibleLogin;
+    $rootScope.notAnAdmin;
     var isfilloptionChecked = "";
     var isOutlineOptionChecked = "";
     $rootScope.initializeAIA = function () {
@@ -134,6 +136,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                          $rootScope.isVisibleLogin = false;
                          localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+
+                         var userType = result.userType + '';
+
+                         if (userType === UserTypeConstants.SUPER_ADMIN)
+                             $rootScope.notAnAdmin = false;
+                         else
+                             $rootScope.notAnAdmin = true;
                      }
                  }
              }
@@ -193,9 +202,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         if ((userInfo.emailId != null) && (userInfo.emailId != '')) {
             if (validateEmail(userInfo.emailId)) {
                 if (isMailForPassword == true)
-                    userInfo.isPassword = true;
+                    userInfo.havePassword = true;
                 else
-                    userInfo.isPassword = false;
+                    userInfo.havePassword = false;
                 AuthenticationService.SendMailToUser(userInfo)
                 .then(function (result) {
@@ -3287,5 +3296,45 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
+    $rootScope.OpenAdminForm = function (userInfo) {
+        $('#adminModal').css({ top: '50px' });
+        if ($rootScope.userData) {
+            $('#adminfName').val($rootScope.userData.firstName);
+            $('#adminlName').val($rootScope.userData.lastName);
+            $('#adminEmailId').val($rootScope.userData.emailId);
+        }
+    };
+
+    $rootScope.SendAdminAccessRequestMail = function (userInfo) {
+        
+        if ($rootScope.userData) {
+            userInfo.firstName = $rootScope.userData.firstName;
+            userInfo.lastName = $rootScope.userData.lastName;
+            userInfo.emailId = $rootScope.userData.emailId;
+        }        
+
+        AdminService.SendAdminAccessRequestMail(userInfo)
+            .then(function (result) {
+                if (result == AdminConstants.MAIL_SENT) {
+                    $("#adminModal").fadeOut();
+                    $("#adminModal").modal('hide');
+                    $("adminAccessTextArea").text('');
+
+                    $rootScope.errorMassage = AdminConstants.MAIL_SENT;
+                    $("#messageModal").modal('show');
+                }
+            },
+            function (error) {
+                console.log(' Error in sending mail to admin support = ' + error.statusText);
+                $rootScope.errorMassage = AdminConstants.ERROR_IN_SENDING_MAIL;
+                $("#messageModal").modal('show');
+            });
+    };
+
+    $rootScope.CloseAAModal = function () {
+        $("#adminModal").fadeOut();
+        $("#adminModal").modal('hide');
+        $("adminAccessTextArea").text('');
+    }
 }]
 );
 \ No newline at end of file
@@ -310,6 +310,21 @@ AIA.constant(&quot;LoginMessageConstants&quot;, {
     //"MAIL_NOT_SENT": "Mail not sent."
 })
+AIA.constant("AdminConstants", {
+    "ERROR_IN_SENDING_MAIL": "Some internal error occured.",
+    "MAIL_SENT": "Mail sent."
+})
+AIA.constant("UserTypeConstants", {
+    "SUPER_ADMIN": "Super Admin",
+    "GENERAL_ADMIN": "General Admin",
+    "DISTRICT_ADMIN": "District Admin",
+    "CLIENT_ADMIN": "Client Admin",
+    "SINGLE_USER": "Single User",
+    "CONCURRENT_USER": "Concurrent User",
+    "RESELLER": "Reseller",
+    "TEST_ACCOUNT": "Test Account",
+    "SITE_USER": "Site User"
+})
 AIA.constant("UserModules", [
     {
         "name": "Dissectible Anatomy",
+AIA.factory('AdminService', function ($http, $q) {
+    return {
+        SendAdminAccessRequestMail: function (userInfo) {
+            var deferred = $q.defer();
+
+            $http.post('/API/api/AdminAccess', userInfo, {
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+        .success(function (data, status, headers, config) {
+            console.log('success');
+            deferred.resolve(data);
+        }).error(function (data, status, headers, config) {
+            console.log('error')
+            deferred.reject(status);
+        });
+            return deferred.promise;
+        }
+    }
+});
 \ No newline at end of file
@@ -18,7 +18,7 @@
             return deferred.promise;
         },
-        SendMailToUser: function (userInfo, isPassword) {
+        SendMailToUser: function (userInfo, havePassword) {
             var deferred = $q.defer();
             $http.post('/API/api/ForgotUser', userInfo, { //JSON.stringify(userEmail)
@@ -49,7 +49,7 @@
                 <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>
             </ul>
         </li>
-        <li><a href="#">Admin</a></li>
+        <li><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="notAnAdmin">Admin</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
         <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
@@ -1164,6 +1164,57 @@
         </div>
     </div>
+    <!--Admin Form (Under Process)-->
+    <div class="modal fade ui-draggable in" id="adminModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; ">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;"> <!--bg-primary-->
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="btnCloseAAModal" ng-click="CloseAAModal()"><span aria-hidden="true">×</span></button>
+                    <h5 class="text-left lhgt19 padd5" style="color:red; text-align:left;">*This module is not yet available to use, please fill in the form with complete details, a support request will be submitted to ADAM Education Sales and Support team. If needed someone from ADAM team will contact you ASAP.</h5>
+                </div>
+                <div class="modal-body">
+                    <div class="panel-body">
+                        <!-- form -->
+                        <form class="form-horizontal" name="adminAccessRequestForm">
+                            <div class="form-group">
+                                <label for="inputEmail3" class="col-sm-3 control-label">First Name :</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="adminfName" placeholder="" ng-model=" userinfo.firstname" ng-readonly="true">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="inputPassword3" class="col-sm-3 control-label">Last Name :</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="adminlName" placeholder="" type="text" ng-model="userInfo.lastName" ng-readonly="true">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="inputPassword3" class="col-sm-3 control-label">Email Id <span class="red">*</span> :</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="adminEmailId" placeholder="" type="text" ng-model="userInfo.emailId" ng-readonly="true">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="inputPassword3" class="col-sm-3 control-label">Message <span class="red">*</span> :</label>
+                                <div class="col-sm-8">
+                                    <textarea name="adminAccessTextArea" class="form-control" rows="3" placeholder="Message" ng-model="userInfo.userMessage" required></textarea> <!--ng-show="!adminRequestTextArea.length-->
+                                    <span id="spnError" style="color: maroon; font-weight:bold" ng-show="adminAccessRequestForm.adminAccessTextArea.$invalid">Message required.</span>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-sm-offset-3 col-sm-8 mar-top17">
+                                    <button type="button" class="btn btn-primary btn-sm" ng-click="adminAccessRequestForm.$valid && SendAdminAccessRequestMail(userInfo)" data-toggle="modal" data-target="#mymodal"><i class="fa fa-check"></i> Submit</button>
+                                </div>
+
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
     <script>
         function enableDisableFillOption() {
@@ -1293,6 +1344,7 @@
     <script src="app/controllers/HomeController.js"></script>
     <script src="app/controllers/LinkController.js"></script>
     <script src="app/services/AuthenticationService.js"></script>
+    <script src="app/services/AdminService.js"></script>
     <script src="app/services/DataService.js"></script>
     <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>