Commit graph

740 commits

Author SHA1 Message Date
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
3f2e104078 Merge branch 'dev' of https://github.com/imbus64/TTime into dev 2024-03-20 23:32:07 +01:00
borean
28935f285b fixed typo 2024-03-20 23:25:50 +01:00
al8763be
01b934969a fixed dep array 2024-03-20 23:24:28 +01:00
Imbus
b7523cf04d Merge branch 'dev' into imbs 2024-03-20 23:20:04 +01:00
al8763be
a2a8ccd185 bättre stämmning 2024-03-20 23:18:51 +01:00
al8763be
8aa9e285b8 Merge branch 'dev' into BumBranch 2024-03-20 23:05:49 +01:00
al8763be
afa445a426 Merge remote-tracking branch 'origin/imbs' into BumBranch 2024-03-20 23:04:17 +01:00
Imbus
740289decc Merge branch 'dev' into imbs 2024-03-20 22:52:13 +01:00
al8763be
ddea76e24a fixed AllTimeReportsInProject 2024-03-20 22:47:02 +01:00
Imbus
fdaba36d57 Log database error in SubmitWeeklyReport 2024-03-20 22:43:03 +01:00
al8763be
c4b8bef7f8 fix database 2024-03-20 22:37:15 +01:00
Imbus
1a7bc9c73c Merge branch 'imbs' of git.silversoft.se:Imbus/TTime into imbs 2024-03-20 22:04:42 +01:00
Imbus
b00ce7a0ed Typescript type regeneration 2024-03-20 22:04:36 +01:00
Imbus
ec138163c6 Very large changes related to database and its interface 2024-03-20 22:04:36 +01:00
al8763be
a51d984229 Merge branch 'dev' of https://github.com/imbus64/TTime into dev 2024-03-20 22:03:25 +01:00
al8763be
70cf40feb5 fixed getWeeklyReport 2024-03-20 22:02:34 +01:00
Imbus
0dc7e3bf99 Deleted sqlite3-journal 2024-03-20 21:56:03 +01:00
Imbus
65101384e2 Typescript type regeneration 2024-03-20 21:54:13 +01:00
al8763be
4288b064f3 fixade dålig stämmning igen 2024-03-20 21:53:08 +01:00
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
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
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