Commit d1ae77aa015b48205591759c3738f59afe709e16
1 parent
e975bbe5
merged emailValidationCheck into develop
Showing
3 changed files
with
173 additions
and
51 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -822,7 +822,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
822 | 822 | |
823 | 823 | $rootScope.LogoutUser = function () { |
824 | 824 | localStorage.removeItem('loggedInUserDetails'); |
825 | - // localStorage.clear(); | |
825 | + localStorage.clear(); | |
826 | 826 | document.location = '/'; |
827 | 827 | $rootScope.isVisibleLogin = true; |
828 | 828 | } | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
... | ... | @@ -193,10 +193,11 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
193 | 193 | } |
194 | 194 | }); |
195 | 195 | $timeout(function () { |
196 | + | |
196 | 197 | if ($scope.SavedLabExercise != undefined && $scope.SavedLabExercise.lastQuestion > 0) { |
197 | 198 | if ($scope.isResetClicked != true) { |
198 | 199 | $scope.ShowSavedLabExercise(); |
199 | - | |
200 | + | |
200 | 201 | } |
201 | 202 | else { |
202 | 203 | $rootScope.isLoading = false; |
... | ... | @@ -204,10 +205,22 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
204 | 205 | $scope.isResetClicked = false; |
205 | 206 | } |
206 | 207 | } |
208 | + //else if ($scope.LabExerciseUserData != undefined && $scope.LabExerciseUserData.length > 0) { | |
209 | + // if ($scope.isResetClicked != true) { | |
210 | + // $scope.ShowSavedLabExercise(); | |
211 | + | |
212 | + // } | |
213 | + // else { | |
214 | + // $rootScope.isLoading = false; | |
215 | + // $('#spinner').css('visibility', 'hidden'); | |
216 | + // $scope.isResetClicked = false; | |
217 | + // } | |
218 | + //} | |
207 | 219 | else { |
208 | 220 | $rootScope.isLoading = false; |
209 | 221 | $('#spinner').css('visibility', 'hidden'); |
210 | 222 | } |
223 | + | |
211 | 224 | }, 100); |
212 | 225 | |
213 | 226 | |
... | ... | @@ -1122,6 +1135,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
1122 | 1135 | $scope.correctResponseForSavingDatabase = $scope.correctResponseForSavingDatabase.replace(/,$/, ''); |
1123 | 1136 | } |
1124 | 1137 | |
1138 | + | |
1125 | 1139 | |
1126 | 1140 | $scope.getDragItems = function () { |
1127 | 1141 | var OptionBoxes = $("div[id*='block-']"); |
... | ... | @@ -1329,61 +1343,133 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
1329 | 1343 | } |
1330 | 1344 | $scope.reportCopyStatus = false; |
1331 | 1345 | $scope.SendLabEXMailToUser = function (User) { |
1346 | + | |
1332 | 1347 | |
1333 | - var reportHtml = ''; | |
1334 | - | |
1335 | - 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>'; | |
1336 | - $("#resultLabData tr").each(function () { | |
1337 | - reportHtml += '<tr>'; | |
1338 | - $(this).children("td").each(function () { | |
1339 | - if ($(this).text() == " Review") { | |
1340 | - } | |
1341 | - else{ | |
1342 | - reportHtml += '<td style="border:1px solid #cccccc;padding:15px;">' + $(this).text() + '</td>'; | |
1343 | - } | |
1344 | - }); | |
1345 | - reportHtml += '</tr>'; | |
1348 | + // email validation code | |
1349 | + | |
1350 | + var senderEmails = $("#emailTo").val().split(", "); | |
1351 | + $scope.isSenderEmailValid = false; | |
1352 | + for (var i = 0; i <= senderEmails.length - 1; i++) { | |
1353 | + | |
1354 | + var sEmail = senderEmails[i]; | |
1355 | + if ($.trim(sEmail).length == 0) { | |
1356 | + //alert('*Email To email address is empty'); | |
1357 | + $scope.isSenderEmailValid = false; | |
1358 | + // event.preventDefault(); | |
1359 | + $("#alertPopUp").css("display", "block"); | |
1360 | + $("#messageBody").text("Email Address address is empty"); | |
1361 | + return false; | |
1362 | + } | |
1363 | + if ($scope.validateEmail(sEmail)) { | |
1364 | + $scope.isSenderEmailValid = true; | |
1365 | + } | |
1366 | + else { | |
1367 | + // alert('*Email To email is not valid'); | |
1368 | + $scope.isSenderEmailValid = false; | |
1369 | + $("#alertPopUp").css("display", "block"); | |
1370 | + $("#messageBody").text("Email Address is not valid"); | |
1371 | + // event.preventDefault(); | |
1372 | + return false; | |
1373 | + } | |
1374 | + } | |
1375 | + | |
1376 | + | |
1377 | + $scope.isReceiverEmailValid = false; | |
1378 | + var receiverEmail = $("#userEmailID").val(); | |
1379 | + var rEmail = receiverEmail; | |
1380 | + if ($.trim(rEmail).length == 0) { | |
1381 | + $scope.isReceiverEmailValid = false; | |
1382 | + $("#alertPopUp").css("display", "block"); | |
1383 | + $("#messageBody").text("Your Email Address is empty"); | |
1384 | + return false; | |
1385 | + } | |
1386 | + if ($scope.validateEmail(rEmail)) { | |
1387 | + $scope.isReceiverEmailValid = true; | |
1388 | + } | |
1389 | + else { | |
1390 | + $scope.isReceiverEmailValid = false; | |
1391 | + $("#alertPopUp").css("display", "block"); | |
1392 | + $("#messageBody").text("Your Email Address is not valid"); | |
1393 | + return false; | |
1394 | + } | |
1395 | + | |
1396 | + // email validation code ends | |
1397 | + | |
1398 | + | |
1399 | + if ($scope.isSenderEmailValid == true && $scope.isReceiverEmailValid == true) { | |
1400 | + | |
1401 | + var reportHtml = ''; | |
1346 | 1402 | |
1403 | + 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>'; | |
1404 | + $("#resultLabData tr").each(function () { | |
1405 | + reportHtml += '<tr>'; | |
1406 | + $(this).children("td").each(function () { | |
1407 | + if ($(this).text() == " Review") { | |
1408 | + } | |
1409 | + else { | |
1410 | + reportHtml += '<td style="border:1px solid #cccccc;padding:15px;">' + $(this).text() + '</td>'; | |
1411 | + } | |
1347 | 1412 | }); |
1348 | - reportHtml += '</tbody></table>'; | |
1349 | - | |
1350 | - //if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") { | |
1351 | - | |
1352 | - // $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 + ""; | |
1353 | - //} | |
1354 | - //else { | |
1355 | - | |
1356 | - // $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 + ""; | |
1357 | - //} | |
1358 | - | |
1359 | - if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") { | |
1413 | + reportHtml += '</tr>'; | |
1360 | 1414 | |
1361 | - $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 + ""; | |
1362 | - } | |
1363 | - else { | |
1415 | + }); | |
1416 | + reportHtml += '</tbody></table>'; | |
1364 | 1417 | |
1365 | - $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 + ""; | |
1366 | - } | |
1418 | + //if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") { | |
1367 | 1419 | |
1368 | - $scope.reportTitle = "Lab Exercise Report for " + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text(); | |
1369 | - $scope.receiverEmails = $("#emailTo").val(); | |
1370 | - | |
1371 | - | |
1372 | - LabExerciseService.LabExerciseReport(User, $scope.reportImage, $scope.reportTitle, $scope.reportCopyStatus, $scope.receiverEmails).then( | |
1420 | + // $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 + ""; | |
1421 | + //} | |
1422 | + //else { | |
1373 | 1423 | |
1374 | - function (result) { | |
1375 | - console.log(result); | |
1376 | - }, | |
1377 | - function (error) { | |
1378 | - console.log(error.statusText); | |
1424 | + // $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 + ""; | |
1425 | + //} | |
1426 | + | |
1427 | + if ($("#emailComment").val() == undefined || $("#emailComment").val() == "") { | |
1428 | + | |
1429 | + $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 + ""; | |
1430 | + } | |
1431 | + else { | |
1432 | + | |
1433 | + $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;word-wrap:break-word;'>" + $("#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 + ""; | |
1434 | + } | |
1435 | + | |
1436 | + $scope.reportTitle = "Lab Exercise Report for " + $("#submitResultHtml .panel-heading .row div:nth-child(1)").text(); | |
1437 | + $scope.receiverEmails = $("#emailTo").val(); | |
1438 | + | |
1439 | + | |
1440 | + LabExerciseService.LabExerciseReport(User, $scope.reportImage, $scope.reportTitle, $scope.reportCopyStatus, $scope.receiverEmails).then( | |
1441 | + | |
1442 | + function (result) { | |
1443 | + console.log(result); | |
1444 | + }, | |
1445 | + function (error) { | |
1446 | + console.log(error.statusText); | |
1447 | + } | |
1448 | +) | |
1449 | + // for closing email popup | |
1450 | + $rootScope.closeLabExEmailModel(); | |
1451 | + | |
1452 | + document.getElementById('labExEmailSentModalID').style.display = "block"; | |
1453 | + document.getElementById('labExModalbackground').style.display = "block"; | |
1454 | + | |
1455 | + | |
1456 | + | |
1457 | + | |
1458 | + } | |
1459 | + | |
1460 | + } | |
1461 | + | |
1462 | + $scope.validateEmail = function (sEmail) { | |
1463 | + 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})(\]?)$/; | |
1464 | + if (filter.test(sEmail)) { | |
1465 | + return true; | |
1466 | + } | |
1467 | + else { | |
1468 | + return false; | |
1379 | 1469 | } |
1380 | - ) | |
1381 | - // for closing email popup | |
1382 | - $rootScope.closeLabExEmailModel(); | |
1383 | - | |
1384 | - document.getElementById('labExEmailSentModalID').style.display = "block"; | |
1385 | - document.getElementById('labExModalbackground').style.display = "block"; | |
1386 | 1470 | } |
1471 | + | |
1472 | + | |
1387 | 1473 | $rootScope.closeLabExEmailModel = function () { |
1388 | 1474 | document.getElementById("LabExerciseForm").reset(); |
1389 | 1475 | $scope.LabExForm.$setPristine(); |
... | ... | @@ -1405,6 +1491,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
1405 | 1491 | document.getElementById('labExModalbackground').style.display = "none"; |
1406 | 1492 | |
1407 | 1493 | } |
1494 | + | |
1495 | + | |
1496 | + | |
1497 | + | |
1408 | 1498 | }] |
1409 | 1499 | |
1410 | 1500 | ); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
1 | 1 | <!--Body--> |
2 | 2 | <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js"></script> |
3 | +<script> | |
4 | + function labExModalClose() | |
5 | + { | |
6 | + $("#alertPopUp").css("display", "none"); | |
7 | + } | |
8 | +</script> | |
3 | 9 | <div class="bodyWrap row" ng-controller="LabExercController"> |
4 | 10 | |
5 | 11 | <div class="" ng-init="InitializeLabExercise()"> |
... | ... | @@ -38,10 +44,13 @@ |
38 | 44 | |
39 | 45 | <div class="col-sm-7"> |
40 | 46 | <!--<input type="email" class="form-control" name="senderEmail" ng-model="User.EmailTo" required="required" />--> |
41 | - <input type="email" name="usremail" class="form-control" required="required" id="emailTo" multiple /> | |
47 | + | |
48 | + <input type="text" name="usremail" class="form-control" id="emailTo" multiple /> | |
42 | 49 | <div class="help-block">*Use ',' to separate multiple email ids. </div> |
50 | + | |
43 | 51 | <!--<div class="help-block" style="color:red;" ng-if="LabExForm.senderEmail.$error.pattern">Please Enter valid Email Address</div>--> |
44 | - </div> | |
52 | + | |
53 | + </div> | |
45 | 54 | </div> |
46 | 55 | |
47 | 56 | <div class="form-group"> |
... | ... | @@ -61,7 +70,7 @@ |
61 | 70 | </div> |
62 | 71 | <div class="col-sm-7"> |
63 | 72 | <!--<input type="text" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" ng-pattern="/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/" required="required" />--> |
64 | - <input type="email" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" required="required" /> | |
73 | + <input type="text" class="form-control" name="receiverEmail" ng-model="User.EmailAdd" id="userEmailID" /> | |
65 | 74 | |
66 | 75 | <!--<div class="help-block" style="color:red;" id="emailHelpBlock"> Please Enter your Email Address </div>--> |
67 | 76 | <!--<div class="help-block" style="color:red;" ng-if="LabExForm.receiverEmail.$error.pattern"> Please Enter valid Email Address</div>--> |
... | ... | @@ -108,6 +117,29 @@ |
108 | 117 | </div> |
109 | 118 | |
110 | 119 | |
120 | + | |
121 | + <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;"> | |
122 | + <div class="modal-content"> | |
123 | + <div class="modal-header"> | |
124 | + <!--<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>--> | |
125 | + <h4 class="modal-title">Error</h4> | |
126 | + </div> | |
127 | + <div class="modal-body "> | |
128 | + <div class="modal-body" id="messageBody" style="padding:10px;font-size:15px;"> | |
129 | + | |
130 | + </div> | |
131 | + </div> | |
132 | + <div class="modal-footer"> | |
133 | + <button type="button" class="btn btn-primary" onclick="labExModalClose()">Close</button> | |
134 | + | |
135 | + </div> | |
136 | + </div> | |
137 | + </div> | |
138 | + | |
139 | + | |
140 | + | |
141 | + | |
142 | + | |
111 | 143 | |
112 | 144 | <!-- Modal --> |
113 | 145 | <!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> | ... | ... |