Skip to content

Commit 77bde47

Browse files
committed
Fixing the sum of breaks.
1 parent a1b3106 commit 77bde47

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
245245
Pause3Id = planRegistration.Pause3Id,
246246
Pause4Id = planRegistration.Pause4Id,
247247
Pause5Id = planRegistration.Pause5Id,
248-
PauseMinutes = planRegistration.Pause1Id * 5 + planRegistration.Pause2Id * 5,
248+
PauseMinutes = planRegistration.Pause1Id > 0 ? planRegistration.Pause1Id * 5 - 5 + planRegistration.Pause2Id > 0 ? planRegistration.Pause2Id * 5 - 5 : 0 : planRegistration.Pause2Id > 0 ? planRegistration.Pause2Id * 5 - 5 : 0,
249249
CommentOffice = planRegistration.CommentOffice,
250250
WorkerComment = planRegistration.WorkerComment,
251251
SumFlexStart = planRegistration.SumFlexStart,
@@ -661,7 +661,6 @@ await dbContext.PlanRegistrations.AsNoTracking()
661661
}
662662
}
663663

664-
665664
public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserNam(
666665
TimePlanningPlanningRequestModel model)
667666
{
@@ -857,7 +856,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
857856
Pause3Id = planRegistration.Pause3Id,
858857
Pause4Id = planRegistration.Pause4Id,
859858
Pause5Id = planRegistration.Pause5Id,
860-
PauseMinutes = planRegistration.Pause1Id * 5 + planRegistration.Pause2Id * 5,
859+
PauseMinutes = planRegistration.Pause1Id > 0 ? planRegistration.Pause1Id * 5 - 5 + planRegistration.Pause2Id > 0 ? planRegistration.Pause2Id * 5 - 5 : 0 : planRegistration.Pause2Id > 0 ? planRegistration.Pause2Id * 5 - 5 : 0,
861860
CommentOffice = planRegistration.CommentOffice,
862861
WorkerComment = planRegistration.WorkerComment,
863862
SumFlexStart = planRegistration.SumFlexStart,

0 commit comments

Comments
 (0)