scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication

Browse source 
Remove notes duplication [SCI-4988]
This commit is contained in:
Urban Rotnik 2020-09-09 11:29:10 +02:00 committed by GitHub
parent 84682c6346 9066586149
commit 9419a16df5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -24,37 +24,6 @@
<% end %>
</h4>
</div>
<div class="pull-right module-start-date">
<% if my_module.started_on.present? %>
<%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %>
<% else %>
<em><%=t "projects.reports.elements.module.no_start_date" %></em>
<% end %>
</div>
<div class="pull-right module-due-date">
<% if my_module.due_date.present? %>
<%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %>
<% else %>
<em><%=t "projects.reports.elements.module.no_due_date" %></em>
<% end %>
<% if my_module.completed? %>
<%= t("my_modules.states.completed") %>
<%= l(my_module.completed_on, format: :full) %>
<% end %>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<% if my_module.description.present? %>
<%= custom_auto_link(my_module.prepare_for_report(:description, for_export_all),
team: current_team,
simple_format: false,
base64_encoded_imgs: for_export_all) %>
<% else %>
<em><%=t "projects.reports.elements.module.no_description" %></em>
<% end %>
</div>
</div>
<p class="module-start-date">
<% if my_module.started_on.present? %>
@ -74,6 +43,12 @@
<% status = my_module.my_module_status %>
<%= t("projects.reports.elements.module.status") %>
<span class="status-block" style="background: <%= status.color %>"><%= status.name %></span>
<% if my_module.completed? %>
<span style="margin-left: 10px;">
<%= t("my_modules.states.completed") %>
<%= l(my_module.completed_on, format: :full) %>
</span>
<% end %>
</p>
<div class="row module-tags">
<div class="pull-left">
@ -96,9 +71,10 @@
<% if my_module.description.present? %>
<%= custom_auto_link(my_module.prepare_for_report(:description, for_export_all),
team: current_team,
simple_format: false,
base64_encoded_imgs: for_export_all) %>
<% else %>
<em><%= t("projects.reports.elements.module.no_description") %></em>
<em><%= t("projects.reports.elements.module.no_description") %></em>
<% end %>
</div>
</div>