diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 827400d..6f489e6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -822,7 +822,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
 
     $rootScope.LogoutUser = function () {
         localStorage.removeItem('loggedInUserDetails');
-       // localStorage.clear();
+        localStorage.clear();
         document.location = '/';
         $rootScope.isVisibleLogin = true;
     }
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 2f1ed77..6e531f2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -193,10 +193,11 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                         }
                     });
                     $timeout(function () {
+
                         if ($scope.SavedLabExercise != undefined && $scope.SavedLabExercise.lastQuestion > 0) {
                             if ($scope.isResetClicked != true) {
                                 $scope.ShowSavedLabExercise();
-
+                               
                             }
                             else {
                                 $rootScope.isLoading = false;
@@ -204,10 +205,22 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                                 $scope.isResetClicked = false;
                             }
                         }
+                        //else if ($scope.LabExerciseUserData != undefined && $scope.LabExerciseUserData.length > 0) {
+                        //    if ($scope.isResetClicked != true) {
+                        //        $scope.ShowSavedLabExercise();
+
+                        //    }
+                        //    else {
+                        //        $rootScope.isLoading = false;
+                        //        $('#spinner').css('visibility', 'hidden');
+                        //        $scope.isResetClicked = false;
+                        //    }
+                        //}
                         else {
                             $rootScope.isLoading = false;
                             $('#spinner').css('visibility', 'hidden');
                         }
+                   
                     }, 100);
 
 
@@ -1122,6 +1135,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
         $scope.correctResponseForSavingDatabase = $scope.correctResponseForSavingDatabase.replace(/,$/, '');
     }
 
