Commit Graph

102 Commits

Author SHA1 Message Date
7f43341629 refactor(approvals): so many changes that are difficult to keep track of. Work on more integration between approvals and timesheet, add list view to approvals, etc 2025-10-10 17:04:14 -04:00
dc615340bc fix(auth): change auth signup to use authentik test account rather than seed account for supervisor 2025-10-07 14:13:04 -04:00
ebc3bde10c Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/approvals-DRYing 2025-10-03 12:24:42 -04:00
00f5565fe5 BREAKING(refactor): more refactor to streamline and standardize approvals and timesheet, pull to get expense changes 2025-10-02 16:09:18 -04:00
1bdbe021fa Merge pull request 'dev/matthieu/timesheet-form' (#20) from dev/matthieu/timesheet-form into main
Reviewed-on: Targo/targo_frontend#20
2025-10-02 08:38:00 -04:00
Matthieu Haineault
3254deedeb Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form 2025-10-02 08:36:20 -04:00
Matthieu Haineault
e2206bae16 Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form 2025-10-01 14:25:29 -04:00
Matthieu Haineault
d05634397a feat(expenses): setup routing for expenses upsert function in form and list 2025-10-01 14:23:51 -04:00
Matthieu Haineault
0388719d42 Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form 2025-09-30 10:43:29 -04:00
655a7ecff1 BREAKING(approvals): begin process of merging and DRYing timesheet with timesheet approvals, adjust imports, WIP - DO NOT MERGE 2025-09-26 17:03:19 -04:00
89cce4f73f Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/approvals-DRYing 2025-09-26 11:38:45 -04:00
3bf8c57f74 refactor(approvals): massive refactor of names, DRY component scripts, separation of concern, trim unnecessary code 2025-09-26 11:06:07 -04:00
9d3a30fa65 Merge pull request 'dev/matthieu/timesheet-form' (#19) from dev/matthieu/timesheet-form into main
Reviewed-on: Targo/targo_frontend#19
2025-09-25 09:59:40 -04:00
Matthieu Haineault
9512bc4bf6 Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form 2025-09-25 09:58:07 -04:00
Matthieu Haineault
c5c0e8b358 refactor(types): refactoring of shifts, expenses, timesheet types, interfaces and defaults values. 2025-09-25 09:05:03 -04:00
f91a664a92 refactor(approvals): send pay period picker to shared util components 2025-09-22 15:49:53 -04:00
4470c855cf Merge pull request 'dev/matthieu/timesheet-form' (#18) from dev/matthieu/timesheet-form into main
Reviewed-on: Targo/targo_frontend#18
2025-09-22 15:16:47 -04:00
Matthieu Haineault
ceb6313322 Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form 2025-09-22 14:21:00 -04:00
Matthieu Haineault
d1fc596b62 feat(expenses): expense's dialog 1st iteration 2025-09-22 14:17:07 -04:00
e32cfe2bf1 Merge pull request 'dev/nicolas/profile' (#17) from dev/nicolas/profile into main
Reviewed-on: Targo/targo_frontend#17
2025-09-22 14:13:03 -04:00
dec2ec84f1 fix(app): refactor and slim i18n files, correct and update pages, rework and refactor verbose code on some components and pages 2025-09-22 14:11:29 -04:00
45b2c3eef0 refactor(frontend): finally trim i18n messages, refactor and DRY older frontend code, general cleanup and component breakdown 2025-09-19 16:59:15 -04:00
dc20f8bf0a Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/profile 2025-09-18 14:46:58 -04:00
e9a8350b09 feat(profile): Profile module nearly complete, technically modular and could be used in employee list. Mobile friendly. Implement Dark Mode. 2025-09-18 14:40:06 -04:00
3c30f44eb1 Merge pull request 'dev/matthieu/timesheet-form' (#16) from dev/matthieu/timesheet-form into main
Reviewed-on: Targo/targo_frontend#16
2025-09-18 14:39:07 -04:00
Matthieu Haineault
71956ef4b2 refactor(shift): extracted crud for shift from overview. 2025-09-18 14:38:23 -04:00
Matthieu Haineault
b488848ac3 feat(timesheet): added expenses list with create/update/delete expenses 2025-09-17 16:47:57 -04:00
Matthieu Haineault
10a62219ef fix(timesheet): minor fixes to UI and time regex 2025-09-16 15:37:01 -04:00
008b1363b5 Merge pull request 'dev/matthieu/timesheet-form' (#15) from dev/matthieu/timesheet-form into main
Reviewed-on: Targo/targo_frontend#15
2025-09-16 09:19:59 -04:00
Matthieu Haineault
a252ad98ef feat(timesheet): added create-edit-delete shifts 2025-09-16 09:17:30 -04:00
b9a549b9f9 feat(profile): add profile template, employee tabs and panels, add some logic to validate entries, i18n implementation 2025-09-12 16:55:33 -04:00
Matthieu Haineault
123befb5f8 feat(timesheet): added comment popup data 2025-09-10 16:21:32 -04:00
Matthieu Haineault
a2f07ac3fb feat(timesheet): added comment popup 2025-09-10 15:26:32 -04:00
Matthieu Haineault
5c0c9036c4 feat(timesheet): added pay-period interface to timesheet employee page 2025-09-10 08:34:21 -04:00
f5ec3025ef fix(approvals): add total hours worked to employee timesheet cards 2025-09-09 10:42:52 -04:00
Matthieu Haineault
3be76b9c96 fix(pay-period): modify total hours calculation 2025-09-09 10:00:42 -04:00
Matthieu Haineault
8f3a4c13d1 fix(timesheet): ajusted imports to type 2025-09-09 09:46:38 -04:00
Matthieu Haineault
04b5778dd4 refactor(timesheet): moved payload interfaces to seperate file 2025-09-09 09:37:33 -04:00
Matthieu Haineault
47c58bb391 removed un-used files 2025-09-09 09:28:50 -04:00
b7806f955b Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/approvals-overview-details 2025-09-09 09:28:27 -04:00
ea91da2c8c Merge pull request 'dev/matthieu/timesheet-form' (#14) from dev/matthieu/timesheet-form into main
Reviewed-on: Targo/targo_frontend#14
2025-09-09 09:07:01 -04:00
Matthieu Haineault
757013bd8e feat(i18n): fixed some translation variables 2025-09-09 09:02:45 -04:00
638d9ce175 Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/approvals-overview-details
Again, not really sure why this is happening, but here we are
2025-09-09 08:54:22 -04:00
b33c7530eb Merge branch 'dev/nicolas/approvals-overview-details' of git.targo.ca:Targo/targo_frontend into dev/nicolas/approvals-overview-details
not really sure what happened but here we are
2025-09-09 08:51:17 -04:00
7f7f30d4a5 fix(approvals): add minor adjustments to i18n naming 2025-09-09 08:50:33 -04:00
Matthieu Haineault
7bc9b45ef0 Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form 2025-09-08 16:25:41 -04:00
Matthieu Haineault
e7dfe6db00 feat(timesheet): added remote_work, add_shift, add_expense btns, 2025-09-08 16:14:57 -04:00
0fd515e8cd Merge pull request 'dev/nicolas/approvals-overview-details' (#12) from dev/nicolas/approvals-overview-details into main
Reviewed-on: Targo/targo_frontend#12
2025-09-08 16:12:52 -04:00
97465797f8 Merge branch 'main' into dev/nicolas/approvals-overview-details 2025-09-08 16:12:41 -04:00
072e0931a1 feat(details): Adjust shift display UI, DRY code in details components, prep for modifying UI 2025-09-08 16:11:48 -04:00