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| %>
<%= t("memberlog.staff") %> | -<%= t('memberlog.checkin') %> | +<%= t('memberlog.staff') %> | +<%= t('memberlog.date') %> | +<%= t('memberlog.checkin') %> | <%= t('memberlog.checkout') %> | -<%= t('memberlog.todo') %> | -<%= t('memberlog.excuse') %> | - +<%= t('memberlog.todo') %> | +<%= t('memberlog.excuse') %> | <%= t('memberlog.checkin') %> | -<%= t('memberlog.checkout') %> | +<%= t('memberlog.date') %> | +<%= t('memberlog.checkin') %> | +<%= t('memberlog.checkout') %> | <%= t('memberlog.excuse') %> | @@ -45,7 +46,7 @@ <% @memberlogs.each do |memberlog| %>
---|---|---|---|---|---|---|---|---|---|
- <%= 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"} %>
|
+ <%= memberlog.created_at.strftime('%R') %> | <% if memberlog.finish == true %> - <%= memberlog.checkout.strftime('%m-%d %R') %> | + <%= memberlog.checkout.strftime('%R') %> <% else %> - Working.... + <%= t('memberlog.working') %> <% end %>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: 出勤日期 |