Merge branch 'frontend' into gruppDM

This commit is contained in:
Davenludd 2024-03-19 17:02:50 +01:00
commit 4568d68746
2 changed files with 53 additions and 1 deletions

View file

@ -15,7 +15,7 @@ remove-podman-containers:
# Saves the release container to a tarball, pigz is just gzip but multithreaded
save-release: build-container-release
podman save --format=oci-archive ttime-server | pigz -9 > ttime-server.tar.gz
podman save --format=oci-archive ttime-server | pigz -9 > ttime-server_`date -I`_`git rev-parse --short HEAD`.tar.gz
# Loads the release container from a tarball
load-release file:

View file

@ -40,6 +40,52 @@ export interface NewWeeklyReport {
*/
testingTime: number /* int */;
}
export interface WeeklyReport {
/**
* The ID of the report
*/
reportId: number /* int */;
/**
* The user id of the user who submitted the report
*/
userId: number /* int */;
/**
* The name of the project, as it appears in the database
*/
projectId: number /* int */;
/**
* The week number
*/
week: number /* int */;
/**
* Total time spent on development
*/
developmentTime: number /* int */;
/**
* Total time spent in meetings
*/
meetingTime: number /* int */;
/**
* Total time spent on administrative tasks
*/
adminTime: number /* int */;
/**
* Total time spent on personal projects
*/
ownWorkTime: number /* int */;
/**
* Total time spent on studying
*/
studyTime: number /* int */;
/**
* Total time spent on testing
*/
testingTime: number /* int */;
/**
* The project manager who signed it
*/
signedBy?: number /* int */;
}
//////////
// source: project.go
@ -86,3 +132,9 @@ export interface PublicUser {
userId: string;
username: string;
}
/**
* wrapper type for token
*/
export interface Token {
token: string;
}