From 5aa63ea6cd6545d5d962dbcac5f3352b05a18be5 Mon Sep 17 00:00:00 2001
From: Keith <chihkai331@gmail.com.tw>
Date: Wed, 22 Feb 2017 19:00:53 +0800
Subject: [PATCH] fixed some issue

---
 app/models/member_log.rb                      |  1 +
 .../admin/memberlogs/_memberlogs.html.erb     | 21 ++++++++------
 app/views/admin/memberlogs/index.html.erb     |  3 +-
 app/views/admin/memberlogs/show.html.erb      | 23 +++++++++------
 app/views/plugin/memberlog/_profile.html.erb  | 28 +++++++++----------
 config/locales/en.yml                         |  2 ++
 config/locales/zh_tw.yml                      |  2 ++
 7 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/app/models/member_log.rb b/app/models/member_log.rb
index 582781a..9da3aaa 100644
--- a/app/models/member_log.rb
+++ b/app/models/member_log.rb
@@ -10,6 +10,7 @@ class MemberLog
   field :excuse, localize: true
   field :finish, :type => Boolean, :default => false
   field :checkout, :type => DateTime
+  field :dayoff, :type => Boolean, :default => false
 
  	belongs_to :member_profile
   has_many :dayoffs
diff --git a/app/views/admin/memberlogs/_memberlogs.html.erb b/app/views/admin/memberlogs/_memberlogs.html.erb
index 176c255..9125b83 100644
--- a/app/views/admin/memberlogs/_memberlogs.html.erb
+++ b/app/views/admin/memberlogs/_memberlogs.html.erb
@@ -2,14 +2,17 @@
 	<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)') %>	
-		<td><%= memberlog.created_at.strftime('%R') %></td>
-		<td>
-			<% if memberlog.finish == true %>
-				<%= memberlog.checkout.strftime('%R') %></td>
-			<% else %>
-				<span class="label label-warning"><%= t('memberlog.working') %></span>
-			<% end %>
-		</td>
+	  <% if memberlog.dayoff == true %>
+	  	<td><span class="badge badge-important"><%= t('memberlog.dayoff') %>	</span></td>
+	  <% else %>
+			<td><%= memberlog.created_at.strftime('%R') %> <span class="icons-arrow-right-7"></span>
+				<% if memberlog.finish == true %>
+					<%= memberlog.checkout.strftime('%R') %></td>
+				<% else %>
+					<span class="label label-warning"><%= t('memberlog.working') %></span>
+				<% end %>
+			</td>
+		<% end %>
 		<td class="span6">
 			<%= link_to memberlog.todo.html_safe, admin_memberlog_path(memberlog.id), :class => "modal-opener" %>
 		<div class="quick-edit">
@@ -33,7 +36,7 @@
 	    <div id="<%= "#{memberlog.id.to_s}-detail" %>" class="footable-row-detail-inner" style="display: none;">
 	      <div>
 	        <strong><%= t(:complete) %></strong> : 
-	        	<%= memberlog.complete%>
+	        	<%= memberlog.complete.html.safe %>
 	      </div>
 	      
 	    </div>
diff --git a/app/views/admin/memberlogs/index.html.erb b/app/views/admin/memberlogs/index.html.erb
index bf86d7c..f5d4117 100644
--- a/app/views/admin/memberlogs/index.html.erb
+++ b/app/views/admin/memberlogs/index.html.erb
@@ -15,8 +15,7 @@
 		<tr>
 			<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="span2"><%= t('memberlog.check_in_out') %></th>
 			<th class="span2"><%= t('memberlog.todo') %></th>
 			<th class="span5"><%= t('memberlog.excuse') %></th>
 		</tr>
diff --git a/app/views/admin/memberlogs/show.html.erb b/app/views/admin/memberlogs/show.html.erb
index b7444b2..0f0dafc 100644
--- a/app/views/admin/memberlogs/show.html.erb
+++ b/app/views/admin/memberlogs/show.html.erb
@@ -32,15 +32,20 @@
 	</thead>
 	<tbody>
 		<tr>
