diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index 49615dc44..b9cd4d9e3 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -305,11 +305,11 @@ label { color: $color-black; } - &.started { - background: $brand-primary; + &.in_progress { + background: var(--sn-alert-bloo); } - &.completed { + &.done { background: $brand-success; } } @@ -356,11 +356,11 @@ label { color: $color-black; } - &.started { - background: $brand-primary; + &.in_progress { + background: var(--sn-alert-bloo); } - &.completed { + &.done { background: $brand-success; } } diff --git a/app/services/reports/docx/draw_experiment.rb b/app/services/reports/docx/draw_experiment.rb index 7f556a117..73c9906ee 100644 --- a/app/services/reports/docx/draw_experiment.rb +++ b/app/services/reports/docx/draw_experiment.rb @@ -37,7 +37,7 @@ module Reports::Docx::DrawExperiment if experiment.due_date.present? @docx.p do - text I18n.t('projects.reports.elements.experiment_header.due_date', + text I18n.t('projects.reports.elements.experiment.due_date', due_date: I18n.l(experiment.due_date, format: :full)) end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 9fe02c432..1cb5a5665 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1016,7 +1016,7 @@ en: status: not_started: "Not started" in_progress: "In progress" - done: "done" + done: "Done" module_activity: name: "Task activity" sidebar_name: "Activity"