implemented multiple email functionality

unknown
1 parent f86d3f3d
Showing 3 changed files with 24 additions and 16 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -1290,7 +1290,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
     }
     $scope.reportCopyStatus = false;
     $scope.SendLabEXMailToUser = function (User) {
-        console.log(User);
+        
+       
       //  html2canvas($("#submitResultHtml"), {
         //    onrendered: function (canvas) {
              //   var dataURL = canvas.toDataURL("image/jpeg");
@@ -1316,10 +1317,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                 htm += '</tbody></table>';
                 $scope.reportImage = "<table style='width:100%;'><tr><td style='padding:15px;'><strong>"+$("#submitResultHtml .panel-heading .row div:nth-child(1)").text()+"</strong></td><td style='padding:15px;'>Performance Report</td><td style='padding:15px;text-align:right;'><span>" + $("#submitResultHtml .panel-heading .row div:nth-child(3)").text() + "</span></td></tr></table><table style='width:100%;'><thead><th style='text-align:center;padding:15px;border:1px solid #cccccc;'><strong>Total Question</strong></th><th style='border:1px solid #cccccc;text-align:center;padding:15px;'><strong>Correct Answers</strong></th><th style='border:1px solid #cccccc;padding:15px;text-align:center;'><strong>Incorrect Answers</strong></th></thead><tr><td style='border:1px solid #cccccc;padding:15px;text-align:center;'><span>" + $("#questionStatus tbody tr td:nth-child(1)").text() + "</span></td><td style='text-align:center;border:1px solid #cccccc;padding:15px;'><span>" + $("#questionStatus tbody tr td:nth-child(2)").text() + "</span></td><td style='text-align:center;border:1px solid #cccccc;padding:15px;'><span>" + $("#questionStatus tbody tr td:nth-child(3)").text() + "</span></td></tr></table><br/><br/>" + htm + "";
                 $scope.reportTitle = "Lab Exercise Report for " + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text();
-         //   }
+                $scope.senderEmails = $("#emailTo").val();
+           
+        //   }
       //  });
-                LabExerciseService.LabExerciseReport(User, $scope.reportImage, $scope.reportTitle, $scope.reportCopyStatus).then(
+                LabExerciseService.LabExerciseReport(User, $scope.reportImage, $scope.reportTitle, $scope.reportCopyStatus, $scope.senderEmails).then(
         function (result) {
             console.log(result);
@@ -51,10 +51,11 @@
         },
        // code of email report
-        LabExerciseReport: function (User, reportImage, reportTitle, reportCopyStatus) {
+        LabExerciseReport: function (User, reportImage, reportTitle, reportCopyStatus, senderEmail) {
             User.reportImage = reportImage;
             User.reportTitle = reportTitle;
             User.ReportCheck = reportCopyStatus;
+            User.EmailTo = senderEmail;
             var deferred = $q.defer();
             //  var jsonData = { 'EmailTo': User.EmailTo, 'EmailAdd': User.EmailAdd };
             $http.post('http://192.168.90.19:91/API/api/LabExercise/SendEmail', JSON.stringify(User), {
@@ -66,11 +67,11 @@
             })
             .success(function (data, status, headers, config) {
-                debugger;
+               
                 console.log('success')
                 deferred.resolve(data);
             }).error(function (data, status, headers, config) {
-                debugger;
+               
                 console.log('error')
                 deferred.reject(data);
             });
@@ -30,24 +30,26 @@
                 <div class="modal-body paddTop15">
                     <div class="modal-body paddTop15">
-                        <form class="form-horizontal" name="LabExForm" id="LabExerciseForm" ng-submit="LabExForm.$valid && SendLabEXMailToUser(User)">
+                        <form class="form-horizontal" name="LabExForm" id="LabExerciseForm" ng-submit="SendLabEXMailToUser(User)">
                             <div class="form-group">
                                 <div class="col-sm-5 control-label">
                                     <label>*Email To: (Email address)</label>
                                 </div>
-                                <div class="col-sm-7">
-                                    <input type="text" class="form-control" name="senderEmail" ng-model="User.EmailTo" ng-pattern="/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/" required="required" />
-                                    <div class="help-block">*Use ';' to separate multiple email ids. </div>
-                                    <div class="help-block" style="color:red;" ng-if="LabExForm.senderEmail.$error.pattern">Please Enter valid Email Address</div>
+
+                                    <div class="col-sm-7">
+                                        <!--<input type="email" class="form-control" name="senderEmail" ng-model="User.EmailTo" required="required" />-->
+                                        <input type="email" name="usremail" class="form-control" required="required" id="emailTo" multiple />
+                                        <div class="help-block">*Use ',' to separate multiple email ids. </div>
+                                        <!--<div class="help-block" style="color:red;" ng-if="LabExForm.senderEmail.$error.pattern">Please Enter valid Email Address</div>-->
+                                    </div>
                                 </div>
-                            </div>
                             <div class="form-group">
                                 <div class="col-sm-5 control-label">
                                     <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]+$/" required="required" />
+                                    <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>
                                     <!--<div class="help-block" style="color:red;" id="nameHelpBlock"> Please Enter your Name </div>-->
                                 </div>
@@ -58,9 +60,11 @@
                                     <label for="">*Your Email Address:</label>
                                 </div>
                                 <div class="col-sm-7">
-                                    <input type="text" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" ng-pattern="/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/" required="required" />
+                                    <!--<input type="text" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" ng-pattern="/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/" required="required" />-->
+                                    <input type="email" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" required="required" />
+
                                     <!--<div class="help-block" style="color:red;" id="emailHelpBlock"> Please Enter your Email Address </div>-->
-                                    <div class="help-block" style="color:red;" ng-if="LabExForm.receiverEmail.$error.pattern"> Please Enter valid Email Address</div>
+                                    <!--<div class="help-block" style="color:red;" ng-if="LabExForm.receiverEmail.$error.pattern"> Please Enter valid Email Address</div>-->
                                 </div>
                             </div>
@@ -69,7 +73,7 @@
                                     <label for="">Send me a copy of the report</label>
                                 </div>
                                 <div class="col-sm-7">
-                                    <input type="checkbox" style="margin-top: 12px;" ng-model="User.ReportCheck" ng-init="User.ReportCheck = false" />
+                                    <input type="checkbox" style="margin-top: 12px;" ng-model="reportCopyStatus" />
                                 </div>
                             </div>