-			<td><%= @memberlog.member_profile.name rescue "" %></td>		
-			<td><%= @memberlog.created_at.strftime('%Y-%m-%d %R') %></td>
-			<td>
-				<% if @memberlog.finish == true %>
-					<%= @memberlog.checkout.strftime('%Y-%m-%d %R') %>
-				<% else %>
-					<span class="label label-warning"><%= t('memberlog.working') %></span>	
-				<% end %>
-			</td>
+			<td><%= @memberlog.member_profile.name rescue "" %></td>
+			<% if @memberlog.dayoff == true %>
+				<td><span class="badge badge-important"><%= t('memberlog.dayoff') %>	</span></td>
+				<td></td>
+			<% else %>		
+				<td><%= @memberlog.created_at.strftime('%Y-%m-%d %R') %></td>
+				<td>
+					<% if @memberlog.finish == true %>
+						<%= @memberlog.checkout.strftime('%Y-%m-%d %R') %>
+					<% else %>
+						<span class="label label-warning"><%= t('memberlog.working') %></span>	
+					<% end %>
+				</td>
+			<% end %>
 		</tr>
 	
 	</tbody>
diff --git a/app/views/plugin/memberlog/_profile.html.erb b/app/views/plugin/memberlog/_profile.html.erb
index fcbcbd8..41c304e 100644
--- a/app/views/plugin/memberlog/_profile.html.erb
+++ b/app/views/plugin/memberlog/_profile.html.erb
@@ -37,8 +37,7 @@
         <!-- <th><input type="checkbox" /></th> -->
       <!-- <% end -%> -->
       <th class="span2"><%= t('memberlog.date') %></th>
-      <th class="span1"><%= t('memberlog.checkin') %></th>
-      <th class="span1"><%= t('memberlog.checkout') %></th>
+      <th class="span2"><%= t('memberlog.check_in_out') %></th>
       <th class="span3"><%= t('memberlog.excuse') %></th>
     </tr>
   </thead>
@@ -46,7 +45,7 @@
     <% @memberlogs.each do |memberlog| %> 
       <tr id="<%= dom_id memberlog %>">
         <td>
-          <%= link_to memberlog.created_at.strftime('%Y-%m-%d (%a)'), 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), :class => "modal-opener" %>
 
           <div class="quick-edit">
             <ul class="nav nav-pills hide">
@@ -57,18 +56,19 @@
             </ul>
           </div>
         </td>
-        <td><%= memberlog.created_at.strftime('%R') %></td>
+        <% if memberlog.dayoff == true %>
+          <td><span class="badge badge-important"><%= t('memberlog.dayoff') %>  </span></td>
+        <% else %>
+          <td><%= memberlog.created_at.strftime('%R') %> <span class="icons-arrow-right-7"></span>
+            <% if memberlog.finish == true %>
+              <%= memberlog.checkout.strftime('%R') %></td>
+            <% else %>
+              <span class="label label-warning"><%= t('memberlog.working') %></span>
+            <% end %>
+          </td>
+        <% end %>
         <td>
-          <% if memberlog.finish == true %>
-            <%= memberlog.checkout.strftime('%R') %></td>
-          <% else %>
-            <span class="label label-warning"><%= t('memberlog.working') %></span>
-          <% end %>
-        </td> 
-        <td>
-          <% if !memberlog.excuse.nil? %>
-            <span class="label label-important"><%= memberlog.excuse %></span>            
-          <% end %>          
+          <span class="label label-important"><%= memberlog.excuse %></span>            
         </td> 
       </tr>   
     <% end %> 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 41f4938..813e0af 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -14,3 +14,5 @@ en:
     end_dayoff: End Dayoff
     status: Status
     date: Date
+    check_in_out: Check-In~Check-Out
+    dayoff: Day off
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 986367a..dedabfa 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -14,3 +14,5 @@ zh_tw:
     end_dayoff: 休假結束日期
     status: 狀態
     date: 出勤日期
+    check_in_out: 上班時間~下班時間
+    dayoff: 休假
\ No newline at end of file