Update merge.html.erb

This commit is contained in:
chiu 2019-10-31 20:37:59 +08:00
parent 993333280a
commit bf89b75fde
1 changed files with 32 additions and 1 deletions

View File

@ -1 +1,32 @@
123 <table>
<thead>
<tr>
<th><%= t('personal_journal.paper_title') %></th>
<th><%= t('personal_journal.journal_title') %></th>
<th><%= t('module_name.personal_journal') %></th>
</tr>
</thead>
<tbody>
<% if params['mode']=='simple' %>
<% else %>
<% @journals.each do |key,journals| %>
<tr>
<% len = journals.length %>
<td rowspan="<%= len %>">
<%= key[0].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
</td>
<td rowspan="<%= len %>">
<%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
</td>
<% journals.each_with_index do |journal,i| %>
<%= journal %>
<% if len!=i %>
</tr>
<tr>
<% end %>
<% end %>
<tr>
<% end %>
<% end %>
</tbody>
</table>