Co-authored-by: Imbus <imbus64@users.noreply.github.com>

backend/internal/handlers/global_state.go

@@ -29,6 +29,7 @@ type GlobalState interface {
 	ChangeUserName(c *fiber.Ctx) error      // WIP
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
 	GetUnsignedReports(c *fiber.Ctx) error  // 
+	UpdateWeeklyReport(c *fiber.Ctx) error
 }
 
 // "Constructor"

backend/internal/handlers/handlers_project_related.go

@@ -233,3 +233,57 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	// Return the result as JSON
 	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
+
+func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
+    // Get the username from the token
+    user := c.Locals("user").(*jwt.Token)
+    claims := user.Claims.(jwt.MapClaims)
+    username := claims["name"].(string)
+    
+    // Get project
+    projectName := c.Params("projectName")
+    if projectName == "" {
+        log.Info("No project name provided")
+        return c.Status(400).SendString("No project name provided")
+    }
+    
+    // Get all users in the project and roles
+    userProjects, err := gs.Db.GetAllUsersProject(projectName)
+    if err != nil {
+        log.Info("Error getting users in project:", err)
+        return c.Status(500).SendString(err.Error())
+    }
+    
+    // If the user is member
+    isMember := false
+    for _, userProject := range userProjects {
+        if userProject.Username == username {
+            isMember = true
+            break
+        }
+    }
+    
+    // If the user is admin
+    if !isMember {
+        isAdmin, err := gs.Db.IsSiteAdmin(username)
+        if err != nil {
+            log.Info("Error checking admin status:", err)
+            return c.Status(500).SendString(err.Error())
+        }
+        if !isAdmin {
+            log.Info("User is neither a project member nor a site admin:", username)
+            return c.Status(403).SendString("User is neither a project member nor a site admin")
+        }
+    }
+    
+    // Get project times 
+    projectTimes, err := gs.Db.GetProjectTimes(projectName)
+    if err != nil {
+        log.Info("Error getting project times:", err)
+        return c.Status(500).SendString(err.Error())
+    }
+    
+    // Return project times as JSON
+    log.Info("Returning project times for project:", projectName)
+    return c.JSON(projectTimes)
+}

backend/internal/handlers/handlers_report_related.go

@@ -177,3 +177,37 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Return the list of reports as JSON
 	return c.JSON(reports)
 }
+
+func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Parse the request body into an UpdateWeeklyReport struct
+	var updateReport types.UpdateWeeklyReport
+	if err := c.BodyParser(&updateReport); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if updateReport.Week < 1 || updateReport.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	// Update the weekly report in the database
+	if err := gs.Db.UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+		log.Info("Error updating weekly report in db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report updated")
+	return c.Status(200).SendString("Weekly report updated")
+}

backend/internal/handlers/handlers_user_related.go

@@ -207,8 +207,8 @@ func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
 // @Accept			json
 // @Produce		plain
 // @Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully prometed user"
-// @Failure		400		{string}	string			"bad request"
+// @Success		200		{json}		json			"Successfully promoted user"
+// @Failure		400		{string}	string			"Bad request"
 // @Failure		401		{string}	string			"Unauthorized"
 // @Failure		500		{string}	string			"Internal server error"
 // @Router			/promoteToAdmin [post]
@@ -234,33 +234,33 @@ func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
 	return c.SendStatus(fiber.StatusOK)
 }
 
-// Changes a users name in the database
+// ChangeUserName changes a user's username in the database
 func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
-
-	//check token and get username of current user
+	// Check token and get username of current user
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
-	projectManagerUsername := claims["name"].(string)
-	log.Info(projectManagerUsername)
+	adminUsername := claims["name"].(string)
+	log.Info(adminUsername)
+
 	// Extract the necessary parameters from the request
-	data := new(types.NameChange)
+	data := new(types.StrNameChange)
 	if err := c.BodyParser(data); err != nil {
-		log.Info("error parsing username, project or role")
+		log.Info("Error parsing username")
 		return c.Status(400).SendString(err.Error())
 	}
 
-	// dubble diping and checcking if current user is
-
-	if ismanager, err := gs.Db.IsProjectManager(projectManagerUsername, c.Params(data.Name)); err != nil {
-		log.Warn("Error checking if projectmanager:", err)
+	// Check if the current user is an admin
+	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Warn("Error checking if admin:", err)
 		return c.Status(500).SendString(err.Error())
-	} else if !ismanager {
-		log.Warn("tried changing name when not projectmanager:", err)
-		return c.Status(401).SendString("you can not change name when not projectmanager")
+	} else if !isAdmin {
+		log.Warn("Tried changing name when not admin")
+		return c.Status(401).SendString("You cannot change name unless you are an admin")
 	}
 
-	// Change the user's name within the project in the database
-	if err := gs.Db.ChangeUserName(projectManagerUsername, data.Name); err != nil {
+	// Change the user's name in the database
+	if err := gs.Db.ChangeUserName(data.PrevName, data.NewName); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}