From 65d2a47c3217c46c6193761a30f29ce2f45f531f Mon Sep 17 00:00:00 2001
From: Keith <chihkai331@gmail.com.tw>
Date: Tue, 21 Feb 2017 18:21:35 +0800
Subject: [PATCH] modified something

---
 app/models/dayoff.rb                         | 4 ++--
 app/views/admin/dayoffs/_form.html.erb       | 2 ++
 app/views/plugin/memberlog/_profile.html.erb | 7 ++++---
 config/locales/en.yml                        | 1 +
 config/locales/zh_tw.yml                     | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/dayoff.rb b/app/models/dayoff.rb
index a21e3c0..45454f1 100644
--- a/app/models/dayoff.rb
+++ b/app/models/dayoff.rb
@@ -2,9 +2,9 @@ class Dayoff < PersonalPluginIntro
 
 	include Mongoid::Document
 	include Mongoid::Timestamps
-	
+	# validates :dayoff_description, :presence => true
 
-	belongs_to :member_log
+	belongs_to :member_log, :dependent => :destroy
 
 
 	field :dayoff_description, localize: true
diff --git a/app/views/admin/dayoffs/_form.html.erb b/app/views/admin/dayoffs/_form.html.erb
index 8463b17..64309e0 100644
--- a/app/views/admin/dayoffs/_form.html.erb
+++ b/app/views/admin/dayoffs/_form.html.erb
@@ -40,6 +40,7 @@
           </div>
         </div> 
       <% end %>
+      <div class="control-group"></div>
 
       <!-- Dayoff Description -->
       <% @site_in_use_locales.each do |locale| %>
@@ -61,6 +62,7 @@
         </div>
       </div>
 
+
       <div class="control-group">
         <label class="control-label muted"><%= t('memberlog.end_dayoff') %></label>
         <div class="controls">
diff --git a/app/views/plugin/memberlog/_profile.html.erb b/app/views/plugin/memberlog/_profile.html.erb
index 24f225a..1ea1d15 100644
--- a/app/views/plugin/memberlog/_profile.html.erb
+++ b/app/views/plugin/memberlog/_profile.html.erb
@@ -23,8 +23,8 @@
         <%= 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?') } %>
-
+     <!--    <%= 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?') } %>
+ -->
       </ul>
     <% end %>
   <% end %>
@@ -37,7 +37,7 @@
         <!-- <th><input type="checkbox" /></th> -->
       <!-- <% end -%> -->
       <th class="span2"><%= t('memberlog.checkin') %></th>
-      <th class="span3"><%= t('memberlog.checkout') %></th>
+      <th class="span2"><%= t('memberlog.checkout') %></th>
       <th class="span3"><%= t('memberlog.excuse') %></th>
     </tr>
   </thead>
@@ -46,6 +46,7 @@
       <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"} %>
+
           <div class="quick-edit">
             <ul class="nav nav-pills hide">
               <% if memberlog.finish == false  %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0987d92..93dc3c2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -12,3 +12,4 @@ en:
     take_dayoff: Take_Dayoff
     start_dayoff: Start Dayoff
     end_dayoff: End Dayoff
+    status: Status
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index f7185b7..aeac400 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -12,3 +12,4 @@ zh_tw:
     take_dayoff: 請/排假
     start_dayoff: 休假開始日期
     end_dayoff: 休假結束日期
+    status: 狀態