fixed #54, #55
All checks were successful
Arbeitszeitmessung Deploy / Run Go Tests (push) Successful in 1m28s
Tests / Run Go Tests (push) Successful in 2m19s
Arbeitszeitmessung Deploy / Build Go Image and Upload (push) Successful in 1m39s

This commit is contained in:
2025-10-09 13:11:54 +02:00
parent 89eb5d255d
commit 6da58d6753
6 changed files with 12 additions and 61 deletions

View File

@@ -93,61 +93,6 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
</div>
</div>
@workWeekComponent(userWeek, false)
// <div class="grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container">
// <div class="grid-cell col-span-full bg-neutral-300 lg:border-0">
// <h2 class="text-2xl uppercase font-bold">Eigene Abrechnung</h2>
// </div>
// <div class="grid-cell flex flex-col max-md:border-b-1 max-md:bg-neutral-300 gap-2 ">
// <div class="lg:hidden">
// @weekPicker(userWeek.WeekStart)
// </div>
// <h2 class="uppercase font-bold">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</h2>
// <div class="grid grid-cols-5 gap-2 lg:grid-cols-1">
// <div class="col-span-2">
// <span class="flex flex-row gap-2 items-center">
// @statusCheckMark(userWeek.CheckStatus(), models.WeekStatusSent)
// Gesendet
// </span>
// <span class="flex flex-row gap-2 items-center">
// @statusCheckMark(userWeek.CheckStatus(), models.WeekStatusAccepted)
// Akzeptiert
// </span>
// </div>
// <div class="flex flex-row gap-2 col-span-3">
// @timeGaugeComponent(int8(progress), false)
// <div>
// <p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(userWeek.Worktime)) }</p>
// <p>Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(userWeek.Overtime, true)) }</p>
// </div>
// </div>
// </div>
// </div>
// <div class="grid-cell col-span-3 flex flex-col @7xl:grid @7xl:grid-cols-5 gap-2 py-4 content-baseline">
// for _, day := range userWeek.Days {
// @defaultWeekDayComponent(userWeek.User, day)
// }
// </div>
// <div class="grid-cell flex flex-col gap-2 justify-between">
// <div class="max-md:hidden">
// @weekPicker(userWeek.WeekStart)
// </div>
// <form method="post" class="flex flex-col gap-2">
// <input type="hidden" name="method" value="send"/>
// <input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
// <input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
// switch userWeek.CheckStatus() {
// case models.WeekStatusNone:
// <p class="text-sm">an Vorgesetzten senden</p>
// case models.WeekStatusSent:
// <p class="text-sm">an Vorgesetzten gesendet</p>
// case models.WeekStatusAccepted:
// <p class="text-sm">vom Vorgesetzten bestätigt</p>
// }
// <button disabled?={ userWeek.Status < models.WeekStatusSent } type="submit" class="btn">Korrigieren</button>
// <button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour || userWeek.Status >= models.WeekStatusSent || userWeek.RequiresAction() } type="submit" class="btn">Senden</button>
// </form>
// </div>
// </div>
if len(weeks) > 0 {
<div class="grid-cell col-span-full bg-neutral-300">
<h2 class="text-2xl uppercase font-bold">Abrechnung Mitarbeiter</h2>