Merge df6c140 into b6df3c1

benwbrum · May 10, 2022 · 5ea5b34 · 5ea5b34
2 parents b6df3c1 + df6c140
commit 5ea5b34
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/app/models/work.rb b/app/models/work.rb
@@ -213,7 +213,20 @@ def document_date=(date_as_edtf)
   end
 
   def document_date
-    Date.edtf(self[:document_date])
+    date = Date.edtf(self[:document_date])
+
+    if self[:document_date].nil? # there is no document date
+      return nil
+    elsif date.nil? # the document date is invalid
+      return self[:document_date]
+    # assign date precision based on length of document_date string (edtf-ruby does not do this automatically)
+    elsif self[:document_date].length == 7 # YYYY-MM
+      date.month_precision!
+    elsif self[:document_date].length == 4 and not self[:document_date].include? "x" # YYYY
+      date.year_precision!
+    end
+
+    return date.edtf
   end
 
   def document_date_is_edtf

diff --git a/app/views/work/edit.html.slim b/app/views/work/edit.html.slim
@@ -97,7 +97,7 @@
           td =f.text_field :location_of_composition, value: @work.location_of_composition
         tr
           th =f.label :document_date, 'Document Date'
-          td =f.text_field :document_date, value: @work.document_date
+          td =f.text_field :document_date, value: @work.document_date, placeholder: 'yyyy-mm-dd'
         tr
           th =f.label :genre
           td =f.text_field :genre, value: @work.genre