scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-09 13:46:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Update 'Not started' button for reports [SCI-9007]

Browse source
This commit is contained in:
Ivan Kljun 2023-08-24 08:31:07 +02:00
parent 28adb4956d
commit 023a6fe0a8
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/reports/docx/draw_my_module.rb
View file

@ -42,7 +42,7 @@ module Reports::Docx::DrawMyModule
@docx.p do
text I18n.t('projects.reports.elements.module.status')
text ' '
text "[#{status.name}]", color: status.color.delete('#')
text "[#{status.name}]", color: (status.name == 'Not started' ? '000000' : status.color.delete('#'))
if my_module.completed?
text " #{I18n.t('my_modules.states.completed')} #{I18n.l(my_module.completed_on, format: :full)}"
end

3
app/views/reports/elements/_my_module_element.html.erb
View file

@ -25,7 +25,8 @@
<p class="module-status">
<% status = my_module.my_module_status %>
<%= t('projects.reports.elements.module.status') %>
<span class="status-block" style="background: <%= status.color %>">
<span class="status-block" style="background: <%= status.color %>;
<%= 'color: #000000;' if status.name == 'Not started' %>">
<%= status.name %>
</span>
<% if my_module.completed? %>