Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir

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";
@@ -1722,7 +1722,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 					EndDate = endComplex,
 					ShiftSpan = (endComplex - startComplex),
 					ShiftDate = currentDateGr,
-				});
+					ShiftEndWithoutRest = endComplex
+                });
 
 
 				var endCal = end - start;

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,