From 31f7407b35f45ef8942a6ea18bf71f4cfb6bec27 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 13:59:06 +0800
Subject: [PATCH] Update merge.html.erb

---
 app/views/admin/journal_papers/merge.html.erb | 74 +++++++++++++++----
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index 268688e..5caf30b 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -9,32 +9,74 @@
 <tr>
 <th><%= t('personal_journal.paper_title') %></th>
 <th><%= t('personal_journal.journal_title') %></th>
+<% if params['mode']!='simple' %>
+    <th><%= t('personal_journal.level_type') %></th>
+    <th><%= t('personal_journal.author_type') %></th>
+    <th><%= t('personal_journal.paper_type') %></th>
+    <th><%= t('personal_journal.publication_date') %></th>
+<% end %>
 <th><%= t('module_name.personal_journal') %></th>
 </tr>
 </thead>
 <tbody>
-<% if params['mode']=='simple' %>
-<% else %>
-  <% @journals.each do |key,journals| %>
-    <tr>
-      <% len = journals.length %>
-      <td rowspan="<%= len %>">
-        <%= key[0].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
-      </td>
-      <td rowspan="<%= len %>">
-        <%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
-      </td>
-      <% journals.each_with_index do |journal,i| %>
+<% @journals.each do |key,journals| %>
+<tr>
+  <% if params['mode']=='simple'
+        len = journals.length
+     else
+        len = journals.values.reduce(0){|sum,num| sum+num.length}
+  %>
+  <td rowspan="<%= len %>">
+    <%= key[0].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
+  </td>
+  <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' %>
         <td>
           <%= journal %>
         </td>
-        <% if len!=(i+1) %>
-          </tr>
-          <tr>
+      <% else %>
+        <% j=0 %>
+        <% journal.each do |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 %>
       <% end %>
-    </tr>
+      <% if len!=(i+1) %>
+        </tr>
+        <tr>
+      <% end %>
   <% end %>
+</tr>
 <% end %>
 </tbody>
 </table>
\ No newline at end of file