Fix log time datetime fields

Author: Jens Schmidt

app/views/brews/_form.html.erb

@@ -34,8 +34,6 @@
     </div>
   <% end %>
 
-  <%= render "brews/occurred_at_field", form: %>
-
   <% if brew.quick_drip? %>
     <%= render "brews/quick_drip_form_fields", form:, brew: %>
   <% else %>
@@ -47,5 +45,7 @@
       hide_brew_field: %>
   <% end %>
 
+  <%= render "brews/occurred_at_field", form: %>
+
   <%= form.submit submit_label, class: "rounded-2xl bg-[var(--rn-coffee)] px-5 py-3 text-sm font-extrabold text-[#fff8e8] shadow-lg hover:opacity-90" %>
 <% end %>

app/views/brews/_occurred_at_field.html.erb

@@ -2,6 +2,6 @@
   <h2 class="text-sm font-extrabold uppercase tracking-[0.08em] text-rn-muted"><%= t("brews.form.sections.log_time") %></h2>
   <div class="mt-3 min-w-0 overflow-hidden">
     <%= form.label :occurred_at, t("brews.form.occurred_at"), class: "block text-sm font-bold text-rn-muted" %>
-    <%= form.datetime_local_field :occurred_at, required: true, class: "mt-1 block min-w-0 max-w-full w-full rounded-2xl border border-rn-line bg-[var(--rn-canvas)] px-3 py-3 text-rn-ink shadow-sm focus:border-[var(--rn-accent-strong)] focus:outline-none rn-datetime-input" %>
+    <%= form.datetime_local_field :occurred_at, required: true, step: 1, class: "mt-1 block min-w-0 max-w-full w-full rounded-2xl border border-rn-line bg-[var(--rn-canvas)] px-3 py-3 text-rn-ink shadow-sm focus:border-[var(--rn-accent-strong)] focus:outline-none rn-datetime-input" %>
   </div>
 </section>

app/views/external_coffees/_form.html.erb

@@ -29,11 +29,6 @@
         <%= form.text_field :drink_size, class: input_class %>
       </div>
 
-      <div data-testid="external-coffee-occurred-at-field" class="min-w-0 overflow-hidden">
-        <%= form.label :occurred_at, t(".occurred_at"), class: label_class %>
-        <%= form.datetime_local_field :occurred_at, required: true, class: "#{input_class} rn-datetime-input" %>
-      </div>
-
       <div class="min-w-0">
         <%= form.label :price, t(".price"), class: label_class %>
         <div class="mt-1 grid grid-cols-[minmax(0,1fr)_5rem] gap-2">
@@ -148,5 +143,14 @@
     section_class:,
     section_title_class: %>
 
+  <section class="<%= section_class %>">
+    <h2 class="<%= section_title_class %>"><%= t(".sections.log_time") %></h2>
+
+    <div data-testid="external-coffee-occurred-at-field" class="min-w-0 overflow-hidden">
+      <%= form.label :occurred_at, t(".occurred_at"), class: label_class %>
+      <%= form.datetime_local_field :occurred_at, required: true, step: 1, class: "#{input_class} rn-datetime-input" %>
+    </div>
+  </section>
+
   <%= form.submit submit_label, class: "rounded-2xl bg-[var(--rn-coffee)] px-5 py-3 text-sm font-extrabold text-[#fff8e8] shadow-lg hover:opacity-90" %>
 <% end %>

config/locales/en.yml

@@ -591,6 +591,7 @@ en:
       rating: "Rating"
       sections:
         drink: "Drink"
+        log_time: "Log time"
         notes: "Notes and photos"
         place: "Place"
         taste: "Taste"

test/controllers/brews_controller_test.rb

@@ -30,14 +30,32 @@ class BrewsControllerTest < ActionDispatch::IntegrationTest
     assert_select "input[name=?][value=?]", "brew[preinfusion_seconds]", "5"
     assert_select "input[name=?][value=?]", "brew[first_drip_seconds]", "8", count: 0
     assert_select "input[name=?][value=?][checked]", "brew[rating]", "4", count: 0
-    assert_select "input[type=datetime-local][name=?][required=required]", "brew[occurred_at]"
+    assert_select "input[type=datetime-local][name=?][required=required][step=?]", "brew[occurred_at]", "1"
     assert_select "textarea[name=?]", "brew[notes]", text: ""
     assert_select "input[type=checkbox][name=?][value=?][checked]", "brew[preparation_tool_ids][]", preparation_tools(:wdt).id.to_s
     assert_select "input[type=checkbox][name=?][value=?]", "brew[preparation_tool_ids][]", preparation_tools(:puck_screen).id.to_s
     assert_select "input[type=checkbox][name=?][value=?]", "brew[preparation_tool_ids][]", preparation_tools(:other_workspace_tool).id.to_s, count: 0
     assert_select "input[type=file][name=?][multiple=multiple]", "brew[photos][]"
   end
 
