From 8d2a3225fd8253768df1e06aa2aa6304127c1972 Mon Sep 17 00:00:00 2001 From: Keith 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| %> - <%= memberlog.member_profile.name rescue "" %> - <%= memberlog.created_at.strftime('%Y-%m-%d (%a) %R') %> + <%= memberlog.member_profile.name rescue "" %> + <%= memberlog.created_at.strftime('%Y/%m/%d (%a)') %> + <%= memberlog.created_at.strftime('%R') %> <% if memberlog.finish == true %> <%= memberlog.checkout.strftime('%R') %> 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 @@ <% end %> <% end %> @@ -13,12 +13,12 @@ - - + + + - - - + + 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 %> - Working.... + <%= t('memberlog.working') %> <% end %> 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 %> - + + + @@ -45,7 +46,7 @@ <% @memberlogs.each do |memberlog| %> + + <%= memberlog.checkout.strftime('%R') %> <% else %> - Working.... + <%= t('memberlog.working') %> <% end %>
<%= 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') %>
- <%= 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') %> 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: 出勤日期