5xRuby · YushengLi · Apr 7, 2017 · Mar 20, 2017 · Mar 30, 2017 · Mar 31, 2017
diff --git a/app/controllers/backend/leave_times_controller.rb b/app/controllers/backend/leave_times_controller.rb
@@ -21,7 +21,7 @@ def collection_scope
 
   def resource_params
     params.require(:leave_time).permit(
-      :user_id, :leave_type, :quota, :effective_date, :expiration_date, :usable_hours, :used_hours
+      :user_id, :leave_type, :quota, :effective_date, :expiration_date, :usable_hours, :used_hours, :remark
     )
   end
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -70,7 +70,7 @@ def no_data_alert(message = t('warnings.no_data'))
   end
 
   def status_select_option
-    ([:all] + LeaveApplication.statuses.keys).map { |type| [I18n.t("simple_form.options.leave_application.status.#{type}"), type] }.to_h
+    ([:all] + LeaveApplication.statuses.keys).map { |type| [LeaveApplication.human_enum_value(:status, type), type] }.to_h
   end
 
   def specific_year

diff --git a/app/models/leave_time.rb b/app/models/leave_time.rb
@@ -10,6 +10,7 @@ class LeaveTime < ApplicationRecord
     end
   LEAVE_POOLS_TYPES = LEAVE_POOLS_CONFIG.keys
   LEAVE_POOLS_TYPES_SYM = DataHelper.each_to_sym LEAVE_POOLS_TYPES
+  enum leave_type: Hash[Settings.leave_types.keys.map do |type| [type, type] end]
   LEAVE_POOLS_ALLOW_PRE_CREATION =
     Settings.leave_pools_misc.allow_pre_creation
   LEAVE_POOLS_AUTO_CREATION =

diff --git a/app/views/backend/leave_times/_form.html.haml b/app/views/backend/leave_times/_form.html.haml
@@ -2,10 +2,11 @@
 
 = simple_form_for [:backend, current_object] do |f|
   = f.association :user, required: true
-  = f.input :leave_type, required: true, collection: LeaveTime::LEAVE_POOLS_TYPES_SYM
+  = f.input :leave_type, required: true, collection: LeaveTime.enum_attributes_for_select(:leave_types)
   = f.input :quota
   = f.input :effective_date, date_time_picker_hash(:start, current_object[:effective_date])
   = f.input :expiration_date, date_time_picker_hash(:end, current_object[:expiration_date])
+  = f.input :remark, as: :text
   - unless current_object.new_record?
     = f.input :usable_hours
     = f.input :used_hours

diff --git a/app/views/shared/_navigation.html.haml b/app/views/shared/_navigation.html.haml
@@ -24,6 +24,7 @@
             %ul.dropdown-menu
               %li= link_to t("title.backend/users.index"), backend_users_path
               %li= link_to t("title.backend/users.new"), new_backend_user_path
+              %li= link_to t("title.backend/leave_times.new"), new_backend_leave_time_path
               %li= link_to t("title.backend/leave_applications.index"),
                 backend_leave_applications_path(status: :pending)
               %li= link_to t("title.backend/monthly_leave_times.index"),

diff --git a/config/application.yml.sample b/config/application.yml.sample
@@ -142,6 +142,8 @@ defaults: &defaults
       creation: none
     maternity:
       creation: none
+    bonus:
+      creation: none
 
   leave_pools:
     remote:

diff --git a/config/locales/meta_data.zh_TW.yml b/config/locales/meta_data.zh_TW.yml
@@ -2,8 +2,8 @@ zh-TW:
   activerecord:
     attributes:
       user:
-        name: "姓名"
-        login_name: "帳號"
+        name: "員工姓名"
+        login_name: "員工帳號"
         email: "電子郵件"
         role: "身份"
         roles:
@@ -21,17 +21,37 @@ zh-TW:
         join_date: "到職日期"
         leave_date: "離職日期"
       leave_time:
+        leave_types:
+          remote: '在家上班'
+          late: '遲到'
+          absent: '曠職'
+          annual: '特休'
+          personal: '事假'
+          sick: '病假'
+          bereavement: '喪假'
+          official: '公假'
+          marriage: '婚假'
+          maternity: '產假'
+          funeral: '喪假'
+          bonus: '補休'
         user: "員工"
         name: "擁有者"
         leave_type: "假別"
-        quota: "時數"
+        quota: "額度"
         used_hours: "已用時數"
         used_hours_if_allow: "已用時數"
         usable_hours: "可用時數"
         usable_hours_if_allow: "可用時數"
         effective_date: '有效時間'
         expiration_date: '失效時間'
+        remark: '備註'
       leave_application:
+        statuses:
+          approved: '核准'
+          rejected: '駁回'
+          pending: '待審'
+          canceled: '取消'
+          all: '全部'
         user: "員工"
         start_time: "開始時間"
         end_time: "結束時間"
@@ -100,10 +120,11 @@ zh-TW:
       index: "員工休假狀況"
     backend/leave_times:
       index: "員工休假扣打"
-      new: "新增休假扣打"
+      new: "新增員工休假"
       edit: "修改"
       delete: "刪除"
       change_type: "切換休假種類至"
+      remark: "備註"
     leave_applications:
       index: "查看歷年假單"
       show: "檢視"
@@ -147,8 +168,8 @@ zh-TW:
       index: "%{year} 年 %{month} 月 員工休假狀況"
     backend/leave_times:
       index: "員工休假扣打"
-      new: "新增休假扣打"
-      edit: "修改休假扣打"
+      new: "新增員工休假"
+      edit: "修改員工休假"
     tools: "工具"
 
   success:

diff --git a/config/locales/simple_form.zh_TW.yml b/config/locales/simple_form.zh_TW.yml
@@ -16,12 +16,13 @@ zh-TW:
           annual: '特休'
           bonus: '補休'
           personal: '事假'
+          sick: '病假' # 之後要改全薪/半薪病假
           sick_1: '病假'
           sick_2: '半薪病假'
           official: '公假'
           marriage: '婚假'
           maternity: '產假'
-          funeral: '喪假'
+          bereavement: '喪假'
           absent: '曠職'
       leave_application:
         leave_type:
@@ -36,10 +37,3 @@ zh-TW:
           maternity: '產假'
           funeral: '喪假'
           bonus: '補休'
-
-        status:
-          approved: '核准'
-          rejected: '駁回'
-          pending: '待審'
-          canceled: '取消'
-          all: '全部'
diff --git a/spec/factories/leave_times.rb b/spec/factories/leave_times.rb
@@ -8,6 +8,7 @@
     quota           0
     used_hours      0
     usable_hours    0
+    remark          "Test string"
 
     Settings.leave_application_types.keys.each do |type|
       trait type.to_sym do