From b94ddbd303e610534b62582356da5e18b0031a64 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 14:17:01 +0800
Subject: [PATCH] Update merge.html.erb

---
 app/views/admin/journal_papers/merge.html.erb | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index 625538d..0b35fe1 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -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>