Update merge.html.erb
This commit is contained in:
parent
14d8336b57
commit
b94ddbd303
|
@ -33,45 +33,44 @@
|
|||
<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' %>
|
||||
<% if params['mode']=='simple' %>
|
||||
<% journals.each_with_index do |journal,i| %>
|
||||
<td>
|
||||
<%= journal %>
|
||||
</td>
|
||||
<% else %>
|
||||
<% 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 %>">
|
||||
<%= k[0] %>
|
||||
</td>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[1] %>
|
||||
</td>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[2] %>
|
||||
</td>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[3] %>
|
||||
</td>
|
||||
<% v.each_with_index do |journal_child,index1| %>
|
||||
<% len2 = v.length %>
|
||||
<td>
|
||||
<%= journal_child %>
|
||||
</td>
|
||||
<% if len2!=(i+1) %>
|
||||
</tr>
|
||||
<tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if len1!=(j+1) %>
|
||||
</tr>
|
||||
<tr>
|
||||
<% end %>
|
||||
<% j=j+1 %>
|
||||
<% puts ['hello',j,k,v] %>
|
||||
<% len1 = v.length %>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[0] %>
|
||||
</td>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[1] %>
|
||||
</td>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[2] %>
|
||||
</td>
|
||||
<td rowspan="<%= len1 %>">
|
||||
<%= k[3] %>
|
||||
</td>
|
||||
<% v.each_with_index do |journal_child,index1| %>
|
||||
<% len2 = v.length %>
|
||||
<td>
|
||||
<%= journal_child %>
|
||||
</td>
|
||||
<% if len2!=(i+1) %>
|
||||
</tr>
|
||||
<tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if len1!=(j+1) %>
|
||||
</tr>
|
||||
<tr>
|
||||
<% end %>
|
||||
<% j=j+1 %>
|
||||
<% end %>
|
||||
<% if len!=(i+1) %>
|
||||
</tr>
|
||||
|
|
Loading…
Reference in New Issue