Commit graph

880 commits

Author SHA1 Message Date
Imbus
cdea2dce1c Very large changes related to database and its interface 2024-03-20 21:51:36 +01:00
al8763be
49ca043157 ingen dålig stämmning 2024-03-20 21:51:02 +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
Imbus
22f4fba36a Merge 2024-03-20 20:46:27 +01:00
Johanna
ae77bcf0bb Added comments to TypeScript API, merge 2024-03-20 20:44:11 +01:00
Johanna
9f61a36a68 Added comments to TypeScript API, merge 2024-03-20 20:36:34 +01:00
al8763be
a9e515925e getWeeklyReportsForUser fixed 2024-03-20 20:24:56 +01:00
al8763be
91c9f50491 sampledata now has weeklyReports for user & user2 2024-03-20 20:08:00 +01:00
al8763be
e8c660705f sampledata now has weeklyReports for user & user2 2024-03-20 20:05:04 +01:00
al8763be
be3adb09ae Merge branch 'dev' into BumBranch 2024-03-20 19:39:05 +01:00
al8763be
8fbb4be0ad merge again 2024-03-20 19:38:52 +01:00
al8763be
eff14516b4 merge 2024-03-20 19:37:07 +01:00
Imbus
9bf00e8dce Merge branch 'dev' of github.com:imbus64/TTime into dev 2024-03-20 18:47:47 +01:00
Imbus
3525598df2 Tests for AddProject to ensure creator is Manager 2024-03-20 18:47:37 +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
Melker
bef8a6af85 GetTotalTimePerActivity och ett halvt test för den 2024-03-20 18:20:14 +01:00
Imbus
45761dadcb Fix for checkProjectManager endpoint and test_check_if_project_manager 2024-03-20 17:50:51 +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
cc013632a7 Updated python testing script to pass test_get_weekly_reports_user 2024-03-20 17:14:57 +01:00
Imbus
154c2240c8 Merge branch 'dev' of github.com:imbus64/TTime into dev 2024-03-20 17:10:16 +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
borean
1147a216ce typo 2024-03-20 16:55:55 +01:00
Imbus
649a4ba1fd Merge branch 'dev' of github.com:imbus64/TTime into dev 2024-03-20 16:50:09 +01:00
Imbus
49e3542dce Merge branch 'BumBranch' into dev 2024-03-20 16:49:59 +01:00
dDogge
88f232e21b ChangeUserName function in db.go fixed, corresponding test added 2024-03-20 16:46:48 +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
Johanna
ef6c3951fd Merge branch 'johanna-testing' into dev 2024-03-20 16:28:10 +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
Johanna
67680e2616 Added comments to db_test.go test functions 2024-03-20 16:13:53 +01:00
Imbus
0f4c3ac5ec Reworking endpoint getWeeklyReportsUser 2024-03-20 16:05:50 +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