Merge pull request #1765 from sparc-request/sry-adding_date_to_previo…

…usly_sent_survey SRY - Fixing survey latest sent date errors
sparc-request · Apr 5, 2019 · d538458 · d538458
2 parents eb30829 + 713c485
commit d538458
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/models/sub_service_request.rb b/app/models/sub_service_request.rb
@@ -453,7 +453,8 @@ def surveys_completed?
   end
 
   def survey_latest_sent_date
-    self.responses.joins(:survey).where(surveys: { type: 'SystemSurvey' }).first.updated_at
+    survey_response = self.responses.joins(:survey).where(surveys: { type: 'SystemSurvey' })
+    survey_response.any? ? survey_response.first.updated_at.try(:strftime, '%D') : 'N/A'
   end
 
   ###############################

diff --git a/app/views/dashboard/sub_service_requests/_request_details.html.haml b/app/views/dashboard/sub_service_requests/_request_details.html.haml
@@ -39,7 +39,7 @@
         - if sub_service_request.is_complete? && !sub_service_request.surveys_completed?
           %td.text-center
             %span
-              = I18n.t('dashboard.sub_service_requests.tabs.request_details.options.last_sent', date: format_date(sub_service_request.survey_latest_sent_date))
+              = I18n.t('dashboard.sub_service_requests.tabs.request_details.options.last_sent', date: sub_service_request.survey_latest_sent_date)
             %button.btn.btn-sm.btn-primary#resend-surveys-button{ data: { sub_service_request_id: sub_service_request.id } }
               = t(:dashboard)[:sub_service_requests][:tabs][:request_details][:options][:resend_surveys]
         - if !sub_service_request.in_work_fulfillment

diff --git a/config/locales/dashboard.en.yml b/config/locales/dashboard.en.yml
@@ -378,7 +378,7 @@ en:
             send_to_epic: "Send to Epic"
             core_approvals: "Administrative Approvals"
             export_to_excel: "Export to Excel"
-            last_sent: "Surveys last sent on %{date}"
+            last_sent: "Survey last sent on: %{date}"
             resend_surveys: "Resend Surveys"
             delete_request: "Delete Request"
           timeline: