From bf89b75fde90c193d85386fcc68bbf04d4dedb25 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Thu, 31 Oct 2019 20:37:59 +0800
Subject: [PATCH] Update merge.html.erb

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

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index d800886..c1e0758 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -1 +1,32 @@
-123
\ No newline at end of file
+<table>
+<thead>
+<tr>
+<th><%= t('personal_journal.paper_title') %></th>
+<th><%= t('personal_journal.journal_title') %></th>
+<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| %>
+        <%= journal %>
+        <% if len!=i %>
+          </tr>
+          <tr>
+        <% end %>
+      <% end %>
+    <tr>
+  <% end %>
+<% end %>
+</tbody>
+</table>
\ No newline at end of file