From b8d9b2dafa76697a114be7b610dd165fa97861d6 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 18 Mar 2025 13:10:26 +0100
Subject: [PATCH] Add timestamps and update n/a position on form field
 [SCI-11690][SCI-11652]

---
 app/javascript/vue/forms/field.vue             | 6 +++++-
 app/serializers/form_field_value_serializer.rb | 4 ++++
 config/locales/en.yml                          | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/forms/field.vue b/app/javascript/vue/forms/field.vue
index 6ac889e99..9e20d64f1 100644
--- a/app/javascript/vue/forms/field.vue
+++ b/app/javascript/vue/forms/field.vue
@@ -14,9 +14,13 @@
                  :field="field" :marked_as_na="markAsNa" @save="saveValue" @validChanged="checkValidField" />
     </div>
   </div>
-  <div v-if="field.attributes.allow_not_applicable" class="flex items-end mt-4">
+  <div class="flex items-center justify-end mt-4 gap-4">
+    <span class="text-sn-grey-700 text-xs" v-if="field.field_value && field.field_value.submitted_at">
+      {{  i18n.t('forms.fields.submitted_by', { date: field.field_value.submitted_at, user: field.field_value.submitted_by_full_name}) }}
+    </span>
     <button class="btn btn-secondary mb-0.5"
             :disabled="disabled"
+            v-if="field.attributes.allow_not_applicable"
             :class="{
               '!bg-sn-super-light-blue !border-sn-blue': markAsNa && !disabled
             }"
diff --git a/app/serializers/form_field_value_serializer.rb b/app/serializers/form_field_value_serializer.rb
index fa0bbe7a5..7b633e83d 100644
--- a/app/serializers/form_field_value_serializer.rb
+++ b/app/serializers/form_field_value_serializer.rb
@@ -9,4 +9,8 @@ class FormFieldValueSerializer < ActiveModel::Serializer
   def submitted_by_full_name
     object.submitted_by.full_name
   end
+
+  def submitted_at
+    I18n.l(object.submitted_at, format: :full) if object.submitted_at
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8ab5ed6f4..1a98d5a0f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1087,6 +1087,7 @@ en:
       add_text: "Add text"
       add_number: "Add number"
       from: "From"
+      submitted_by: "%{date} by %{user}"
       to: "To"
       add_date: "Add date"
       add_datetime: "Add date & time"