|
|
791b3aacb9
|
feat(employees): add paid time off to properties sent to employee list queries (some partial, full when editing)
|
2026-01-09 11:39:30 -05:00 |
|
Matthieu Haineault
|
c03ea4cb6f
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2026-01-09 08:00:14 -05:00 |
|
Matthieu Haineault
|
70575e1772
|
feat(banking_hours): added a function to add or take banked_hours
|
2026-01-09 08:00:08 -05:00 |
|
|
|
c43d7649ca
|
feat(approvals): add functionality to return weekly hours breakdown
|
2026-01-09 07:44:15 -05:00 |
|
Matthieu Haineault
|
41efccac17
|
fix(migration): commented migration scripts
|
2026-01-08 14:20:05 -05:00 |
|
Matthieu Haineault
|
5b778943a1
|
feat(paid_time-off): worked on vacation service, implemented vacation business logic inside shifts creation and did a migration
|
2026-01-08 12:13:14 -05:00 |
|
Matthieu Haineault
|
bae8a037f7
|
fix(business-logics): small ajustments
|
2026-01-07 15:46:29 -05:00 |
|
Matthieu Haineault
|
4646b2f445
|
feat(employees): added daily_expected_hours to returns to display and manage daily expected hours by employees using the app
|
2026-01-07 09:39:10 -05:00 |
|
Matthieu Haineault
|
6cbf37ed86
|
fix(csv): added real paid hours for csv download
|
2026-01-07 09:02:06 -05:00 |
|
Matthieu Haineault
|
e10a7da1e4
|
feat(csv and expenses): added employee_email to update expense and added call to holiday service to display the right amount of hour paid for holiday shifts inside csv(needs more work. see next commit)
|
2026-01-07 08:42:52 -05:00 |
|
Matthieu Haineault
|
70aefdab73
|
fix(migration): fix some migration problems from legacy db
|
2026-01-06 15:04:41 -05:00 |
|
Matthieu Haineault
|
6dae8df0d3
|
fix(url): switch redirect to right url for staging container
|
2026-01-06 10:04:52 -05:00 |
|
Matthieu Haineault
|
2a6f9eb2ac
|
fix(url): switch redirect to right url for staging container
|
2026-01-06 09:46:19 -05:00 |
|
Matthieu Haineault
|
0791f124a0
|
feat(schema): migration of the new table paid_time_off and added a column to employee table = daily_expected_hours
|
2026-01-06 09:13:36 -05:00 |
|
|
|
e3006b9b82
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2026-01-06 07:34:42 -05:00 |
|
|
|
53ec64ba1e
|
refactor(sick-leave): remake methods to calculate and update sick leave available
|
2026-01-06 07:34:26 -05:00 |
|
Matthieu Haineault
|
379104147c
|
fix(csv): added overtime calculation and requalification of regular time unto overtime when daily or weekly maxes are reached
|
2026-01-06 07:12:24 -05:00 |
|
|
|
124a80f9bf
|
fixed mispelled URLs
|
2026-01-05 09:36:57 -05:00 |
|
|
|
3554f2e901
|
added app.targo.ca and staging.app.targo.ca to the allowed frontend URLs
|
2026-01-05 09:07:47 -05:00 |
|
|
|
17f06e7867
|
refactor(timesheet): add boolean property to indicate if user has schedule preset or not, used to display set preset buttons on timesheet.
|
2026-01-02 17:27:29 -05:00 |
|
|
|
74fe9fc945
|
debug(module-access): improve error logging to figure out why access module guard is firing 403 errors.
|
2025-12-29 15:07:30 -05:00 |
|
|
|
6f9ba599a0
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-29 08:57:11 -05:00 |
|
|
|
7eb1471edb
|
fix(pay-periods): specify that is_approved can be null in controller, to not confuse false with null
|
2025-12-29 08:56:22 -05:00 |
|
Nic D.
|
6adbcad352
|
???(???): holiday work, forget what it was. Probably related to timesheet approval and its filters
|
2025-12-29 06:53:16 -05:00 |
|
Matthieu Haineault
|
d613d97a1a
|
fix(pay-period): small fix to query
|
2025-12-23 14:22:28 -05:00 |
|
Matthieu Haineault
|
264ee101bf
|
refactor(pay-period): refactor buildOverview and cleaned service/controller
|
2025-12-23 14:17:37 -05:00 |
|
Matthieu Haineault
|
15d7821314
|
fix(pay-period): removed is_remote from payload and added dynamic returns of timesheet.is_approved
|
2025-12-23 07:18:01 -05:00 |
|
|
|
da74a93fa0
|
console.log
|
2025-12-22 14:10:26 -05:00 |
|
|
|
58baaade5d
|
refactor(pay-periods): refactored bulkApprove for crew to instead toggle approval of all shifts and expenses of a given employee
|
2025-12-22 14:09:35 -05:00 |
|
Matthieu Haineault
|
ad49a2265a
|
feat(shifts): added a new route to enable shift creation/modification/deleting using the timesheets_approval page
|
2025-12-22 11:12:14 -05:00 |
|
Matthieu Haineault
|
ed7e013a71
|
clean(logs): removed debugging logs
|
2025-12-19 16:46:19 -05:00 |
|
Matthieu Haineault
|
447d968f59
|
feat(pay-period): added is_active to payload to filter inactive employee from the timesheets_approval page
|
2025-12-19 16:25:39 -05:00 |
|
Matthieu Haineault
|
c0d00d0ca9
|
feat(pay-period): added is_active to payload to filter inactive employee from the timesheets_approval page
|
2025-12-19 16:16:35 -05:00 |
|
Matthieu Haineault
|
52c2e5f70c
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-19 15:46:14 -05:00 |
|
Matthieu Haineault
|
581a4252cd
|
fix(display): fix the display of amount, mileage and hours to use only 2 decimals and no more
|
2025-12-19 15:46:10 -05:00 |
|
|
|
072855f34d
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-19 15:39:24 -05:00 |
|
|
|
d9d9de759f
|
fix(auth): fix /me route to properly send user data, now also includes module accesses for user.
|
2025-12-19 15:39:18 -05:00 |
|
Matthieu Haineault
|
681779345e
|
fix(access): access troubleshooting
|
2025-12-19 12:43:11 -05:00 |
|
Matthieu Haineault
|
027dd48efb
|
fix(module-access): fix module access for none-admin users
|
2025-12-19 12:23:55 -05:00 |
|
Matthieu Haineault
|
40fe965a6d
|
fix(redirect): fix url redirect
|
2025-12-19 10:16:30 -05:00 |
|
Matthieu Haineault
|
a40af6a4d0
|
fix():small fix to redirect
|
2025-12-19 10:11:29 -05:00 |
|
Matthieu Haineault
|
62bad94343
|
feat(redirect_url): moved redirect url to .env file
|
2025-12-19 10:00:50 -05:00 |
|
Matthieu Haineault
|
3a0dc4c1ce
|
feat(troubleshooting): roll-back du dernier commit et clean de debugg comments
|
2025-12-19 09:54:51 -05:00 |
|
Matthieu Haineault
|
a80dd357a3
|
feat(debugging): temporary guard disable and comment for troubleshooting dockerization of the staging app. to be rolled-back before prod
|
2025-12-19 09:24:26 -05:00 |
|
Matthieu Haineault
|
ecc8e2a9f6
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-19 08:53:22 -05:00 |
|
Matthieu Haineault
|
4c88a72a2d
|
feat(help): finish setup for help/home-page menu
|
2025-12-19 08:53:19 -05:00 |
|
|
|
e67ed22bad
|
fix(presets): fix minor issue with adding a daily preset
|
2025-12-17 13:28:14 -05:00 |
|
Matthieu Haineault
|
4f0f5ae30f
|
feat(presets): added a route to apply a preset to a single day
|
2025-12-17 11:28:35 -05:00 |
|
|
|
21dfe60548
|
fix(timesheet): minor fix to apply preset logic, less iteration
|
2025-12-17 10:50:49 -05:00 |
|
Matthieu Haineault
|
08679b7db3
|
feat(help): set-up function to build personnalized help in the help section
|
2025-12-17 08:42:32 -05:00 |
|
Matthieu Haineault
|
b9c838d3e5
|
fix(access): fix module access create
|
2025-12-15 09:26:59 -05:00 |
|
Matthieu Haineault
|
4b0a45adcc
|
fix(access): fix module access update
|
2025-12-15 09:26:17 -05:00 |
|
|
|
049571c08d
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-15 09:02:13 -05:00 |
|
|
|
0c77df41c6
|
fix(pay-period): minor fix to pay period handling, was returning pay-year of date from request rather than pay-year from pay period in db
|
2025-12-15 09:01:37 -05:00 |
|
Matthieu Haineault
|
3c773df376
|
fix(module_access): fix module access validation
|
2025-12-15 09:00:27 -05:00 |
|
Matthieu Haineault
|
b01506f013
|
fix(schedule_preset): added a param to orderBy to sort shifts by start_date as well as week_day
|
2025-12-12 14:53:56 -05:00 |
|
Matthieu Haineault
|
6f3acde71b
|
fix(preset): added order by start_time
|
2025-12-12 14:31:01 -05:00 |
|
Matthieu Haineault
|
e96cb91304
|
clean(comments): removed debug comment
|
2025-12-12 13:59:23 -05:00 |
|
Matthieu Haineault
|
9a8dcbccc3
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-12 13:35:39 -05:00 |
|
Matthieu Haineault
|
762677b7b1
|
clean(comments): removed debugg comments
|
2025-12-12 13:35:36 -05:00 |
|
|
|
01e407f803
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-12 13:33:31 -05:00 |
|
|
|
93b974c160
|
fix(presets): simplify process of updating employee profiles with deleted preset.
Also removed superfluous prints that are no longer required in certain modules (testing)
|
2025-12-12 13:33:27 -05:00 |
|
Matthieu Haineault
|
f9a247d9f1
|
feat(csv): ajusted csv logics and minor fixes to employees
|
2025-12-12 13:26:09 -05:00 |
|
Matthieu Haineault
|
313a1e5fb6
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-12 08:25:35 -05:00 |
|
Matthieu Haineault
|
157a7908be
|
refactor(csv): ajusted extract logics
|
2025-12-12 08:25:31 -05:00 |
|
Nic D.
|
16a8ed41c4
|
Merge branch 'main' of https://git.targo.ca/Targo/targo_backend
|
2025-12-11 17:00:39 -05:00 |
|
Nic D.
|
3b01aa3748
|
fix(create-employee): date was passed directly as string, fixed to pass date object.
|
2025-12-11 17:00:20 -05:00 |
|
Matthieu Haineault
|
be957d8180
|
fix(schedule_preset) : added a check to remove preset_id for employees using the newly deleted preset
|
2025-12-11 12:02:34 -05:00 |
|
Matthieu Haineault
|
acc128e5ea
|
fix(presets): removed name from where clause to find the preset
|
2025-12-11 10:11:33 -05:00 |
|
Matthieu Haineault
|
71aeeb7133
|
refactor(employees): added preset_id to dto
|
2025-12-11 09:26:58 -05:00 |
|
Nic D.
|
cb52089db8
|
fix(schedule-preset): adjust services to use consistent dto and field names (mix of shifts and preset_shifts)
|
2025-12-10 16:51:38 -05:00 |
|
Matthieu Haineault
|
b6132c8b35
|
feat(schedule-presets): added a service that applies a preset to an existing timesheet. did some cleaning in utils and dtos
|
2025-12-09 13:02:10 -05:00 |
|
|
|
491bd7022c
|
feat(auth): add session table to prisma that will be used by express-session to store user session data
|
2025-12-05 11:33:10 -05:00 |
|
Matthieu Haineault
|
b18ce4972c
|
fix(employees): added 1st and last work day to employee list return
|
2025-12-04 17:09:38 -05:00 |
|
Matthieu Haineault
|
a5917cbe9d
|
clean(modules): modules file cleaning
|
2025-12-04 17:01:28 -05:00 |
|
Matthieu Haineault
|
8fdbdafd91
|
clean(modules): modules file cleaning
|
2025-12-04 15:19:19 -05:00 |
|
Matthieu Haineault
|
e4447a138c
|
fix(modules): file imports fixes
|
2025-12-04 15:02:54 -05:00 |
|
Matthieu Haineault
|
d81186ba2b
|
clean(modules): modules file cleaning
|
2025-12-04 15:00:36 -05:00 |
|
Matthieu Haineault
|
6d3ff46c35
|
clean(modules): modules file cleaning
|
2025-12-04 14:50:48 -05:00 |
|
Matthieu Haineault
|
13962a8496
|
clean(modules): modules file cleaning
|
2025-12-04 14:50:23 -05:00 |
|
Matthieu Haineault
|
0c81f21f1b
|
refactor(employees): added is_supervisor so the frontend can filter employees and use it in a select
|
2025-12-04 13:57:52 -05:00 |
|
Matthieu Haineault
|
9b4517a26d
|
clean(shifts): did some cleaning
|
2025-12-04 11:05:38 -05:00 |
|
Matthieu Haineault
|
4c933d3564
|
fix(shifts): small return fixes
|
2025-12-04 10:46:48 -05:00 |
|
Matthieu Haineault
|
245d671f0b
|
fix(shifts): small return fixes
|
2025-12-04 10:45:47 -05:00 |
|
Matthieu Haineault
|
d913f59eb5
|
refactor(schedules_employees): refactor schema relations between employees and presets
|
2025-12-04 10:42:54 -05:00 |
|
|
|
3e0e835cd8
|
merge
|
2025-12-03 17:01:34 -05:00 |
|
|
|
7ee6773235
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-03 17:00:42 -05:00 |
|
|
|
838189ae1f
|
fix(employee) change dto so that module access is typesafe, modify update route to exclude session email
|
2025-12-03 16:59:03 -05:00 |
|
Matthieu Haineault
|
b40e0ad16e
|
fix(employees): fix create employees
|
2025-12-03 16:06:53 -05:00 |
|
Matthieu Haineault
|
b44577c595
|
fix(employees): fix create employees
|
2025-12-03 15:57:30 -05:00 |
|
Matthieu Haineault
|
f8a70deed2
|
fix(employees): fix update employees
|
2025-12-03 15:43:03 -05:00 |
|
Matthieu Haineault
|
f19f981b43
|
fix(employees): changed email target to use dtos.
|
2025-12-03 15:25:25 -05:00 |
|
Matthieu Haineault
|
5b0e0ce869
|
fix(preferences): ran a migration command so is_dark_mode = null is accepted in DB
|
2025-12-03 14:23:59 -05:00 |
|
|
|
35a71d217a
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-03 14:10:23 -05:00 |
|
|
|
5dafef82f2
|
refactor(auth): make validate method of strategy use parsed idToken to work with Authentik JWT payload instead of profile
|
2025-12-03 14:10:17 -05:00 |
|
Matthieu Haineault
|
e4a4e317bc
|
fix(preferences): ajusted schema so is_dark_mode accepts null
|
2025-12-03 14:06:25 -05:00 |
|
Matthieu Haineault
|
4b0189ed48
|
feat(attachments): cleaning and setting up module for app integration
|
2025-12-03 08:21:17 -05:00 |
|
Matthieu Haineault
|
fb0187c117
|
feat(employees): ajusted employees module, added an update method and route
|
2025-12-02 12:57:49 -05:00 |
|
Matthieu Haineault
|
0180fa3fdd
|
Merge branch 'main' of git.targo.ca:Targo/targo_backend
|
2025-12-02 09:17:30 -05:00 |
|
Matthieu Haineault
|
68477c17b7
|
fix(controller): added ModuleAccess tag
|
2025-12-02 09:17:25 -05:00 |
|