diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 47f99b6..397ca8e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -1329,7 +1329,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, } $scope.reportCopyStatus = false; $scope.SendLabEXMailToUser = function (User) { - var reportHtml = ''; + + var reportHtml = ''; + reportHtml += ''; $("#resultLabData tr").each(function () { reportHtml += ''; @@ -1344,7 +1346,16 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, }); reportHtml += '
QuestionActivity TitleStatus
'; - $scope.reportImage = "
"+$("#submitResultHtml .panel-heading .row div:nth-child(1)").text()+"Performance Report" + $("#submitResultHtml .panel-heading .row div:nth-child(3)").text() + "
Total QuestionCorrect AnswersIncorrect Answers
" + $("#questionStatus tbody tr td:nth-child(1)").text() + "" + $("#questionStatus tbody tr td:nth-child(2)").text() + "" + $("#questionStatus tbody tr td:nth-child(3)").text() + "


" + reportHtml + ""; + + if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") { + + $scope.reportImage = "

Report Result:


" + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text() + "Performance Report" + $("#submitResultHtml .panel-heading .row div:nth-child(3)").text() + "
Total QuestionCorrect AnswersIncorrect Answers
" + $("#questionStatus tbody tr td:nth-child(1)").text() + "" + $("#questionStatus tbody tr td:nth-child(2)").text() + "" + $("#questionStatus tbody tr td:nth-child(3)").text() + "


" + reportHtml + ""; + } + else { + + $scope.reportImage = "
" + $("#emailComment").val() + "

Report Result:


" + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text() + "Performance Report" + $("#submitResultHtml .panel-heading .row div:nth-child(3)").text() + "
Total QuestionCorrect AnswersIncorrect Answers
" + $("#questionStatus tbody tr td:nth-child(1)").text() + "" + $("#questionStatus tbody tr td:nth-child(2)").text() + "" + $("#questionStatus tbody tr td:nth-child(3)").text() + "


" + reportHtml + ""; + } + $scope.reportTitle = "Lab Exercise Report for " + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text(); $scope.senderEmails = $("#emailTo").val(); @@ -1359,7 +1370,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, } ) // for closing email popup - $rootScope.closeLabExEmailModel(); + $rootScope.closeLabExEmailModel(); + + document.getElementById('labExEmailSentModalID').style.display = "block"; + document.getElementById('labExModalbackground').style.display = "block"; } $rootScope.closeLabExEmailModel = function () { document.getElementById("LabExerciseForm").reset(); @@ -1369,6 +1383,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, document.getElementById('labExModalbackground').style.display = "none"; document.getElementById('labExModalID').style.display = "none"; $scope.reportCopyStatus = false; + } $rootScope.sendMail = function () { window.scrollTo(0, 0); @@ -1376,7 +1391,11 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, document.getElementById('labExModalbackground').style.display = "block"; document.getElementById('labExModalID').style.display = "block"; } + $rootScope.emailNotification = function () { + document.getElementById('labExEmailSentModalID').style.display = "none"; + 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 2106c46..8df2ba9 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 @@ -82,7 +82,7 @@
- +
255 character limit
@@ -108,7 +108,43 @@ + + + + + @@ -116,144 +152,144 @@ -
-
-

LAB Ex ...

- +
+
+

LAB Ex ...

+ +
-
-
+
-
-
-
-
-
- {{activityTitle}} -
-
{{Title}}
-
- Question {{quiznumber}} of {{TotalNumberofQuiz}} -
-
-
-
-
-
+
+
+
+
+
+ {{activityTitle}} +
+
{{Title}}
+
+ Question {{quiznumber}} of {{TotalNumberofQuiz}}
-
-
- -
-
-
- -
- -
{{optionbox.Answervalue}}
-
{{ans.Value}}
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
{{optionbox.Answervalue}}
+
{{ans.Value}}
+
-
- -
{{option.OptionTitle}}
+
+ +
{{option.OptionTitle}}
+
-
- -
- -