Merge pull request #2063 from MushroomObserver/nimmo-field_slip-templ…

…ates Field Slips - Adjust form templates
MushroomObserver · Mar 25, 2024 · 246e7d4 · 246e7d4
2 parents 87c26c0 + ba3b56e
commit 246e7d4
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 69 deletions.
diff --git a/app/views/field_slips/_field_slip.html.erb → ...trollers/field_slips/_field_slip.html.erb b/app/views/field_slips/_field_slip.html.erb → ...trollers/field_slips/_field_slip.html.erb
@@ -16,7 +16,8 @@
       <%= link_to(field_slip.observation.unique_format_name.t, observation_path(field_slip.observation)) %>
       <ul class="row list-unstyled">
         <%= render(partial: "shared/matrix_box",
-                   locals: { object: field_slip.observation, columns: "col-xs-12" }) %>
+                   locals: { object: field_slip.observation,
+                             columns: "col-xs-12" }) %>
       </ul>
     <% else %>
       <%= :field_slip_no_observation.t %>

diff --git a/...ews/field_slips/_field_slip.json.jbuilder → ...ers/field_slips/_field_slip.json.jbuilder b/...ews/field_slips/_field_slip.json.jbuilder → ...ers/field_slips/_field_slip.json.jbuilder
diff --git a/app/views/controllers/field_slips/_form.html.erb b/app/views/controllers/field_slips/_form.html.erb
@@ -0,0 +1,48 @@
+<%
+action = controller.action_name
+%>
+
+<%= form_with(model: field_slip) do |form| %>
+  <% if field_slip.errors.any? %>
+    <div class="alert alert-danger">
+      <%= "#{pluralize(field_slip.errors.count,
+        :error.t, plural: :errors.t)} #{:field_slip_errors.t}" %>:
+      <ul>
+        <% field_slip.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= text_field_with_label(form: form, field: :code) %>
+
+  <% if @field_slip.projects %>
+    <%= select_with_label(form: form, field: :project_id,
+                          options: @field_slip.projects) %>
+  <% end %>
+
+  <%= submit_button(form: form, button: :field_slip_create_obs.t,
+                    class: "mt-5") if action == "new" %>
+
+  <div class="row mt-5">
+    <% if field_slip.observation %>
+      <div class="col-sm-6">
+        <%= render(partial: "field_slips/obs_thumbnail",
+                   locals: { obs: field_slip.observation, form: form,
+                             button: :field_slip_keep_obs.t }) %>
+      </div>
+    <% end %>
+    <% if last_observation %>
+      <div class="col-sm-6">
+        <%= render(partial: "field_slips/obs_thumbnail",
+                   locals: { obs: last_observation, form: form,
+                             button: :field_slip_last_obs.t }) %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= submit_button(form: form, button: :field_slip_create_obs.t,
+                    class: "my-5") if action == "edit" %>
+
+<% end %>
diff --git a/app/views/controllers/field_slips/_obs_thumbnail.erb b/app/views/controllers/field_slips/_obs_thumbnail.erb
@@ -0,0 +1,12 @@
+  <%= tag.div(class: "panel panel-default") do
+    concat(panel_block_heading(
+      heading: submit_button(form: form, button: button)
+    ))
+    concat(tag.div(class: "thumbnail-container") do
+      interactive_image(obs.thumb_image_id, votes: false,
+                        image_link: observation_path(obs))
+    end) if obs.thumb_image_id.present?
+    concat(tag.div(class: "panel-body") do
+      link_to(obs.unique_format_name.t, observation_path(obs))
+    end)
+  end %>
diff --git a/app/views/field_slips/edit.html.erb → ...ews/controllers/field_slips/edit.html.erb b/app/views/field_slips/edit.html.erb → ...ews/controllers/field_slips/edit.html.erb
diff --git a/app/views/field_slips/index.html.erb → ...ws/controllers/field_slips/index.html.erb b/app/views/field_slips/index.html.erb → ...ws/controllers/field_slips/index.html.erb
diff --git a/app/views/field_slips/index.json.jbuilder → ...ntrollers/field_slips/index.json.jbuilder b/app/views/field_slips/index.json.jbuilder → ...ntrollers/field_slips/index.json.jbuilder
diff --git a/app/views/field_slips/new.html.erb → ...iews/controllers/field_slips/new.html.erb b/app/views/field_slips/new.html.erb → ...iews/controllers/field_slips/new.html.erb
diff --git a/app/views/field_slips/show.html.erb → ...ews/controllers/field_slips/show.html.erb b/app/views/field_slips/show.html.erb → ...ews/controllers/field_slips/show.html.erb
diff --git a/app/views/field_slips/show.json.jbuilder → ...ontrollers/field_slips/show.json.jbuilder b/app/views/field_slips/show.json.jbuilder → ...ontrollers/field_slips/show.json.jbuilder
diff --git a/app/views/controllers/shared/_matrix_box.erb b/app/views/controllers/shared/_matrix_box.erb
@@ -18,19 +18,28 @@ if presenter
   else
     image_args = {}
   end
+  header_components = passed_args[:header].presence || []
+  footer_components =
+    if passed_args[:footer] == false
+      []
+    else
+      passed_args[:footer].presence ||
+      [matrix_box_log_footer(presenter),
+       matrix_box_identify_footer(identify, presenter.id)]
+    end
   %>
 
   <%= matrix_box(columns: columns, id: object_id) do
     tag.div(class: "panel panel-default") do
       [
+        *header_components,
         tag.div(class: "panel-sizing") do
           [
             matrix_box_image(image, **image_args),
             matrix_box_details(presenter, object_id, identify),
           ].safe_join
         end,
-        matrix_box_log_footer(presenter),
-        matrix_box_identify_footer(identify, presenter.id)
+        *footer_components
       ].safe_join
     end
   end %><!-- .matrix-box -->

diff --git a/app/views/field_slips/_form.html.erb b/app/views/field_slips/_form.html.erb
diff --git a/config/locales/en.txt b/config/locales/en.txt
@@ -2772,7 +2772,7 @@
   field_slip_editing: Editing Field Slip
   field_slip_errors: prohibited this field_slip from being saved
   field_slip_index: Back to field slips
-  field_slip_keep_obs: Keep Above
+  field_slip_keep_obs: Keep Current
   field_slip_last_obs: Use Last Observation
   field_slip_new: Record Field Slip
   field_slip_no_observation: Observation not found