+    
 
     $scope.getDragItems = function () {
         var OptionBoxes = $("div[id*='block-']");
@@ -1329,61 +1343,133 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
     }
     $scope.reportCopyStatus = false;
     $scope.SendLabEXMailToUser = function (User) {
+
        
-        var reportHtml = '';
-   
-                reportHtml += '<table style="width:100%;"><thead><th style="padding:15px;border:1px solid #cccccc"><strong>Question</strong></th><th style="padding:15px;border:1px solid #cccccc"><strong>Activity Title</strong></th><th style="padding:15px;border:1px solid #cccccc"><strong>Status</strong></th></thead><tbody>';
-                $("#resultLabData tr").each(function () {
-                    reportHtml += '<tr>';
-                    $(this).children("td").each(function () {
-                        if ($(this).text() == " Review") {
-                        }
-                        else{
-                            reportHtml += '<td style="border:1px solid #cccccc;padding:15px;">' + $(this).text() + '</td>';
-                        }
-                    });
-                    reportHtml += '</tr>';
+        // email validation code
+
+        var senderEmails = $("#emailTo").val().split(", ");
+        $scope.isSenderEmailValid = false;
+        for (var i = 0; i <= senderEmails.length - 1; i++) {
+
+            var sEmail = senderEmails[i];
+            if ($.trim(sEmail).length == 0) {
+                //alert('*Email To email address is empty');
+                $scope.isSenderEmailValid = false;
+                // event.preventDefault();
+                $("#alertPopUp").css("display", "block");
+                $("#messageBody").text("Email Address address is empty");
+                return false;
+            }
+            if ($scope.validateEmail(sEmail)) {
+                $scope.isSenderEmailValid = true;
+            }
+            else {
+               // alert('*Email To email is not valid');
+                $scope.isSenderEmailValid = false;
+                $("#alertPopUp").css("display", "block");
+                $("#messageBody").text("Email Address is not valid");
+                //   event.preventDefault();
+                return false;
+            }
+        }
+
+
+        $scope.isReceiverEmailValid = false;
+        var receiverEmail = $("#userEmailID").val();
+        var rEmail = receiverEmail;
+        if ($.trim(rEmail).length == 0) {
+            $scope.isReceiverEmailValid = false;
+            $("#alertPopUp").css("display", "block");
+            $("#messageBody").text("Your Email Address is empty");
+            return false;
+        }
+        if ($scope.validateEmail(rEmail)) {
+            $scope.isReceiverEmailValid = true;
+        }
+        else {
+            $scope.isReceiverEmailValid = false;
+            $("#alertPopUp").css("display", "block");
+            $("#messageBody").text("Your Email Address is not valid");
+            return false;
+        }
+
+        // email validation code ends
+
+
+        if ($scope.isSenderEmailValid == true && $scope.isReceiverEmailValid == true) {
+
+            var reportHtml = '';
 
+            reportHtml += '<table style="width:100%;"><thead><th style="padding:15px;border:1px solid #cccccc"><strong>Question</strong></th><th style="padding:15px;border:1px solid #cccccc"><strong>Activity Title</strong></th><th style="padding:15px;border:1px solid #cccccc"><strong>Status</strong></th></thead><tbody>';
+            $("#resultLabData tr").each(function () {
+                reportHtml += '<tr>';
+                $(this).children("td").each(function () {
+                    if ($(this).text() == " Review") {
+                    }
+                    else {
+                        reportHtml += '<td style="border:1px solid #cccccc;padding:15px;">' + $(this).text() + '</td>';
+                    }
                 });
-                reportHtml += '</tbody></table>';
-             
-                //if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") {
-              
-                //    $scope.reportImage = "<h1 style='font-size:20px;'>Report Result:</h1><br/><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/>" + reportHtml + "";
-                //}
-                //else {
-                 
-                //    $scope.reportImage = "<h6 style='font-size:15px;'>" + $("#emailComment").val() + "</h6><br/><h1 style='font-size:20px;'>Report Result:</h1><br/><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/>" + reportHtml + "";
-                //}
-                
-                if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") {
+                reportHtml += '</tr>';
 
-                    $scope.reportImage = "<h1 style='font-size:15px;'><b>Name: </b><span style='text-transform:capitalize;'>" + User.Name + "</span></h1><br/><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/>" + reportHtml + "";
-                }
-                else {
+            });
+            reportHtml += '</tbody></table>';
 
-                    $scope.reportImage = "<h1 style='font-size:15px;'><b>Name: </b><span style='text-transform:capitalize;'>" + User.Name + "</span></h1><br/><h6 style='font-size:15px;'>" + $("#emailComment").val() + "</h6><br/><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/>" + reportHtml + "";
-                }
+            //if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") {
 
-                $scope.reportTitle = "Lab Exercise Report for " + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text();
-                $scope.receiverEmails = $("#emailTo").val();
-           
-               
-                LabExerciseService.LabExerciseReport(User, $scope.reportImage, $scope.reportTitle, $scope.reportCopyStatus, $scope.receiverEmails).then(
+            //    $scope.reportImage = "<h1 style='font-size:20px;'>Report Result:</h1><br/><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/>" + reportHtml + "";
+            //}
+            //else {
 
-        function (result) {
-            console.log(result);
-        },
-        function (error) {
-            console.log(error.statusText);
+            //    $scope.reportImage = "<h6 style='font-size:15px;'>" + $("#emailComment").val() + "</h6><br/><h1 style='font-size:20px;'>Report Result:</h1><br/><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/>" + reportHtml + "";
+            //}
+
+            if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") {
+
+                $scope.reportImage = "<h1 style='font-size:15px;'><b>Name: </b><span style='text-transform:capitalize;'>" + User.Name + "</span></h1><br/><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/>" + reportHtml + "";
+            }
+            else {
+
+                $scope.reportImage = "<h1 style='font-size:15px;'><b>Name: </b><span style='text-transform:capitalize;'>" + User.Name + "</span></h1><br/><h6 style='font-size:15px;'>" + $("#emailComment").val() + "</h6><br/><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/>" + reportHtml + "";
+            }
+
+            $scope.reportTitle = "Lab Exercise Report for " + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text();
+            $scope.receiverEmails = $("#emailTo").val();
+
+
+            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";
+
+
+
+
+        }
+      
+    }
+
+    $scope.validateEmail = function (sEmail) {
+        var filter = /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/;
+        if (filter.test(sEmail)) {
+            return true;
+        }
+        else {
+            return false;
         }
-  )
-       // for closing email popup
-                $rootScope.closeLabExEmailModel();
-                
-                document.getElementById('labExEmailSentModalID').style.display = "block";
-                document.getElementById('labExModalbackground').style.display = "block";
     }
+
+
     $rootScope.closeLabExEmailModel = function () {
         document.getElementById("LabExerciseForm").reset();
         $scope.LabExForm.$setPristine();
@@ -1405,6 +1491,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
         document.getElementById('labExModalbackground').style.display = "none";
 
     }
+
+
+
+
 }]
 
 );
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
index f54294d..6479a63 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -1,5 +1,11 @@
 <!--Body-->
 <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js"></script>
+<script>
+    function labExModalClose()
+    {
+        $("#alertPopUp").css("display", "none");
+    }
+</script>
 <div class="bodyWrap row" ng-controller="LabExercController">
 
     <div class="" ng-init="InitializeLabExercise()">
@@ -38,10 +44,13 @@
 
                                     <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 />
+                                    
+                                        <input type="text" name="usremail" class="form-control" 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">
@@ -61,7 +70,7 @@
                                 </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="email" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" required="required" />
+                                    <input type="text" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" id="userEmailID" />
 
                                     <!--<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>-->
@@ -108,6 +117,29 @@
         </div>
 
 
+
+        <div class="labExModal" id="alertPopUp" style="display: none;  position: absolute; z-index: 12000001; margin: auto; top: 0; left: 0; right: 0; bottom: 0; width: 400px;height:400px;">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <!--<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
+                    <h4 class="modal-title">Error</h4>
+                </div>
+                <div class="modal-body ">
+                    <div class="modal-body" id="messageBody" style="padding:10px;font-size:15px;">
+                      
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" onclick="labExModalClose()">Close</button>
+
+                </div>
+            </div>
+        </div>
+
+
+
+
+
         
         <!-- Modal -->
         <!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">