From 5f6977354f143e519abfbe9f88dc6bc3535fa268 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Tue, 19 Mar 2024 04:02:04 +0100
Subject: [PATCH 1/2] Justfile save-release target now saves image with name
containing commit hash and date
---
Justfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Justfile b/Justfile
index 432fbd1..cb905e4 100644
--- a/Justfile
+++ b/Justfile
@@ -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:
From 2f3730ca90285dc270e419a64e92d712e5380893 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Tue, 19 Mar 2024 16:50:16 +0100
Subject: [PATCH 2/2] New typescript types from tygo
---
frontend/src/Types/goTypes.ts | 52 +++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/frontend/src/Types/goTypes.ts b/frontend/src/Types/goTypes.ts
index 89084b7..43bb35f 100644
--- a/frontend/src/Types/goTypes.ts
+++ b/frontend/src/Types/goTypes.ts
@@ -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;
+}