|
|
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 |
|
|
|
b8c9b8ed76
|
feat(details): functional UI for detailed shift display, pending approval from higher-ups
|
2025-09-08 10:00:25 -04:00 |
|
|
|
fbf8114666
|
feat(details): add ui elements to shift rows in employee details
|
2025-09-05 17:08:43 -04:00 |
|
Matthieu Haineault
|
d0b0f2df6c
|
feat(timesheet): i18n for timesheet page
|
2025-09-05 16:07:29 -04:00 |
|
Matthieu Haineault
|
29f5760c62
|
feat(timesheet): added navigation and save btns
|
2025-09-05 13:14:01 -04:00 |
|
|
|
5bd19c4a9c
|
feat(deatils): add component to show row details, finalize appearance of chart layout, finetune mobile layout
|
2025-09-04 17:04:03 -04:00 |
|
Matthieu Haineault
|
42219171a9
|
feat(timesheet): added timesheet page with comment popup
|
2025-09-04 13:40:50 -04:00 |
|
|
|
89148343b6
|
feat(approvals): add chart to track total hours for each type, chart to track expenses, begin work on widget to display detailed shift info.
|
2025-09-02 16:56:04 -04:00 |
|
Matthieu Haineault
|
d20f970958
|
feat(timesheet): added timesheet page, created timsheet-interface and setup store and api
|
2025-09-02 14:30:46 -04:00 |
|
Matthieu Haineault
|
2eae6e5a21
|
feat(timesheet): created interfaces and access button to access and employee timesheet
|
2025-08-29 16:29:07 -04:00 |
|
|
|
61d2b96c32
|
Merge pull request 'fix(details): complete chart implementation for worked hours, stacking bars, proper mobile scaling' (#11) from dev/nicolas/approvals-overview-details into main
Reviewed-on: Targo/targo_frontend#11
|
2025-08-29 12:55:24 -04:00 |
|
|
|
24a700d6f6
|
fix(details): complete chart implementation for worked hours, stacking bars, proper mobile scaling
|
2025-08-29 12:54:50 -04:00 |
|
|
|
83ebf02182
|
Merge pull request 'feat(approvals): install chartJS and vue-chartJS for graphical representation of employee details, configuring bar graph.' (#10) from dev/nicolas/approvals-overview-details into main
Reviewed-on: Targo/targo_frontend#10
|
2025-08-29 08:33:41 -04:00 |
|
|
|
58f6e808d0
|
feat(approvals): install chartJS and vue-chartJS for graphical representation of employee details, configuring bar graph.
|
2025-08-29 08:33:02 -04:00 |
|
|
|
d00021a9f0
|
Merge pull request 'fix(approvals): fix route for csv report' (#9) from dev/nicolas/csv-report into main
Reviewed-on: Targo/targo_frontend#9
|
2025-08-27 15:52:49 -04:00 |
|
|
|
6020eb4b6f
|
fix(approvals): fix route for csv report
|
2025-08-27 15:52:29 -04:00 |
|
|
|
ea4975005f
|
Merge pull request 'feat(approvals): add print report functionality and filters for backend testing' (#8) from dev/nicolas/csv-report into main
Reviewed-on: Targo/targo_frontend#8
|
2025-08-27 15:49:09 -04:00 |
|
|
|
b4435020b2
|
feat(approvals): add print report functionality and filters for backend testing
|
2025-08-27 15:48:27 -04:00 |
|
|
|
40e95e9238
|
Merge pull request 'dev/nicolas/approvals-overview-details' (#7) from dev/nicolas/approvals-overview-details into main
Reviewed-on: Targo/targo_frontend#7
|
2025-08-27 11:21:13 -04:00 |
|
|
|
81e4fd3ed0
|
feat(approvals): add both weeks to modal, time grid and mouseover labels, buttons on employee card. Minor DRYing in various files.
|
2025-08-26 17:02:08 -04:00 |
|
|
|
6248cb3354
|
feat(approvals): add timeline compact viewer. Forego slider/range implementation for custom vue/typescript method
|
2025-08-25 17:07:08 -04:00 |
|
|
|
911a959567
|
feat(approvals): Add details card basic. Add logic with service, store, api. Create temporary mock data for testing.
|
2025-08-22 17:09:03 -04:00 |
|
|
|
8c42235851
|
Merge pull request 'fix(date-picker): minor fixes to components due to components refactor.' (#6) from dev/nicolas/timesheet-approvals/date-picker into main
Reviewed-on: Targo/targo_frontend#6
|
2025-08-22 11:36:09 -04:00 |
|
|
|
0ccfef324e
|
fix(date-picker): minor fixes to components due to components refactor.
|
2025-08-22 11:35:23 -04:00 |
|
|
|
2244eee46b
|
Merge pull request 'refactor(many): change some components to respect 'props down, events up' convention for modularity and reusability. Keep branch open for future possible refactors.' (#5) from refactor/nicolas/components-modularity into main
Reviewed-on: Targo/targo_frontend#5
|
2025-08-22 11:12:22 -04:00 |
|
|
|
7dbb30259c
|
refactor(many): change some components to respect 'props down, events up' convention for modularity and reusability. Keep branch open for future possible refactors.
|
2025-08-22 11:11:14 -04:00 |
|
|
|
b0dcfdc73c
|
Merge pull request 'dev/nicolas/approvals-refactor' (#4) from dev/nicolas/approvals-refactor into main
Reviewed-on: Targo/targo_frontend#4
|
2025-08-22 08:01:58 -04:00 |
|
|
|
d0e64bdffc
|
refactor(approvals): move functionalities for separation of concern, page formatting, i18n refactoring, consideration for mobile appearance.
|
2025-08-21 17:06:57 -04:00 |
|
|
|
27e73f8f51
|
refactor(approvals): change timesheet store to no longer rely on array of pay periods, now requests new pay period objects depending on date picker button pressed.
|
2025-08-21 10:44:23 -04:00 |
|
|
|
21b98ec825
|
refactor(approvals): remake entire card appearance, hook up to pay period picker to backend, make the period picker actually functional.
|
2025-08-20 17:03:32 -04:00 |
|
|
|
0c1d214420
|
refactor(approvals): fully overhaul timesheet approvals to work with backend, begin to implement approval logic.
|
2025-08-19 16:49:49 -04:00 |
|
|
|
62aec8f597
|
Merge pull request 'fix(employees): minor tweaks to appearance for table, tracking of data.' (#3) from dev/nicolas/employee-list into main
Reviewed-on: Targo/targo_frontend#3
|
2025-08-18 10:28:14 -04:00 |
|
|
|
41abd70ff7
|
fix(employees): minor tweaks to appearance for table, tracking of data.
|
2025-08-18 10:02:28 -04:00 |
|
|
|
52bc26052e
|
Merge pull request 'dev/nicolas/employee-list' (#2) from dev/nicolas/employee-list into main
Reviewed-on: Targo/targo_frontend#2
|
2025-08-15 17:03:46 -04:00 |
|
|
|
b13c8b8b1b
|
feat(employees): add modal to show employee details, connects successfully to backend and receives data.
|
2025-08-15 17:00:52 -04:00 |
|
|
|
7230ef01e6
|
fix(employees): finalize GUI of employee list grid mode
|
2025-08-15 10:19:40 -04:00 |
|
|
|
f33ca127fa
|
refactor(employees): finish connection to backend api, design cards to display employees, fine-tunning element placement
|
2025-08-14 17:03:51 -04:00 |
|
|
|
f45d0c2bd6
|
feat(employees): add page and components for employee list, connect to backend logic
|
2025-08-13 17:02:59 -04:00 |
|
|
|
cf6f411ac6
|
Merge pull request 'dev/nicolas/timesheet-validation' (#1) from dev/nicolas/timesheet-validation into main
Reviewed-on: Targo/targo_frontend#1
|
2025-08-13 13:11:13 -04:00 |
|
|
|
552c6fa971
|
refactor(approvals): slight tweaks to appearance, add title bar, begin making detailed overview
|
2025-08-13 11:32:11 -04:00 |
|
|
|
4ae33dfcf1
|
refactor(approvals): add table with grid setup, customize card (item) appearance
|
2025-08-12 17:01:46 -04:00 |
|
|
|
2fb7b4a4c1
|
feat(approvals): add page for timesheet approvals, complete date picker component, begin work for approvals table.
|
2025-08-11 17:04:21 -04:00 |
|
|
|
1f94d6a900
|
eat(approvals): add and define components and other files related to timesheet approval page
|
2025-08-08 17:04:54 -04:00 |
|