From ed4363484a2affdad7194334b7397f5cb45421ad Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <gchubinidze@unisens.ge>
Date: Fri, 3 Feb 2023 11:12:33 +0400
Subject: [PATCH 1/3] Step timestamp display [SCI-7837]

---
 app/assets/stylesheets/steps/step.scss | 15 +++++++++++++++
 app/javascript/vue/protocol/step.vue   |  1 +
 app/serializers/step_serializer.rb     | 11 ++++++++++-
 config/locales/en.yml                  |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/steps/step.scss b/app/assets/stylesheets/steps/step.scss
index 3a67cb558..169bdaeca 100644
--- a/app/assets/stylesheets/steps/step.scss
+++ b/app/assets/stylesheets/steps/step.scss
@@ -148,6 +148,21 @@
   .step-elements {
     padding-left: calc(var(--left-component-padding) * 2);
 
+    .step-timestamp {
+      position: relative;
+      margin-left: 34px;
+      width: 356px;
+      height: 15px;
+      font-family: 'Lato';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 10px;
+      line-height: 14px;
+      flex: none;
+      order: 0;
+      flex-grow: 0;
+    }
+
     .step-element-name {
       .sci-inline-edit__view,
       textarea {
diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index d62ed1d72..2303a566c 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -128,6 +128,7 @@
     </div>
     <div class="collapse in" :id="'stepBody' + step.id">
       <div class="step-elements">
+        <div class="step-timestamp">{{ i18n.t('protocols.steps.timestamp', {date: step.attributes.created_on, user: step.attributes.created_by}) }}</div>
         <template v-for="(element, index) in orderedElements">
           <component
             :is="elements[index].attributes.orderable_type"
diff --git a/app/serializers/step_serializer.rb b/app/serializers/step_serializer.rb
index 306bd6eb7..d1e9286c8 100644
--- a/app/serializers/step_serializer.rb
+++ b/app/serializers/step_serializer.rb
@@ -8,7 +8,8 @@ class StepSerializer < ActiveModel::Serializer
 
   attributes :name, :position, :completed, :attachments_manageble, :urls, :assets_view_mode, :assets_order,
              :marvinjs_enabled, :bio_eddie_service_enabled, :bio_eddie_context, :marvinjs_context,
-             :wopi_enabled, :wopi_context, :comments_count, :unseen_comments, :storage_limit
+             :wopi_enabled, :wopi_context, :comments_count, :unseen_comments, :storage_limit, :created_on,
+             :created_by
 
   def bio_eddie_service_enabled
     BioEddieService.enabled?(@instance_options[:user])
@@ -99,4 +100,12 @@ class StepSerializer < ActiveModel::Serializer
 
     urls_list
   end
+
+  def created_on
+    object.created_at.strftime('%B %d, %Y at %H:%M')
+  end
+
+  def created_by
+    object.user.full_name
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 74b3377df..cea7c2752 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2814,6 +2814,7 @@ en:
       component_duplicated: "Step content duplicated successfully."
       step_duplication_failed: "Step could not be duplicated, try again later."
       component_duplication_failed: "Step content could not be duplicated, try again later."
+      timestamp: "Created on %{date} by %{user}"
       status:
         complete: "Mark as done"
         uncomplete: "Unmark as done"

From ac4b0905608976d0b73c0261d4855a8a57bf0138 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <gchubinidze@unisens.ge>
Date: Fri, 3 Feb 2023 13:38:03 +0400
Subject: [PATCH 2/3] slight style refactor

---
 app/assets/stylesheets/steps/step.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/steps/step.scss b/app/assets/stylesheets/steps/step.scss
index 169bdaeca..a747a71db 100644
--- a/app/assets/stylesheets/steps/step.scss
+++ b/app/assets/stylesheets/steps/step.scss
@@ -151,6 +151,7 @@
     .step-timestamp {
       position: relative;
       margin-left: 34px;
+      bottom: 17px;
       width: 356px;
       height: 15px;
       font-family: 'Lato';

From 9595f434d0adb1c747d875873d2b574042470084 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <gchubinidze@unisens.ge>
Date: Sun, 5 Feb 2023 23:00:20 +0400
Subject: [PATCH 3/3] on/at convention fix

---
 app/serializers/step_serializer.rb | 2 +-
 config/locales/en.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/serializers/step_serializer.rb b/app/serializers/step_serializer.rb
index d1e9286c8..44c5d79a7 100644
--- a/app/serializers/step_serializer.rb
+++ b/app/serializers/step_serializer.rb
@@ -101,7 +101,7 @@ class StepSerializer < ActiveModel::Serializer
     urls_list
   end
 
-  def created_on
+  def created_at
     object.created_at.strftime('%B %d, %Y at %H:%M')
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cea7c2752..b695e8c4d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2814,7 +2814,7 @@ en:
       component_duplicated: "Step content duplicated successfully."
       step_duplication_failed: "Step could not be duplicated, try again later."
       component_duplication_failed: "Step content could not be duplicated, try again later."
-      timestamp: "Created on %{date} by %{user}"
+      timestamp: "Created at %{date} by %{user}"
       status:
         complete: "Mark as done"
         uncomplete: "Unmark as done"