Update merge.html.erb

This commit is contained in:
chiu 2019-11-01 14:30:18 +08:00
parent 53f74e9cf2
commit 02dd7f5c1b
1 changed files with 3 additions and 8 deletions

View File

@ -46,8 +46,6 @@
<% else %> <% else %>
<% i=0 %> <% i=0 %>
<% journals.each do |k,v| %> <% journals.each do |k,v| %>
<% j=0 %>
<% puts ['hello',j,k,v] %>
<% len1 = v.length %> <% len1 = v.length %>
<td rowspan="<%= len1 %>"> <td rowspan="<%= len1 %>">
<%= k[0] %> <%= k[0] %>
@ -62,22 +60,19 @@
<%= k[3] %> <%= k[3] %>
</td> </td>
<% v.each_with_index do |journal_child,index1| %> <% v.each_with_index do |journal_child,index1| %>
<% len2 = v.length %>
<td> <td>
<%= journal_child %> <%= journal_child %>
</td> </td>
<% if len2!=(i+1) %> <% if len1!=index1 %>
</tr> </tr>
<tr> <tr>
<% end %> <% end %>
<% end %> <% end %>
<% if len1!=(j+1) %> <% if len1!=(i+1) %>
</tr> </tr>
<tr> <tr>
<% end %> <% end %>
<% j=j+1 <% i =i+1 %>
i =i+1
%>
<% end %> <% end %>
<% end %> <% end %>
</tr> </tr>