From 6d6ce93f74e368f597c0c3620f890977a3d5874c Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Tue, 5 Aug 2025 14:25:32 +0330
Subject: [PATCH] some changes

---
 .../Repository/RollCallEmployeeRepository.cs  |  2 +-
 .../_Partials/WorkshopSettingGrouping.cshtml  |  5 +++-
 .../Pages/Shared/_headerAndFooter.cshtml      |  8 +++---
 .../pages/Employees/js/CreateEmployeeModal.js | 25 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
index fd08b054..7e027a38 100644
--- a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
@@ -237,7 +237,7 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
 
 
 
-        var list = firstlist.OrderByDescending(x => x.CreatedByClient).ThenByDescending(x => x.IsActiveString == "true" ? 1 : 0)
+        var list = firstlist.OrderByDescending(x => x.CreatedByClient).ThenByDescending(x => x.IsActiveString == "true" ? 0 : 1)
             .ThenByDescending(x => x.HasUploadedImage == "true" ? 1 : 0)
             .Skip(command.PageIndex).Take(30).ToList();
         var watch = new Stopwatch();
diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml
index 430828d3..4496561f 100644
--- a/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml
@@ -5,7 +5,10 @@
     string clientVersion = _0_Framework.Application.Version.StyleVersion;
     <link href="~/AssetsClient/css/select2.css?ver=@clientVersion" rel="stylesheet" />
 }
-
+<div class="d-flex align-items-center justify-content-right mt-3 mb-1">
+<input id="WithoutRollCall" type="checkbox" title="گروهبندی و آپلود عکس حضورغیاب بعدا انجام شود" class="form-check-input"/>
+<label for="WithoutRollCall" style="font-size: small">گروهبندی و آپلود عکس حضورغیاب بعدا انجام شود</label>
+</div>
 <div class="errorSelection">
 	<select class="form-select select2Option" aria-label="انتخاب ..." id="workshopSettingSelect">
 	</select>
diff --git a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml
index d6818dfd..c9332f6a 100644
--- a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml
@@ -130,7 +130,8 @@
 			onmouseout="this.style.filter='brightness(1)'"
 		>
 			<span style="animation: bounce 1s infinite;">
-				<img src="https://api.iconify.design/hugeicons/alert-circle.svg?color=white" width="28" height="28" alt="icon" />
+				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--hugeicons" width="28" height="28" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><circle cx="12" cy="12" r="10"></circle><path d="M11.992 15h.009M12 12V8"></path></g>
+				</svg>
 			</span>
 			<span style="font-size: 0.75rem; white-space: nowrap;">
 				مبلغ قابل پرداخت: @debtAmount.ToMoney() ریال
@@ -320,9 +321,8 @@
 					onmouseover="this.style.filter='brightness(1.1)'"
 					onmouseout="this.style.filter='brightness(1)'">
 					<span style="animation: bounce 1s infinite;">
-						<img src="https://api.iconify.design/hugeicons/alert-circle.svg?color=white" width="28"
-						     height="28"
-						     alt="icon"/>
+						<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--hugeicons" width="28" height="28" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><circle cx="12" cy="12" r="10"></circle><path d="M11.992 15h.009M12 12V8"></path></g>
+							</svg>
 					</span>
 					<span style="font-size: 0.75rem; white-space: nowrap;">
 						مبلغ قابل پرداخت: @debtAmount.ToMoney() ریال
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeModal.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeModal.js
index 823a7130..10a62664 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeModal.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeModal.js
@@ -1,5 +1,18 @@
 var currentUrl = window.location.href;
 $(document).ready(function () {
+	$('#WithoutRollCall').on('change', function () {
+		var workshopSetting=$('#workshopSettingSelect');
+		var SelectList=$('.errorSelection');
+		if ($(this).is(':checked')) {
+			workshopSetting.val('0').trigger('change');;
+			workshopSetting.prop('disabled', true);
+			SelectList.addClass('disable');
+		} else {
+			workshopSetting.prop('disabled', false);
+			SelectList.removeClass('disable');
+
+		}
+	});
 
     if (currentUrl.includes("/Client#showmodal=/Client/Company/Employees/EmployeeList?handler=CreateEmployee")) {
         $(".modal-xxl").css('max-width', '550px');
@@ -197,7 +210,12 @@ $(document).ready(function () {
         }
 
 		next() {
-            var inputsDateTime = $('.dateTime');
+			if($('#WithoutRollCall').is(':checked')){
+				this.modal.setState(this.modal.step5);
+				return;
+			}
+
+			var inputsDateTime = $('.dateTime');
 			var inputsDateTimeRs = $('.dateTimeRS');
 			var inputsDateTimeIrregular = $('.dateTimeIrregular');
 			var allowToNextStep3 = true;
@@ -320,7 +338,12 @@ $(document).ready(function () {
 		}
 
 		prev() {
+			if ($('#WithoutRollCall').is(':checked')){
+				this.modal.setState(this.modal.step3);
+			}else{
 			this.modal.setState(this.modal.step4);
+				
+			}
 		}
 	}