From d250915f90c6b50af2050173fc89286cb6f5ba89 Mon Sep 17 00:00:00 2001 From: Christoph Marzell Date: Sun, 15 Feb 2026 08:35:48 +0100 Subject: [PATCH] fix calc --- app/controllers/entries_controller.rb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/entries_controller.rb b/app/controllers/entries_controller.rb index caa1451..e4a9370 100644 --- a/app/controllers/entries_controller.rb +++ b/app/controllers/entries_controller.rb @@ -132,11 +132,20 @@ class EntriesController < ApplicationController else relevant_entries = entries end + first_entry_date = entries.first.date - # Gruppiere nach Kalenderjahr + Woche - active_weeks = relevant_entries.group_by { |e| [e.date.cwyear, e.date.cweek] }.keys.size + if remaining == 0 && done_minutes > 0 + # Wenn abgeschlossen → bis zum letzten Eintrag rechnen + last_entry_date = entries.maximum(:date) + total_days = (last_entry_date - first_entry_date).to_i + else + # Sonst bis heute rechnen + total_days = (Date.today - first_entry_date).to_i + end + + weeks = total_days / 7.0 + weeks = 1 if weeks < 1 - weeks = [active_weeks, 1].max actual_per_week = (done_minutes / 60.0) / weeks @actual_hours_per_week[[typ, art]] = actual_per_week.round(2)