Commit graph

579 commits

Author SHA1 Message Date
Peter KW
8b6462abee Changed so that username is required to get projects, so that you can get another user's projects (for admin stuff) 2024-03-29 20:19:22 +01:00
Peter KW
4ab23b3c3c Merge branch 'dev' into gruppPP 2024-03-29 20:05:10 +01:00
Imbus
bc9b01d85a Example component GenApiDemo on how to use the new API 2024-03-29 19:37:21 +01:00
Imbus
d2b4bf2a89 Brand new typescript API interface generated from swagger 2024-03-29 19:36:47 +01:00
Imbus
8d5329146d New tygo generated goTypes 2024-03-29 19:36:06 +01:00
Imbus
77f028fd39 Prettierignore for generated files 2024-03-29 19:23:35 +01:00
Davenludd
c1f49915ba Refactor signReport method signature 2024-03-29 18:29:38 +01:00
Davenludd
2aaa327a01 Merge branch 'dev' into gruppDM 2024-03-29 17:55:32 +01:00
Davenludd
05545f6f88 Minor fixes 2024-03-29 17:53:37 +01:00
Imbus
4538a3b193 SignReport handler changes along with tests and TS interface 2024-03-29 15:33:20 +01:00
Peter KW
b036ef906c Small fixes in all files that fetches user projects, so that they pass username as argument to GetProjects-function 2024-03-28 21:31:30 +01:00
al8763be
8d7d815745 Merge remote-tracking branch 'origin/gruppDM' into BumBranch 2024-03-28 16:46:29 +01:00
al8763be
09f2a2202f Merge remote-tracking branch 'origin/frontend' into BumBranch 2024-03-28 16:45:39 +01:00
Peter KW
218b0b3ab7 Merge branch 'frontend' into gruppPP 2024-03-28 12:41:43 +01:00
Peter KW
a96f0fb488 Can now delete user, and also asks user to confirm action 2024-03-28 12:39:23 +01:00
Peter KW
48e53b8768 Added some alerts 2024-03-28 12:38:40 +01:00
Peter KW
3d9bd2ef96 Fixed bugs in removeUser api 2024-03-28 12:38:12 +01:00
Davenludd
4a71078f2a Fix API endpoint for checking project manager 2024-03-28 12:25:24 +01:00
Davenludd
cc186f8ad0 Refactor handleProjectClick function to remove unused username parameter 2024-03-28 12:16:35 +01:00
Davenludd
e589726ab2 Merge remote-tracking branch 'origin/AlexTester' into gruppDM 2024-03-28 12:10:53 +01:00
Davenludd
37d06b10be Fix typo in route parameter name 2024-03-28 12:09:16 +01:00
Davenludd
48e4d1a8df Refactor fetchWeeklyReport in EditWeeklyReport component 2024-03-28 12:09:09 +01:00
al8763be
6a78e67e7e lol 2024-03-28 12:08:14 +01:00
al8763be
7c46797634 ifPM fix 2024-03-28 12:06:59 +01:00
Peter KW
cef7b34092 Small change to newprojmember type 2024-03-28 01:36:48 +01:00
Peter KW
9052babaae Now uses addUserToProject 2024-03-28 01:35:36 +01:00
Peter KW
752d366cf7 Added some alerts 2024-03-28 01:35:16 +01:00
Peter KW
19cb8dbd94 Small fixes 2024-03-28 01:34:49 +01:00
Peter KW
b6d1a2926e Moved MemberAdd to own component and changed design a little 2024-03-28 01:33:03 +01:00
Peter KW
dc3f91eee1 Add member component 2024-03-28 01:31:53 +01:00
Peter KW
0299bb4779 Removed unused path 2024-03-28 01:31:35 +01:00
Peter KW
99a1430188 Fix to addUserToProject API 2024-03-28 00:57:16 +01:00
Alexander Ek
d4cc556366 Co-authored-by: al8763be <al8763be@users.noreply.github.com> 2024-03-27 21:18:44 +01:00
Davenludd
7c73a01d4c Add success alert message after submitting weekly report 2024-03-27 20:47:24 +01:00
Imbus
96238ceb2e Fix asset resolution at build time 2024-03-23 20:29:08 +01:00
Davenludd
492cfed08c Merge branch 'dev' into gruppDM 2024-03-21 18:09:17 +01:00
Imbus
dbbe4da401 Fix for submitWeeklyReport ts API 2024-03-21 18:05:41 +01:00
Davenludd
8d739396a1 Change input types from number to text in ViewOtherTimeReport component 2024-03-21 14:01:33 +01:00
Davenludd
689daf4e1f Updated Link in ProjectMembers component 2024-03-21 14:01:19 +01:00
Davenludd
1d054e660c Fixes for PMOtherUsersTR 2024-03-21 14:00:47 +01:00
Davenludd
589a135bb5 New Page for PM 2024-03-21 13:59:57 +01:00
Davenludd
4c22ba478d Add OtherUsersTR component for displaying weekly report of a user in a project 2024-03-21 13:59:24 +01:00
Davenludd
deeff6c3c2 Added AllTimeReportsInProjectOtherUser component 2024-03-21 13:59:10 +01:00
Davenludd
e47f12c6d7 Add new route for PM components 2024-03-21 13:58:45 +01:00
Davenludd
b656204457 Added component for PM to view other users time reports 2024-03-21 12:46:05 +01:00
Mattias
9f931a2643 Add heading to Edit Time Report page 2024-03-21 12:37:44 +01:00
Mattias
a31a50965f Update routes and components for PMViewUnsignedReport 2024-03-21 12:36:14 +01:00
Davenludd
ebc59e0c11 Refactor handleNewWeeklyReport function to return a boolean indicating success or failure if week already has a report 2024-03-21 12:31:16 +01:00
Mattias
1b20173ece Remove unused import and add DisplayUnsignedReports component 2024-03-21 12:10:53 +01:00
Mattias
4b6c93a202 Add DisplayUnsignedReports component and update route for otherUsersTimeReports 2024-03-21 12:10:43 +01:00
Mattias
70e6cbf12e Update project members page layout and remove unnecessary links 2024-03-21 11:30:07 +01:00
Davenludd
856ae40900 Refactor input fields to handle empty values 2024-03-21 11:10:37 +01:00
Mattias
e2d2310275 Add ViewOtherTimeReport component to PMOtherUsersTR page 2024-03-21 10:31:24 +01:00
Mattias
85be4c79d6 Refactor getProjectMembers function in ProjectMembers component 2024-03-21 10:05:51 +01:00
Davenludd
ae0208ff23 Add project navigation based on user and pm role 2024-03-21 10:02:59 +01:00
Mattias
14133a9f22 CleanUp, making lint happy 2024-03-21 09:59:12 +01:00
Mattias
c415539904 Refactor ProjectMembers component to use API for fetching project members 2024-03-21 09:36:08 +01:00
Davenludd
01a6f9e61d Add comment NewWeeklyReport 2024-03-21 08:57:56 +01:00
Davenludd
faf998e652 Merge branch 'dev' into gruppDM 2024-03-21 08:56:07 +01:00
Peter KW
c9e28e9b5b New type to match fetch 2024-03-21 03:39:53 +01:00
Peter KW
b2db9c54ca Add member functionality added 2024-03-21 03:39:18 +01:00
Peter KW
c5bc6c1c58 Add user to project component 2024-03-21 03:37:37 +01:00
Peter KW
2694beb0e8 AddUserToProject API 2024-03-21 03:36:57 +01:00
Peter KW
a73432669c New path 2024-03-21 03:36:30 +01:00
pavel Hamawand
e9eb2e9ab6 checks 2024-03-21 02:51:28 +01:00
pavel Hamawand
baf11f19d6 added token 2024-03-21 02:47:51 +01:00
pavel Hamawand
1950112202 implementing changeUsername component 2024-03-21 02:22:23 +01:00
pavel Hamawand
3e11b87eee Modify the implementation of the changeUserName method in the api object 2024-03-21 01:58:57 +01:00
pavel Hamawand
9e2a3cca81 Update the method signature in the API interface to use StrNameChange 2024-03-21 01:56:27 +01:00
Imbus
a6d7ee2de6 Merge branch 'dev' 2024-03-21 00:03:51 +01:00
Imbus
acdee28eb0 Fix for EditWeeklyReport component 2024-03-21 00:03:15 +01:00
Imbus
03f6edd320 Merge branch 'gruppPP' into frontend 2024-03-20 23:55:29 +01:00
Peter KW
e63b45f38a Changes so that it shows relevant info depending on if managing project member or a system user 2024-03-20 23:49:09 +01:00
Peter KW
e8262ed5e0 Now shows users in project when clicked 2024-03-20 23:45:50 +01:00
Peter KW
6dfc31832c Fixes to design 2024-03-20 23:44:36 +01:00
Peter KW
b2333d8cbd Removed unused file 2024-03-20 23:43:13 +01:00
al8763be
e839d02cfd Merge branch 'dev' into frontend 2024-03-20 23:37:56 +01:00
al8763be
01b934969a fixed dep array 2024-03-20 23:24:28 +01:00
Davenludd
a4bd2c9315 Merge branch 'dev' into gruppDM 2024-03-20 22:50:56 +01:00
Mattias
1a87effc3a Changes to EditWeeklyReport component 2024-03-20 22:49:54 +01:00
al8763be
ddea76e24a fixed AllTimeReportsInProject 2024-03-20 22:47:02 +01:00
Davenludd
d0209094a9 Remove unused variable in EditWeeklyReport component 2024-03-20 22:10:53 +01:00
Davenludd
f91f0ff8f5 Merge branch 'dev' into gruppDM 2024-03-20 22:05:04 +01:00
Imbus
b00ce7a0ed Typescript type regeneration 2024-03-20 22:04:36 +01:00
al8763be
70cf40feb5 fixed getWeeklyReport 2024-03-20 22:02:34 +01:00
Davenludd
900797facc Fix initial state values and handle empty input values in NewWeeklyReport component 2024-03-20 21:53:27 +01:00
Davenludd
b9b17bf229 Merge branch 'dev' into gruppDM 2024-03-20 21:21:59 +01:00
al8763be
69d07624ce Merge remote-tracking branch 'origin/dev' into BumBranch 2024-03-20 20:55:53 +01:00
Johanna
ae77bcf0bb Added comments to TypeScript API, merge 2024-03-20 20:44:11 +01:00
al8763be
a9e515925e getWeeklyReportsForUser fixed 2024-03-20 20:24:56 +01:00
Peter KW
e4a0246b84 Merge branch 'frontend' into gruppPP 2024-03-20 18:41:01 +01:00
Peter KW
9b30b82237 Gets all project members and displays them properly now 2024-03-20 18:38:37 +01:00
Peter KW
bca12151b7 Added new type to match fetch for project members 2024-03-20 18:36:45 +01:00
Peter KW
8250c92694 Fixed so that it uses new type 2024-03-20 18:36:10 +01:00
Peter KW
d1be752ac3 getAllUsersProject uses new type 2024-03-20 18:35:02 +01:00
Imbus
0017e9b9ef Fixing error in ts API, fixing AllTimeReportsInProject 2024-03-20 17:31:59 +01:00
Davenludd
bf59503517 Update background images in LoginPage.css 2024-03-20 17:24:54 +01:00
Imbus
933191b076 Generate typescript types 2024-03-20 17:20:47 +01:00
Imbus
b405b44460 Merge frontend -> dev 2024-03-20 17:19:09 +01:00
Imbus
d19372d66b Frontend API interface fixed (untested) for getWeeklyReportsForUser 2024-03-20 17:10:11 +01:00
Peter KW
cd452459c2 getAllUsersProject API, fetches all users in a project 2024-03-20 17:02:36 +01:00
Peter KW
056ca3660d GetUsersInProject component 2024-03-20 16:59:54 +01:00
Imbus
49e3542dce Merge branch 'BumBranch' into dev 2024-03-20 16:49:59 +01:00
Davenludd
e4f5fbda44 Fix useEffect dependency in AllTimeReportsInProject component 2024-03-20 16:46:44 +01:00
Mattias
b99de71c38 Update links in PMProjectMembers component 2024-03-20 16:41:32 +01:00
Mattias
0befc4c7d1 Minor fix 2024-03-20 16:36:39 +01:00
Mattias
a3fc71f4bf Changed path in main 2024-03-20 16:36:32 +01:00
Mattias
4030031ce9 New comp TimePerActivity 2024-03-20 16:36:24 +01:00
Mattias
dd02c2c5c6 Brand new TimePerRole component deluxe edition 2024-03-20 16:24:38 +01:00
Mattias
287e97fe6f Updated path in main 2024-03-20 16:24:10 +01:00
pavel Hamawand
75e835895a minor fix 2024-03-20 15:48:45 +01:00
pavel Hamawand
d94f21ab67 minor fix 2024-03-20 15:47:34 +01:00
pavel Hamawand
ebb009bd20 BackButton 2024-03-20 15:33:56 +01:00
pavel Hamawand
32d9cc4684 backButton 2024-03-20 15:33:26 +01:00
pavel Hamawand
d3938f76e1 backButton 2024-03-20 15:32:40 +01:00
Davenludd
8084f722b5 Fixies in API and component code 2024-03-20 15:32:30 +01:00
Davenludd
caa793d036 Fix week validation in NewWeeklyReport component for safari and firefox 2024-03-20 15:32:14 +01:00
pavel Hamawand
196446be1f Backbutton 2024-03-20 15:31:18 +01:00
pavel Hamawand
0076a9f4bb backButton 2024-03-20 15:30:16 +01:00
Davenludd
847073c6f8 Merge branch 'BumBranch' into gruppDM 2024-03-20 15:21:26 +01:00
Davenludd
54e42cd2a8 Add support for week input in Chrome and Edge browsers 2024-03-20 15:19:09 +01:00
al8763be
af5813681d Jag avskyr denna handlern 2024-03-20 15:17:00 +01:00
al8763be
771118f85e Update API.ts 2024-03-20 15:13:00 +01:00
Imbus
a84c2c6129 Rename GetWeeklyReportsForProject -> GetWeeklyReportsForUser 2024-03-20 14:54:22 +01:00
Davenludd
eddf678f3a Merge branch 'BumBranch' into gruppDM 2024-03-20 14:48:32 +01:00
Mattias
14b68e4463 Formatting 2024-03-20 14:20:09 +01:00
Mattias
47ce986834 Minor fixes 2024-03-20 14:17:33 +01:00
Davenludd
0fb06790af Fix useEffect dependency array in ProjectMembers component 2024-03-20 14:09:16 +01:00
Davenludd
89cb3d23b7 Fix missing comma in getWeeklyReportsForProject function signature 2024-03-20 14:07:12 +01:00
Davenludd
adf9500bbf Fix useEffect dependency in AllTimeReportsInProject component 2024-03-20 14:06:54 +01:00
al8763be
74e1347162 Changed error message 2024-03-20 14:02:34 +01:00
Davenludd
4574af25cb Merge branch 'BumBranch' into gruppDM 2024-03-20 14:02:11 +01:00
al8763be
d41bfcf888 Fix for getWeeklyReportsForUser 2024-03-20 14:00:00 +01:00
Davenludd
29d893362c Docs/Comments to user project menu component 2024-03-20 13:57:02 +01:00
Davenludd
c7c38d4201 Docs/Comments to registration form component 2024-03-20 13:57:02 +01:00
Davenludd
d9068949cd Docs/Comments to new weekly report form component 2024-03-20 13:57:02 +01:00
Davenludd
7e7dbe2cc7 Docs/Comments to header component 2024-03-20 13:57:02 +01:00
Davenludd
cf6c8cd34c Docs/Comments to Footer component 2024-03-20 13:57:02 +01:00
Davenludd
dbeeb609b3 Docs/Comments to GetWeeklyReport component 2024-03-20 13:57:02 +01:00
Davenludd
aa5c4017bb Docs/Comments to DisplayUserProjects component 2024-03-20 13:57:02 +01:00
Davenludd
4212dae5bf Delete CountButton component 2024-03-20 13:57:02 +01:00
Davenludd
bd27b549aa Add JSDoc comments to Button component 2024-03-20 13:57:02 +01:00
Davenludd
af92f4faee Docs/Comments to BasicWindow component 2024-03-20 13:57:02 +01:00
Davenludd
2dffffde50 Docs/coments to background animation component 2024-03-20 13:57:02 +01:00
Davenludd
c0e03d7d0d Doc/Comments to BackButton comp 2024-03-20 13:57:02 +01:00
Davenludd
ff4ea47846 Doc/Comments in AllTimeReportsInProject component 2024-03-20 13:57:02 +01:00
Mattias
d3bb6f49e5 New comp changeRoles 2024-03-20 13:51:49 +01:00
Mattias
1b21b2574a Comp for displaying projectmembers and changed path in main 2024-03-20 12:36:30 +01:00
Peter KW
33b269e0c9 Now uses GetProjects 2024-03-20 12:25:59 +01:00
Peter KW
cea2b6c03c GetProjects compo 2024-03-20 12:25:07 +01:00