louis/targo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of git.targo.ca:Targo/targo_backend

Browse Source
This commit is contained in:
Matthieu Haineault 2026-03-16 09:53:37 -04:00
commit 8c8a2a442d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -56,9 +56,8 @@ pids
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
# Generated prisma folders (from -> npm run prisma:generated) # Generated prisma folders (from -> npm run prisma:generated)
/generated/prisma prisma/mariadb/generated/prisma/client/mariadb/
/prisma/mariadb/generated/ prisma/postgres/generated/prisma/client/postgres/
/prisma/postgres/generated/ prisma/prisma-legacy/generated/prisma/client/legacy/
/prisma/prisma-legacy/generated/
!swagger-spec.json !swagger-spec.json

4
src/time-and-attendance/timesheets/timesheet.mapper.ts
View File

@ -93,8 +93,8 @@ export const mapOneTimesheet = (
daily_expenses.mileage += Number(expense.mileage); daily_expenses.mileage += Number(expense.mileage);
weekly_expenses.mileage += Number(expense.mileage); weekly_expenses.mileage += Number(expense.mileage);
} else { } else {
daily_expenses.expenses[subgroup] += Number(expense.amount); daily_expenses[subgroup] += Number(expense.amount);
weekly_expenses.expenses[subgroup] += Number(expense.amount); weekly_expenses[subgroup] += Number(expense.amount);
} }
} }