Feature/issue 81 - Manager able to add LeaveTime #86
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LeaveType 不應該允許空值才是 |
|
LeaveTime 中的 leave_type 已經修復，可以正常顯示，不過 rspec 部分還在看，估計是因為 remark 被設定成 required 所以在test時產生了很多衝突 |
YushengLi
suggested changes
Apr 6, 2017
| = f.input :password, autocomplete: "off", hint: t('devise.hints.leave_blank'), required: false | ||
| = f.input :password_confirmation, required: false | ||
| = f.input :current_password, hint: t('devise.hints.confirm_password'), required: true | ||
| = f.input :login_name, label: "員工帳號", required: false |
| @@ -70,7 +70,7 @@ def no_data_alert(message = t('warnings.no_data')) | |||
| end | |||
|
|
|||
| def status_select_option | |||
There was a problem hiding this comment.
見 #87 中，對於 enum select options 的生成。
app/models/leave_time.rb
Outdated
| @@ -25,7 +26,7 @@ class LeaveTime < ApplicationRecord | |||
| delegate :seniority, :name, to: :user | |||
| has_many :leave_applications | |||
|
|
|||
| validates :leave_type, :effective_date, :expiration_date, :quota, :usable_hours, :used_hours, :user, presence: true | |||
| validates :leave_type, :effective_date, :expiration_date, :quota, :usable_hours, :used_hours, :user, :remark, presence: true | |||
There was a problem hiding this comment.
我個人覺得 :remark 不需強制 present，這邊 @Eileen0917 覺得？
| = 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, required: true, label: t("title.backend/leave_times.remark") |
There was a problem hiding this comment.
請依照 i18n 中對於 Model attributes translation 的設定方式設定。
| @@ -23,6 +23,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/users.new_leave_time"), new_backend_leave_time_path | |||
There was a problem hiding this comment.
如果這個跟 t("title.backend/leave_times.new") 沒有需要特別區隔開來的話，可以盡量用同一個 translation key 來降低維護 translation 的成本。
| @@ -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.leave_types.keys.map(&:to_sym) | |||
There was a problem hiding this comment.
Possibly dependent on PR #87
YushengLi
reviewed
Apr 6, 2017
config/locales/simple_form.zh_TW.yml
Outdated
| sick_1: '病假' | ||
| sick_2: '半薪病假' | ||
| official: '公假' | ||
| marriage: '婚假' | ||
| maternity: '產假' | ||
| bereavement: '喪假' # Funeral & Bereavement 需要同時存在嗎？ |
|
Commit |
…ve_type can be displayed correctlt
Alexius-Huang
force-pushed
the
feature/issue-81
branch
from
b76311b to
cc889f0
Compare
YushengLi
approved these changes
Apr 7, 2017
Alexius-Huang
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
leave_time_batch_builder_spec.rb: [ 23 / 51 / 71 ]leave_time_builder_spec.rb: [ 22 / 34 / 52 / 73 / 93 / 111 ]nil