From 8d2a3225fd8253768df1e06aa2aa6304127c1972 Mon Sep 17 00:00:00 2001
From: Keith <chihkai331@gmail.com.tw>
Date: Wed, 22 Feb 2017 15:35:03 +0800
Subject: [PATCH] Modified some page

---
 app/views/admin/memberlogs/_memberlogs.html.erb |  5 +++--
 app/views/admin/memberlogs/index.html.erb       | 14 +++++++-------
 app/views/admin/memberlogs/show.html.erb        |  2 +-
 app/views/plugin/memberlog/_profile.html.erb    | 16 +++++++++-------
 config/locales/en.yml                           |  1 +
 config/locales/zh_tw.yml                        |  1 +
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/views/admin/memberlogs/_memberlogs.html.erb b/app/views/admin/memberlogs/_memberlogs.html.erb
index a39741e..176c255 100644
--- a/app/views/admin/memberlogs/_memberlogs.html.erb
+++ b/app/views/admin/memberlogs/_memberlogs.html.erb
@@ -1,7 +1,8 @@
 <% @memberlogs.each do |memberlog| %>
 	<tr id="<%= dom_id memberlog %>" class="with_action">
-	  <td class="span2"><%= memberlog.member_profile.name rescue "" %></td>		
-		<td class="span2"><%= memberlog.created_at.strftime('%Y-%m-%d (%a) %R') %></td>
+	  <td class="span2"><%= memberlog.member_profile.name rescue "" %></td>	
+	  <td class="span2"><%= memberlog.created_at.strftime('%Y/%m/%d (%a)') %>	
+		<td><%= memberlog.created_at.strftime('%R') %></td>
 		<td>
 			<% if memberlog.finish == true %>
 				<%= memberlog.checkout.strftime('%R') %></td>
diff --git a/app/views/admin/memberlogs/index.html.erb b/app/views/admin/memberlogs/index.html.erb
index d4a85bb..bf86d7c 100644
--- a/app/views/admin/memberlogs/index.html.erb
+++ b/app/views/admin/memberlogs/index.html.erb
@@ -4,8 +4,8 @@
   		<ul>
   			<%= b.member_profile.name %>
   			【<%= b.dayoff_description %>】
-  			<%= b.start_dayoff.strftime('%Y-%m-%d') %>~
-  			<%= b.end_dayoff.strftime('%Y-%m-%d') %>
+  			<%= b.start_dayoff.strftime('%Y/%m/%d') %>~
+  			<%= b.end_dayoff.strftime('%Y/%m/%d') %>
   		</ul>
   	<% end %>
   <% end %>
@@ -13,12 +13,12 @@
 <table class="table main-list">
 	<thead>
 		<tr>
-			<th class="span1"><%= t("memberlog.staff") %></th>
-			<th class="span3"><%= t('memberlog.checkin') %></th>
+			<th class="span1"><%= t('memberlog.staff') %></th>
+			<th class="span3"><%= t('memberlog.date') %></th>
+			<th class="span2"><%= t('memberlog.checkin') %></th>
 			<th class="span2"><%= t('memberlog.checkout') %></th>
-			<th class="span4"><%= t('memberlog.todo') %></th>
-			<th class="span3"><%= t('memberlog.excuse') %></th>
-			
+			<th class="span2"><%= t('memberlog.todo') %></th>
+			<th class="span5"><%= t('memberlog.excuse') %></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_writing_journals" class="sort-holder">
diff --git a/app/views/admin/memberlogs/show.html.erb b/app/views/admin/memberlogs/show.html.erb
index b9acb54..b7444b2 100644
--- a/app/views/admin/memberlogs/show.html.erb
+++ b/app/views/admin/memberlogs/show.html.erb
@@ -38,7 +38,7 @@
 				<% if @memberlog.finish == true %>
 					<%= @memberlog.checkout.strftime('%Y-%m-%d %R') %>
 				<% else %>
-					<span class="label label-warning">Working....</span>	
+					<span class="label label-warning"><%= t('memberlog.working') %></span>	
 				<% end %>
 			</td>
 		</tr>
diff --git a/app/views/plugin/memberlog/_profile.html.erb b/app/views/plugin/memberlog/_profile.html.erb
index 78e0eb7..fcbcbd8 100644
--- a/app/views/plugin/memberlog/_profile.html.erb
+++ b/app/views/plugin/memberlog/_profile.html.erb
@@ -20,8 +20,8 @@
     <% if Time.now.to_date <= b.end_dayoff.to_date+40 %>
       <ul>
         【<%= b.dayoff_description %>】
-        <%= b.start_dayoff.strftime('%Y-%m-%d') %>~
-        <%= b.end_dayoff.strftime('%Y-%m-%d') %>
+        <%= b.start_dayoff.strftime('%Y/%m/%d') %>~
+        <%= b.end_dayoff.strftime('%Y/%m/%d') %>
         <%= link_to content_tag(:i, nil, :class => 'icon-edit') +' '+ t('edit'),'/admin/members/'+@member.to_param+'/dayoffs/'+b.id+'/edit', :class => "btn btn-danger btn-mini"%>
      <!--    <%= link_to content_tag(:i, nil, :class => 'icons-trash') +' '+ t(:delete_), admin_dayoff_path(id: b.id, member_profile_id: @member.id), :class => "btn btn-danger btn-mini", method: :delete, remote: true, data: { confirm: t('sure?') } %>
  -->
@@ -36,8 +36,9 @@
       <!-- <% if has_access? %> -->
         <!-- <th><input type="checkbox" /></th> -->
       <!-- <% end -%> -->
-      <th class="span2"><%= t('memberlog.checkin') %></th>
-      <th class="span2"><%= t('memberlog.checkout') %></th>
+      <th class="span2"><%= t('memberlog.date') %></th>
+      <th class="span1"><%= t('memberlog.checkin') %></th>
+      <th class="span1"><%= t('memberlog.checkout') %></th>
       <th class="span3"><%= t('memberlog.excuse') %></th>
     </tr>
   </thead>
@@ -45,7 +46,7 @@
     <% @memberlogs.each do |memberlog| %> 
       <tr id="<%= dom_id memberlog %>">
         <td>
-          <%= link_to memberlog.created_at.strftime('%Y-%m-%d (%a) %R'), admin_memberlog_path(memberlog.id), :data => {"target" => "#logModal", "toggle" => "modal"} %>
+          <%= link_to memberlog.created_at.strftime('%Y-%m-%d (%a)'), admin_memberlog_path(memberlog.id), :data => {"target" => "#logModal", "toggle" => "modal"} %>
 
           <div class="quick-edit">
             <ul class="nav nav-pills hide">
@@ -56,11 +57,12 @@
             </ul>
           </div>
         </td>
+        <td><%= memberlog.created_at.strftime('%R') %></td>
         <td>
           <% if memberlog.finish == true %>
-            <%= memberlog.checkout.strftime('%m-%d %R') %></td>
+            <%= memberlog.checkout.strftime('%R') %></td>
           <% else %>
-            <span class="label label-warning">Working....</span>
+            <span class="label label-warning"><%= t('memberlog.working') %></span>
           <% end %>
         </td> 
         <td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93dc3c2..41f4938 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -13,3 +13,4 @@ en:
     start_dayoff: Start Dayoff
     end_dayoff: End Dayoff
     status: Status
+    date: Date
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index aeac400..986367a 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -13,3 +13,4 @@ zh_tw:
     start_dayoff: 休假開始日期
     end_dayoff: 休假結束日期
     status: 狀態
+    date: 出勤日期