From 14fbf309a78f2082b73e68828291d7a274b7f175 Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Tue, 17 Jun 2025 15:06:18 +0330
Subject: [PATCH 1/2] checkout bug fixed

---
 .../Repository/RollCallMandatoryRepository.cs                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
index 75e98903..1a6e7171 100644
--- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
@@ -1722,7 +1722,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 					EndDate = endComplex,
 					ShiftSpan = (endComplex - startComplex),
 					ShiftDate = currentDateGr,
-				});
+					ShiftEndWithoutRest = endComplex
+                });
 
 
 				var endCal = end - start;

From c80a5dbab75270825bdd8d90858f766632038a67 Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Tue, 17 Jun 2025 20:45:28 +0330
Subject: [PATCH 2/2] RotatingShift Joopiter Exeption - Absence change

---
 .../Repository/RollCallMandatoryRepository.cs             | 2 +-
 .../Repository/YearlySalaryRepository.cs                  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
index 1a6e7171..873f14a9 100644
--- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
@@ -676,7 +676,7 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
                 break;
         }
         var rotatingFaResult = "";
-        if (countOutOfRange >= validCount)
+        if (countOutOfRange >= validCount && workshopId != 344)
         {
             shiftOver22Hours = "0";
             shiftOver22Minuts = "0";
diff --git a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs
index 5b9d52aa..5d90620f 100644
--- a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs
+++ b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs
@@ -2739,6 +2739,9 @@ public class YearlySalaryRepository : RepositoryBase<long, YearlySalary>, IYearl
 				else
 				{
 					periodOfAbsence = usedLeaves - canToLeave;
+                    if (workingHoursePerDay >= 7.33)
+                        periodOfAbsence = 0;
+
 
 					#region AbsenceItemsCompute
 
@@ -3314,9 +3317,10 @@ public class YearlySalaryRepository : RepositoryBase<long, YearlySalary>, IYearl
 
 				periodOfAbsence = usedLeaves;
 
-				#endregion
 
-				contactCanToleaveList.Add(new ContractsCanToLeave()
+                #endregion
+
+                contactCanToleaveList.Add(new ContractsCanToLeave()
 				{
 					ContractCounter = contractCounter,
 					WorkingPerDayHourses = workingHoursePerDay,