diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 397ca8e..558a673 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -1372,7 +1372,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, // for closing email popup $rootScope.closeLabExEmailModel(); - document.getElementById('labExEmailSentModalID').style.display = "block"; + //document.getElementById('labExEmailSentModalID').style.display = "block"; document.getElementById('labExModalbackground').style.display = "block"; } $rootScope.closeLabExEmailModel = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js index fbd29f4..135ae07 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js @@ -68,11 +68,22 @@ .success(function (data, status, headers, config) { - console.log('success') + console.log('success'); + + document.getElementById('notificationTitle').innerText = "Email Your Performance Report"; + if (reportCopyStatus == true) { + document.getElementById('notificationMessage').innerText = "Your report has been sent. A copy has been emailed to you for your records."; + } + else { + document.getElementById('notificationMessage').innerText = "Your report has been sent."; + } + document.getElementById('labExEmailSentModalID').style.display = "block"; deferred.resolve(data); }).error(function (data, status, headers, config) { - - console.log('error') + console.log('error'); + document.getElementById('notificationTitle').innerText = "Alert"; + document.getElementById('notificationMessage').innerText = "Invalid email Id"; + document.getElementById('labExEmailSentModalID').style.display = "block"; deferred.reject(data); }); return deferred.promise; 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 66b3c06..16b6c2a 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 @@ -132,11 +132,11 @@