diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb index 04edfeccf..1f38b7435 100644 --- a/app/services/reports/docx/draw_my_module.rb +++ b/app/services/reports/docx/draw_my_module.rb @@ -46,6 +46,9 @@ module Reports::Docx::DrawMyModule text I18n.t('projects.reports.elements.module.status') text ' ' text "[#{status.name}]", color: status.color.delete('#') + if my_module.completed? + text " #{I18n.t('my_modules.states.completed')} #{I18n.l(my_module.completed_on, format: :full)}" + end end @docx.p do diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index 8ab0595e0..5bc476dbe 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -24,25 +24,6 @@ <% end %> - -
- <% if my_module.started_on.present? %> - <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> - <% else %> - <%=t "projects.reports.elements.module.no_start_date" %> - <% end %> -
-
- <% if my_module.due_date.present? %> - <%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %> - <% else %> - <%=t "projects.reports.elements.module.no_due_date" %> - <% end %> - <% if my_module.completed? %> - <%= t("my_modules.states.completed") %> - <%= l(my_module.completed_on, format: :full) %> - <% end %> -

<% if my_module.started_on.present? %> @@ -62,6 +43,12 @@ <% status = my_module.my_module_status %> <%= t("projects.reports.elements.module.status") %> <%= status.name %> + <% if my_module.completed? %> + + <%= t("my_modules.states.completed") %> + <%= l(my_module.completed_on, format: :full) %> + + <% end %>