diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeDocuments/ModalUploadDocument.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeDocuments/ModalUploadDocument.cshtml index d2b6005b..889102ae 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeDocuments/ModalUploadDocument.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeDocuments/ModalUploadDocument.cshtml @@ -80,7 +80,7 @@
- + @@ -134,7 +134,7 @@
- + @@ -186,7 +186,7 @@
- + @@ -238,7 +238,7 @@
- + @@ -291,7 +291,7 @@
- + @@ -344,7 +344,7 @@
- + @@ -396,7 +396,7 @@
- + @@ -448,7 +448,7 @@
- + @@ -503,6 +503,9 @@ var saveSubmitAjax = `@Url.Page("./EmployeesDocuments", "SaveSubmit")`; var deleteFileAjaxUrl = `@Url.Page("./EmployeesDocuments", "RemoveEmployeeDocumentByLabel")`; var cancelOperationUrl = `@Url.Page("./EmployeesDocuments", "CancelOperation")`; + + var loadModalEmployeeEdit = `@Url.Page("./EmployeesDocuments", "EditEmployeeModal")`; + var employeeId = Number(@Model.EmployeeId); var workshopId = Number(@Model.WorkshopId); var UploadedCount = Number(@Model.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(y => y.PropertyType == typeof(EmployeeDocumentItemViewModel)).Select(y => y.GetValue(@Model) as EmployeeDocumentItemViewModel).Count(x=>x.Status == DocumentStatus.Unsubmitted && !string.IsNullOrWhiteSpace(x.PicturePath))); diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeLeftWork/LeftWork.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeLeftWork/LeftWork.cshtml index 0e1f2794..1a2d7105 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeLeftWork/LeftWork.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeLeftWork/LeftWork.cshtml @@ -34,6 +34,10 @@ .dadmehr-select-search .line { width: 0; } + + .border-red { + border: 3px solid red !important; + } } @@ -168,11 +172,11 @@ *@ - + @Model.LeftWorkTemp.LastDayStanding - + @Model.LeftWorkTemp.LeftWork diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeNew/StartWork.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeNew/StartWork.cshtml index c414ce65..794d1e9a 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeNew/StartWork.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeNew/StartWork.cshtml @@ -34,6 +34,10 @@ .dadmehr-select-search .line { width: 0; } + + .border-red { + border: 3px solid red !important; + } } @@ -155,7 +159,7 @@ 1 - + @Model.LeftWorkTemp.StartWork diff --git a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/EmployeesDocuments.js b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/EmployeesDocuments.js index 5c4ba987..b4f1b907 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/EmployeesDocuments.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/EmployeesDocuments.js @@ -138,12 +138,12 @@ async function loadWorkshopsWithDocumentsAwaitingUpload() {
-
+
${item.workshopName}
-
+
${item.employerName}
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js index e91b06aa..c4cffbab 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js @@ -86,7 +86,7 @@ $("#btnEditSaveEmployee").on('click', function () { return false; } - if (militaryService === "" && gender == "مرد") { + if (militaryService === "" && gender === "مرد") { validateField("#militaryStatus", "لطفا وضعیت نظام وظیفه را مشخص کنید."); return false; } @@ -113,6 +113,8 @@ $("#btnEditSaveEmployee").on('click', function () { $('.alert-success-msg').hide(); $('.alert-success-msg p').text(''); }, 2000); + + $(`.btnSendToChecker[data-index="${getIndexForEmployeeEdit}"]`).removeClass("disable"); loading.hide(); $('#customModal').removeClass('show'); diff --git a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalUploadDocument.js b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalUploadDocument.js index 6b0fbbd1..5d7dac46 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalUploadDocument.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalUploadDocument.js @@ -16,6 +16,7 @@ var confirmIcon = `رد شده
`; var rejectIcon = ``; +var getIndexForEmployeeEdit; $(document).ready(function () { @@ -68,7 +69,6 @@ $(document).ready(function () { $(this).find(".resultMessage").html(rejectMessage); $(this).find(".btnEditEmployee").removeClass("disable"); - $(this).find(".btnSendToChecker").removeClass("disable"); } }); @@ -158,7 +158,6 @@ $(document).ready(function () { const pdBox = $(this).closest('.pdBox'); const img = pdBox.find('.preview-image'); var deleteButton = pdBox.find('.btnDeletingPD'); - deleteButton.removeClass('disable'); if (fileInputFile) { const fileName = fileInputFile.name.toLowerCase(); @@ -255,6 +254,12 @@ $(document).ready(function () { } else { showAlertMessage('.alert-msg', 'فرمت فایل باید یکی از موارد jpeg, jpg, png یا pdf باشد.', 3500); + return; + } + + deleteButton.removeClass('disable'); + if (pdBox.find('button.Rejected').length > 0) { + pdBox.find(".btnSendToChecker").removeClass("disable"); } } }); @@ -379,6 +384,11 @@ $(document).ready(function () { }); }); + $(document).off('click', '.btnEditEmployee').on('click', '.btnEditEmployee', function (event) { + getIndexForEmployeeEdit = $(this).data('index'); + LoadCustomPartial(loadModalEmployeeEdit + `&employeeId=${employeeId}&workshopId=${workshopId}`); + }); + $(".exitModal").click(function () { if (uploadFileCount > 0) { swal.fire({ @@ -848,4 +858,4 @@ function canDeleteRecord() { let uploadedOrPending = statusCounter.confirmed + statusCounter.pending; return uploadedOrPending < totalRequired; -} \ No newline at end of file +} diff --git a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeLeftWork/LeftWork.js b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeLeftWork/LeftWork.js index 0d3b74c9..bf5a53c6 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeLeftWork/LeftWork.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeLeftWork/LeftWork.js @@ -105,6 +105,7 @@ function enableEdit() { } $("#save").on('click', function () { + $('td').removeClass('border-red'); $('#LastDayStandingInput').prop('disabled', true); $('#LeftWorkInput').prop('disabled', true); $('#save').addClass('disable'); diff --git a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeNew/StartWork.js b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeNew/StartWork.js index a533e0f5..27a0d279 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeNew/StartWork.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/_ModalEmployeeNew/StartWork.js @@ -43,7 +43,8 @@ function enableEdit() { $('#btnSaveData').addClass('disable'); } -$("#save").on('click', function() { +$("#save").on('click', function () { + $('td').removeClass('border-red'); $('#StartWorkInput').prop('disabled', true); $('#save').addClass('disable'); $('#btnSaveData').removeClass('disable');