From 35fb4a4893633322072acca9448d2d3f1d32f8f3 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 8 Nov 2022 15:00:22 -0500 Subject: [PATCH 01/19] add error message and update saving message for plan writing --- Gemfile.lock | 5 ++++- app/views/answers/_status.html.erb | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 575e507936..993eeec238 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,6 +268,8 @@ GEM mysql2 (0.5.4) nenv (0.3.0) nio4r (2.5.8) + nokogiri (1.13.9-arm64-darwin) + racc (~> 1.4) nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) @@ -498,6 +500,7 @@ GEM zeitwerk (2.6.1) PLATFORMS + arm64-darwin-22 x86_64-linux DEPENDENCIES @@ -580,4 +583,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.15 + 2.3.25 diff --git a/app/views/answers/_status.html.erb b/app/views/answers/_status.html.erb index bf893365a2..fcda55c68a 100644 --- a/app/views/answers/_status.html.erb +++ b/app/views/answers/_status.html.erb @@ -2,8 +2,24 @@ - - +<% + helpdesk_email = Rails.configuration.x.organisation.helpdesk_email + email_subject = _('Plan writing error related to %{tool_name}') %{ :tool_name => tool_name } +%> + + <% if answer.answered? %> <%= _('Answered')%> From ade7f8c104d7e75a5245f4e10449ffced1db52b8 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 8 Nov 2022 15:09:42 -0500 Subject: [PATCH 02/19] use yellow or warnign for saving process --- app/views/answers/_status.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/answers/_status.html.erb b/app/views/answers/_status.html.erb index fcda55c68a..9d25e9ef83 100644 --- a/app/views/answers/_status.html.erb +++ b/app/views/answers/_status.html.erb @@ -6,15 +6,15 @@ helpdesk_email = Rails.configuration.x.organisation.helpdesk_email email_subject = _('Plan writing error related to %{tool_name}') %{ :tool_name => tool_name } %> -