+  test "new places brew log time at the end of the form" do
+    sign_in_as(users(:one))
+
+    get new_brew_path
+
+    assert_response :success
+    form_body = Nokogiri::HTML(response.body).at_css("form[action='#{brews_path}']").inner_html
+    log_time_index = form_body.index('data-section="log-time"')
+    record_links_index = form_body.index('data-testid="record-links-fields"')
+    submit_index = form_body.index('type="submit"')
+
+    assert_not_nil log_time_index
+    assert_not_nil record_links_index
+    assert_not_nil submit_index
+    assert_operator log_time_index, :>, record_links_index
+    assert_operator log_time_index, :<, submit_index
+  end
+
   test "new falls back to household last brew defaults for a user without household brews" do
     user = users(:two)
     user.update!(active_workspace: workspaces(:household))
@@ -113,7 +131,7 @@ class BrewsControllerTest < ActionDispatch::IntegrationTest
     get new_brew_path(method: "quick_drip")
 
     assert_response :success
-    assert_select "input[type=datetime-local][name=?][required=required]", "brew[occurred_at]"
+    assert_select "input[type=datetime-local][name=?][required=required][step=?]", "brew[occurred_at]", "1"
     assert_select "input[name=?][autofocus]", "brew[machine_cups]"
     assert_select "input[type=text][inputmode=decimal][name=?]", "brew[machine_cups]"
     assert_select "input[type=text][inputmode=decimal][name=?]", "brew[coffee_spoons]"
@@ -666,14 +684,19 @@ class BrewsControllerTest < ActionDispatch::IntegrationTest
   test "writer can update brew log time and inventory adjustment time" do
     sign_in_as(users(:one))
     brew = brews(:morning_espresso)
-    new_time = Time.zone.local(2026, 5, 27, 10, 15, 0)
+    new_time = Time.zone.local(2026, 5, 27, 10, 15, 28)
+
+    get edit_brew_path(brew)
+
+    assert_response :success
+    assert_select "input[type=datetime-local][name=?][required=required][step=?]", "brew[occurred_at]", "1"
 
     patch brew_path(brew), params: {
       brew: {
         bean_id: brew.bean.id,
         grinder_id: brew.grinder.id,
         machine_id: brew.machine.id,
-        occurred_at: "2026-05-27T10:15",
+        occurred_at: "2026-05-27T10:15:28",
         bean_weight_grams: brew.bean_weight_grams.to_s,
         ground_weight_grams: brew.ground_weight_grams.to_s,
         dose_grams: brew.dose_grams.to_s,

test/controllers/external_coffees_controller_test.rb

@@ -20,14 +20,32 @@ class ExternalCoffeesControllerTest < ActionDispatch::IntegrationTest
     assert_select "input[name=?]", "external_coffee[place_name]"
     assert_select "input[name=?]", "external_coffee[price]"
     assert_select "[data-testid=external-coffee-occurred-at-field].overflow-hidden"
-    assert_select "input[type=datetime-local][name=?].rn-datetime-input.min-w-0.max-w-full", "external_coffee[occurred_at]"
+    assert_select "input[type=datetime-local][name=?][step=?].rn-datetime-input.min-w-0.max-w-full", "external_coffee[occurred_at]", "1"
     assert_select "textarea[name=?]", "external_coffee[notes]"
     assert_select "textarea[name=?]", "external_coffee[public_note]"
     assert_select "input[type=file][name=?][multiple=multiple][data-testid=photo-upload-input]", "external_coffee[photos][]"
     assert_select "input[type=hidden][name=?]", "external_coffee[photos][]", count: 0
     assert_select "[data-controller=external-coffee-location][data-insecure-message]"
   end
 
+  test "new places external coffee log time at the end of the form" do
+    sign_in_as(users(:one))
+
+    get new_external_coffee_path
+
+    assert_response :success
+    form_body = Nokogiri::HTML(response.body).at_css("form[action='#{external_coffees_path}']").inner_html
+    log_time_index = form_body.index('data-testid="external-coffee-occurred-at-field"')
+    record_links_index = form_body.index('data-testid="record-links-fields"')
+    submit_index = form_body.index('type="submit"')
+
+    assert_not_nil log_time_index
+    assert_not_nil record_links_index
+    assert_not_nil submit_index
+    assert_operator log_time_index, :>, record_links_index
+    assert_operator log_time_index, :<, submit_index
+  end
+
   test "new renders external taste and rating as styled choices" do
     sign_in_as(users(:one))
 
@@ -124,18 +142,18 @@ class ExternalCoffeesControllerTest < ActionDispatch::IntegrationTest
     get edit_external_coffee_path(coffee)
 
     assert_response :success
-    assert_select "input[type=datetime-local][name=?][required=required]", "external_coffee[occurred_at]"
+    assert_select "input[type=datetime-local][name=?][required=required][step=?]", "external_coffee[occurred_at]", "1"
 
     patch external_coffee_path(coffee), params: {
       external_coffee: {
         drink_type: "Americano",
-        occurred_at: "2026-06-08T14:45",
+        occurred_at: "2026-06-08T14:45:28",
         currency: "EUR"
       }
     }
 
     assert_redirected_to external_coffee_path(coffee)
-    assert_equal Time.zone.local(2026, 6, 8, 14, 45, 0), coffee.reload.occurred_at
+    assert_equal Time.zone.local(2026, 6, 8, 14, 45, 28), coffee.reload.occurred_at
   end
 
   test "show hero card renders brand mark identity images footer timestamp bean rating and symbol price" do