From edf46d37c97098e6dd0bae48f9dc4876a1f77d86 Mon Sep 17 00:00:00 2001 From: alexdbondoc17 Date: Wed, 9 Feb 2022 01:13:26 +0000 Subject: [PATCH] Minor Updates 02/09/2022 --- .../document_doctrine_show_component.html.erb | 4 ---- app/views/document/doctrines/show.html.erb | 14 +++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb index 1831b78..26ea660 100644 --- a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb +++ b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb @@ -148,10 +148,6 @@ <% doctrine.annotations.order(rank: :asc).each do |annotation| %>
- <% document_title = annotation.doctrine.document.short_title || annotation.doctrine.document.title %> - <% date_or_year = annotation.doctrine.document.docdate.present? ? annotation.doctrine.document.docdate.to_date.strftime("%B %d, %Y") : annotation.document.year %> - <%= [document_title, annotation.document.reference_number, date_or_year].join(", ") %> -

<%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> <% document_title = annotation.document.short_title || annotation.document.title %> diff --git a/app/views/document/doctrines/show.html.erb b/app/views/document/doctrines/show.html.erb index 5bc64fa..366549b 100644 --- a/app/views/document/doctrines/show.html.erb +++ b/app/views/document/doctrines/show.html.erb @@ -18,6 +18,18 @@

- <%= render(DocumentDoctrineShowComponent.new(current_user: current_user, doctrine: @doctrine, subjects: @subjects)) %> +
+ + +
+ <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: @document.doctrines.new, subjects: @subjects.order(name: :asc), opts: { form_url: jurisprudence_doctrines_path(jurisprudence_id: @document.id), form_method: :post })) %> +
+
+ +
+ <%= render(DocumentDoctrineShowComponent.new(current_user: current_user, doctrine: @doctrine, subjects: @subjects)) %> +