employee document part 3

ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/_ModalEmployeeDocuments/ModalUploadDocument.cshtml

@@ -80,7 +80,7 @@
 	<div class="pdButtons">
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="0">آپلود عکس</button>
 
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="0">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="0">ارسال به ناظر</button>
 	                    
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.EmployeePicture.PicturePath) ? Model.EmployeePicture.Status.ToString() : "") @(string.IsNullOrWhiteSpace(Model.EmployeePicture.PicturePath) ? "disable" : "")" data-index="0">حذف</button>
@@ -134,7 +134,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="1">آپلود عکس</button>
 
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="1">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="1">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.NationalCardFront.PicturePath) ? Model.NationalCardFront.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.NationalCardFront?.PicturePath) ? "" : "disable")" data-index="1">حذف</button>
@@ -186,7 +186,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="2">آپلود عکس</button>
                         
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="2">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="2">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.NationalCardRear.PicturePath) ? Model.NationalCardRear.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.NationalCardRear.PicturePath) ? "" : "disable")" data-index="2">حذف</button>
@@ -238,7 +238,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="3">آپلود عکس</button>
                         
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="3">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="3">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(Model.Gender == "مرد" && !string.IsNullOrWhiteSpace(Model.MilitaryServiceCard.PicturePath)? Model.MilitaryServiceCard.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.MilitaryServiceCard.PicturePath) ? "" : "disable")" data-index="3">حذف</button>
@@ -291,7 +291,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="4">آپلود عکس</button>
                         
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="4">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="4">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.IdCardPage1.PicturePath) ? Model.IdCardPage1.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.IdCardPage1.PicturePath) ? "" : "disable")" data-index="4">حذف</button>
@@ -344,7 +344,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="5">آپلود عکس</button>
 	                    
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="5">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="5">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.IdCardPage2.PicturePath) ? Model.IdCardPage2.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.IdCardPage2.PicturePath) ? "" : "disable")" data-index="5">حذف</button>
@@ -396,7 +396,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="6">آپلود عکس</button>
                         
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="6">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="6">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.IdCardPage3.PicturePath) ? Model.IdCardPage3.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.IdCardPage3.PicturePath) ? "" : "disable")" data-index="6">حذف</button>
@@ -448,7 +448,7 @@
 	<div>
 		<button type="button" class="btnUploadingPD d-block mb-1" data-index="7">آپلود عکس</button>
 	                    
-		<button type="button" class="btnEditEmployee d-block mb-1 disable" onclick="LoadCustomPartial('@Url.Page("./EmployeesDocuments", "EditEmployeeModal", new { employeeId = Model.EmployeeId, workshopId = Model.WorkshopId})')">ویرایش پرسنل</button>
+		<button type="button" class="btnEditEmployee d-block mb-1 disable" data-index="7">ویرایش پرسنل</button>
 		<button type="button" class="btnSendToChecker d-block mb-1 disable" data-index="7">ارسال به ناظر</button>
 
 		<button type="button" class="btnDeletingPD d-block @(!string.IsNullOrWhiteSpace(Model.IdCardPage4.PicturePath) ? Model.IdCardPage4.Status.ToString():"") @(!string.IsNullOrWhiteSpace(Model.IdCardPage4.PicturePath) ? "" : "disable")" data-index="7">حذف</button>
@@ -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)));

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;
+		}
 	</style>
 }
 
@@ -168,11 +172,11 @@
 													<a onclick="deleteDate(this, '', 0, 'first')" href="#" class="edit-date permission-removeDatefirst-edit"><i style="color: red;" class="ion-close-circled"></i></a>
 													<button onclick="enableEdit()" type="button" class="edit-icon permission-editDate"><i class="fa fa-edit"></i></button>
 												</td> *@
-												<td>
+												<td class="border-red">
 													<span id="LastDayStandingTempSpan">@Model.LeftWorkTemp.LastDayStanding</span>
 													<input type="hidden" id="LastDayStandingValue" name="Command.LastDayStanding" value="@Model.LeftWorkTemp.LastDayStanding" />
 												</td>
-												<td>
+												<td class="border-red">
 													<span id="LeftWorkTempSpan">@Model.LeftWorkTemp.LeftWork</span>
 													<input type="hidden" id="LeftWorkTempValue" name="Command.LeftWorkTime" value="@Model.LeftWorkTemp.LeftWork" />
 												</td>

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;
+		}
 	</style>
 }
 
@@ -155,7 +159,7 @@
 											<tbody>
 												<tr data-id="1">
 													<td>1</td>
-													<td>
+													<td class="border-red">
 														<span id="StartWorkTemp">@Model.LeftWorkTemp.StartWork</span>
 														<input type="hidden" id="StartWorkTempValue" name="Command.StartDateTime" value="@Model.LeftWorkTemp.StartWork" />
 													</td>

ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/EmployeesDocuments.js

@@ -138,12 +138,12 @@ async function loadWorkshopsWithDocumentsAwaitingUpload() {
 							<div class="col-8 col-md-8 text-center d-flex">
 							    <div class="row w-100">
                                     <div class="col-12 col-md-5 text-center">
-                                        <div class="Rtable-cell column-heading text-start text-md-end justify-content-start justify-content-md-end my-0">
+                                        <div class="Rtable-cell column-heading justify-content-start my-0">
                                             <span>${item.workshopName}</span>
                                         </div>
                                     </div>
                                     <div class="col-11 col-md-5 text-start pe-0">
-                                        <div class="Rtable-cell column-heading text-start text-md-center justify-content-start justify-content-md-center my-0 ">
+                                        <div class="Rtable-cell column-heading justify-content-start my-0">
                                             <span>${item.employerName}</span>
                                         </div>
                                     </div>

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');

ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalUploadDocument.js

@@ -16,6 +16,7 @@ var confirmIcon = `<svg width="24" height="24" viewBox="0 0 14 14" fill="none" x
 var rejectMessage = `<div class="rejectMessage">رد شده</div>`;
 var rejectIcon = `<svg width="24" height="24" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="7" cy="7" r="5.25" fill="#FF5D5D"/><path d="M9.33341 4.66602L4.66675 9.33268" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.66659 4.66602L9.33325 9.33268" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
 
+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;
-}
+}

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');

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');