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