Browse Source

minor UI fixes

main
Christoph Marzell 1 month ago
parent
commit
49fd32b04d
  1. 17
      app/views/entries/_form.html.erb
  2. 2
      app/views/entries/new.html.erb
  3. 6
      app/views/layouts/application.html.erb

17
app/views/entries/_form.html.erb

@ -10,16 +10,17 @@
</div> </div>
<% end %> <% end %>
<!-- Erste Zeile: Datum, Stunden, Minuten -->
<div class="row g-3"> <div class="row g-3">
<div class="col-12 col-md-4"> <div class="col-12 col-md-4">
<%= form.label :date, 'Datum', class: 'form-label' %> <%= form.label :date, 'Datum', class: 'form-label' %>
<%= form.text_field :date, <%= form.text_field :date,
class: 'form-control flatpickr', class: 'form-control flatpickr',
data: { enable_time: false },
data: { enable_time: false, allow_input: true },
value: (form.object.date || Date.today) %> value: (form.object.date || Date.today) %>
</div> </div>
<div class="col-6 col-md-4">
<div class="col-12 col-md-4">
<%= form.label :hours, 'Stunden', class: 'form-label' %> <%= form.label :hours, 'Stunden', class: 'form-label' %>
<%= form.number_field :hours, <%= form.number_field :hours,
class: 'form-control', class: 'form-control',
@ -27,25 +28,28 @@
value: form.object.hours || 0 %> value: form.object.hours || 0 %>
</div> </div>
<div class="col-6 col-md-4">
<div class="col-12 col-md-4">
<%= form.label :minutes, 'Minuten', class: 'form-label' %> <%= form.label :minutes, 'Minuten', class: 'form-label' %>
<%= form.number_field :minutes, <%= form.number_field :minutes,
class: 'form-control', class: 'form-control',
min: 0, max: 59, min: 0, max: 59,
value: form.object.minutes || 0 %> value: form.object.minutes || 0 %>
</div> </div>
</div>
<div class="col-12 col-md-6">
<!-- Weitere Felder: Typ, Art, Entfernung -->
<div class="row g-3 mt-1">
<div class="col-12">
<%= form.label :praktikums_typ, 'Praktikumstyp', class: 'form-label' %> <%= form.label :praktikums_typ, 'Praktikumstyp', class: 'form-label' %>
<%= form.select :praktikums_typ, Entry::PRAKTIKUMSTYPEN, {}, class: 'form-select' %> <%= form.select :praktikums_typ, Entry::PRAKTIKUMSTYPEN, {}, class: 'form-select' %>
</div> </div>
<div class="col-12 col-md-6">
<div class="col-12">
<%= form.label :entry_art, 'Art', class: 'form-label' %> <%= form.label :entry_art, 'Art', class: 'form-label' %>
<%= form.select :entry_art, Entry::ENTRY_ARTEN, {}, class: 'form-select' %> <%= form.select :entry_art, Entry::ENTRY_ARTEN, {}, class: 'form-select' %>
</div> </div>
<div class="col-12 col-md-6">
<div class="col-12">
<%= form.label :distance_km, 'Entfernung (km) Gesamt', class: 'form-label' %> <%= form.label :distance_km, 'Entfernung (km) Gesamt', class: 'form-label' %>
<%= form.number_field :distance_km, <%= form.number_field :distance_km,
class: 'form-control', class: 'form-control',
@ -54,6 +58,7 @@
</div> </div>
</div> </div>
<!-- Buttons -->
<div class="mt-4"> <div class="mt-4">
<%= form.submit 'Speichern', class: 'btn btn-primary' %> <%= form.submit 'Speichern', class: 'btn btn-primary' %>
<%= link_to 'Zurück', entries_path, class: 'btn btn-secondary ms-2' %> <%= link_to 'Zurück', entries_path, class: 'btn btn-secondary ms-2' %>

2
app/views/entries/new.html.erb

@ -1,4 +1,4 @@
<h1>New entry</h1>
<h1>Neuer Zeiteintrag</h1>
<%= render "form", entry: @entry %> <%= render "form", entry: @entry %>

6
app/views/layouts/application.html.erb

@ -23,9 +23,9 @@
<script defer> <script defer>
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function () {
flatpickr(".flatpickr", { flatpickr(".flatpickr", {
altInput: true,
altFormat: "d.m.Y",
dateFormat: "Y-m-d"
dateFormat: "d.m.Y",
allowInput: true
}); });
}); });
</script> </script>

Loading…
Cancel
Save