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?') } %>
-
+
<% end %>
<% end %>
@@ -37,7 +37,7 @@
<%= t('memberlog.checkin') %> |
-
<%= t('memberlog.checkout') %> |
+
<%= t('memberlog.checkout') %> |
<%= t('memberlog.excuse') %> |
@@ -46,6 +46,7 @@
<%= link_to memberlog.created_at.strftime('%Y-%m-%d (%a) %R'), admin_memberlog_path(memberlog.id), :data => {"target" => "#logModal", "toggle" => "modal"} %>
+
<% 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: 狀態
|