email msg on succesful email

Nikita Kulshreshtha
1 parent e75b61c2
Showing 4 changed files with 60 additions and 27 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/LabExerciseController.cs
400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -260,8 +260,11 @@ namespace AIAHTML5.API.Controllers
             {
                 aar.Add(User["EmailAdd"].ToString());
             }
-            AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true);
-            return Request.CreateResponse(HttpStatusCode.OK);
+        //    AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true);
+          //  return Request.CreateResponse(HttpStatusCode.OK);
+             bool isEMailSent =  AIAHTML5.API.Models.UserUtility.SendEmail(User, aar, User["EmailAdd"].ToString(), User["reportTitle"].ToString(), User["reportImage"].ToString(), true);
+          //  return Request.CreateResponse(HttpStatusCode.OK,);
+             return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(isEMailSent.ToString()) };
         }
         [Route("api/LabExercise/GetParameter")]
         [HttpGet]
@@ -31,6 +31,9 @@ namespace AIAHTML5.API.Utility
  
         public void SendMail(MailMessage mm)
         {
+            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
+            //logger.Debug("inside SendMail");
+
             try
             {
                 SmtpClient smtp = new SmtpClient();
@@ -43,7 +46,9 @@ namespace AIAHTML5.API.Utility
                 smtp.Send(mm);
             }
             catch (Exception e)
-            {                
+            {
+               logger.Fatal("Exception inside SendMail. Ex= " + e.Message + "....STACKTRACE = " + e.StackTrace);
+            
                 throw;
             }
         }
@@ -136,7 +141,7 @@ namespace AIAHTML5.API.Utility
             catch (Exception ex)
             {
                 logger.Fatal("exception in SendSmtpEmail.msg= " + ex.Message + ", stacktarce= " + ex.StackTrace);
-                throw ex;
+                throw ;
             }
         }
     }
 /// <reference path="../../content/data/json/le/LabExercise.js" />
-AIA.controller("LabExercController", ["$scope", "$rootScope", "pages", "$log", '$http', '$timeout', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", "$location", "LabExerciseService", "AIAConstants",
-function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, $location, $document, $sce, $compile, $location, LabExerciseService, AIAConstants) {
+AIA.controller("LabExercController", ["$scope", "$rootScope", "pages", "$log", '$http', '$timeout', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", "$location", "LabExerciseService", "AIAConstants","LoginConstants",
+function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, $location, $document, $sce, $compile, $location, LabExerciseService, AIAConstants, LoginConstants) {
     $scope.$sce = $sce;
     $scope.LabExerciseName;
     $scope.LabExerciseQuiz = null;
@@ -1409,8 +1409,27 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                 return false;
             }
         }
-
-
+      
+        $scope.isUserNameValid = false;
+        var userName = $("#userName").val();
+        if (userName.length == 0 || userName == 'undefined' || userName == ' ') {
+            $("#alertPopUp").css("display", "block");
+            $("#messageBody").text("Please enter User name");
+            $scope.isUserNameValid = false;
+            return false;
+        }
+      //  else {
+            var filterName = /^([a-zA-Z]+\s?)*$/;
+            if (filterName.test(userName)) {
+                $scope.isUserNameValid = true;
+            }
+            else {
+                $("#alertPopUp").css("display", "block");
+                $("#messageBody").text("User Name is not valid");
+                $scope.isUserNameValid = false;
+                return false;
+            }
+       // }
         $scope.isReceiverEmailValid = false;
         var receiverEmail = $("#userEmailID").val();
         var rEmail = receiverEmail;
@@ -1433,7 +1452,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
         // email validation code ends
  
  
-        if ($scope.isSenderEmailValid == true && $scope.isReceiverEmailValid == true) {
+        if ($scope.isSenderEmailValid == true && $scope.isReceiverEmailValid == true && $scope.isUserNameValid == true) {
  
             var reportHtml = '';
  
@@ -1475,21 +1494,27 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
  
  
             LabExerciseService.LabExerciseReport(User, $scope.reportImage, $scope.reportTitle, $scope.reportCopyStatus, $scope.receiverEmails).then(
-
-    function (result) {
-        console.log(result);
-    },
-    function (error) {
-        console.log(error.statusText);
-    }
-)
-            // for closing email popup
-            $rootScope.closeLabExEmailModel();
-
-            document.getElementById('labExEmailSentModalID').style.display = "block";
-            document.getElementById('labExModalbackground').style.display = "block";
-
-
+            function(result){
+              if (result == "true") {
+                document.getElementById('labExEmailSentModalID').style.display = "block";
+                            document.getElementById('labExModalbackground').style.display = "block";
+                       
+                        }
+              else {
+                    var message = LoginConstants.MAIL_NOT_SENT
+                    //alert(message);
+                    $rootScope.errorMessage = message;
+                    $("#messageModal").modal('show');
+                }
+              console.log(result);
+},
+     function (error) {
+                 var message = LoginConstants.MAIL_NOT_SENT
+                 //alert(message);
+                 $rootScope.errorMessage = message;
+                 $("#messageModal").modal('show');
+         console.log(error.statusText);
+     }
  
  
         }
@@ -58,8 +58,8 @@
                                     <label>*Your name:</label>
                                 </div>
                                 <div class="col-sm-7">
-                                    <input type="text" name="name" class="form-control" ng-model="User.Name" ng-pattern="/^([a-zA-Z]+\s?)*$/" required="required" />
-                                    <div class="help-block" style="color:red;" ng-if="LabExForm.name.$error.pattern"> Please enter your Name</div>
+                                    <input type="text" name="name" class="form-control" ng-model="User.Name" id="userName" />
+                                    <!--<div class="help-block" style="color:red;" ng-if="LabExForm.name.$error.pattern"> Please enter your Name</div>-->
                                     <!--<div class="help-block" style="color:red;" id="nameHelpBlock"> Please Enter your Name </div>-->
                                 </div>
                             </div>
@@ -168,7 +168,7 @@
                 </div>
                 <div class="modal-body ">
                     <div class="modal-body" style="padding:10px;font-size:15px;">
-                       Your report has been sent. A copy has been emailed to you for your records. 
+                       Your report has been sent. 
                     </div>
                 </div>
                 <div class="modal-footer">