From 8290694d8c6cae03595696d85ff97eade7cbf33b Mon Sep 17 00:00:00 2001
From: Christoph Marzell <christoph.marzell@rise-world.com>
Date: Thu, 20 Nov 2025 09:43:27 +0100
Subject: [PATCH] fix display of hours

---
 app/views/entries/index.html.erb | 62 +++++++++++++++++---------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/app/views/entries/index.html.erb b/app/views/entries/index.html.erb
index 9ea1797..221af66 100644
--- a/app/views/entries/index.html.erb
+++ b/app/views/entries/index.html.erb
@@ -57,7 +57,6 @@
       <p>Fachspezifikum: <%= @total_minutes_praktikum_fach / 60 %>h <%= @total_minutes_praktikum_fach % 60 %> min</p>
 
 
-
     </div>
 
   </div>
@@ -199,37 +198,42 @@
       <tbody>
       <% @entries.each do |entry| %>
         <tr>
-          <td><%= entry.date.strftime('%d.%m.%Y') %></td>
-          <td><%= entry.hours.to_i %>h <%= entry.minutes.to_i %>min</td>
-          <td>
-            <%= ["Fortbildung", "Semesterkosten"].include?(entry.entry_art) ? entry.entry_art : entry.praktikums_typ.capitalize %>
-          </td>
-          <td>
-            <%= ["Fortbildung", "Semesterkosten"].include?(entry.entry_art) ? entry.beschreibung : entry.entry_art.capitalize %>
-          </td>
-          <td>
-            <%= entry.beschreibung %>
-          </td>
-
-          <td><%= entry.distance_km.to_f %> km</td>
-
           <td>
-            <%= number_to_currency(entry.kilometer_pauschale, unit: "€", separator: ",", delimiter: ".") %>
+            <%= entry.date.strftime('%d.%m.%Y') %>
           </td>
-
           <td>
-            <%= number_to_currency(entry.kosten, unit: "€", separator: ",", delimiter: ".") %>
-          </td>
-          <td class="text-center">
-            <%= check_box_tag "fortbildung_#{entry.id}", '1', entry.zaehlt_als_fortbildung, disabled: true %>
-          </td>
-          <td class="text-end">
-            <div class="d-flex justify-content-between">
-              <%= link_to 'Bearbeiten', edit_entry_path(entry), class: 'btn btn-sm btn-outline-primary' %>
-              <%= link_to 'Löschen', entry_path(entry), class: 'btn btn-sm btn-outline-danger open-delete-modal' %>
-            </div>
-          </td>
-        </tr>
+            <% if entry.hours.to_i > 0 || entry.minutes.to_i > 0 %>
+              <%= "#{entry.hours} Stunden, #{entry.minutes} Minuten" %>
+            <% end %>
+            <td>
+              <%= ["Fortbildung", "Semesterkosten"].include?(entry.entry_art) ? entry.entry_art : entry.praktikums_typ.capitalize %>
+            </td>
+            <td>
+              <%= ["Fortbildung", "Semesterkosten"].include?(entry.entry_art) ? entry.beschreibung : entry.entry_art.capitalize %>
+            </td>
+            <td>
+              <%= entry.beschreibung %>
+            </td>
+
+            <td><%= entry.distance_km.to_f %> km</td>
+
+            <td>
+              <%= number_to_currency(entry.kilometer_pauschale, unit: "€", separator: ",", delimiter: ".") %>
+            </td>
+
+            <td>
+              <%= number_to_currency(entry.kosten, unit: "€", separator: ",", delimiter: ".") %>
+            </td>
+            <td class="text-center">
+              <%= check_box_tag "fortbildung_#{entry.id}", '1', entry.zaehlt_als_fortbildung, disabled: true %>
+            </td>
+            <td class="text-end">
+              <div class="d-flex justify-content-between">
+                <%= link_to 'Bearbeiten', edit_entry_path(entry), class: 'btn btn-sm btn-outline-primary' %>
+                <%= link_to 'Löschen', entry_path(entry), class: 'btn btn-sm btn-outline-danger open-delete-modal' %>
+              </div>
+            </td>
+            </tr>
       <% end %>
       </tbody>
     </table>