Merge pull request #166 from educorvi/develop

neferin12 · web-flow · commit cb20f8526074 · 2024-09-06T15:51:49.000+02:00
fix: vacation day calculation
diff --git a/server/src/vacationDayCalculation.ts b/server/src/vacationDayCalculation.ts
@@ -22,9 +22,10 @@ async function getTotalVacationDays(user: User) {
 
         const contractDuration = (nextContractStartYear - contract.startYear) * 12 + nextContractStartMonth - contract.startMonth;
 
-        vacationDays += Math.ceil(contract.vacationDays * contractDuration / 12);
+        vacationDays += contract.vacationDays * contractDuration / 12
     }
 
+    vacationDays = Math.ceil(vacationDays);
     return vacationDays;
 
 }

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,10 @@ async function getTotalVacationDays(user: User) {`
`22`	`22`
`23`	`23`	`const contractDuration = (nextContractStartYear - contract.startYear) * 12 + nextContractStartMonth - contract.startMonth;`
`24`	`24`
`25`		`- vacationDays += Math.ceil(contract.vacationDays * contractDuration / 12);`
	`25`	`+ vacationDays += contract.vacationDays * contractDuration / 12`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ vacationDays = Math.ceil(vacationDays);`
`28`	`29`	`return vacationDays;`
`29`	`30`
`30`	`31`	`}`