Update merge.html.erb

This commit is contained in:
chiu 2019-11-01 14:17:01 +08:00
parent 14d8336b57
commit b94ddbd303
1 changed files with 33 additions and 34 deletions

View File

@ -33,15 +33,15 @@
<td rowspan="<%= len %>">
<%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
</td>
<% journals.each_with_index do |journal,i| %>
<% if params['mode']=='simple' %>
<% journals.each_with_index do |journal,i| %>
<td>
<%= journal %>
</td>
<% end %>
<% else %>
<% journals.each_with_index do |k,v,i| %>
<% j=0 %>
<% puts ['helpme',journal] %>
<% journal.each do |k,v| %>
<% puts ['hello',j,k,v] %>
<% len1 = v.length %>
<td rowspan="<%= len1 %>">
@ -72,7 +72,6 @@
<% end %>
<% j=j+1 %>
<% end %>
<% end %>
<% if len!=(i+1) %>
</tr>
<tr>