Skip to content

Comments

default leave_time effective for 'true' and issue #212#215

Merged
Eileen0917 merged 1 commit into5xRuby:developmentfrom
Eileen0917:fix/leave_time_index_default
Aug 10, 2017
Merged

default leave_time effective for 'true' and issue #212#215
Eileen0917 merged 1 commit into5xRuby:developmentfrom
Eileen0917:fix/leave_time_index_default

Conversation

@Eileen0917
Copy link
Contributor

@Eileen0917 Eileen0917 commented Aug 10, 2017

  1. 將預設查看請假額度調整為 '有效'
  2. 修正 issue 假別調整後舊的無法正常顯示 #212 因調整 leave_application 的 leave_type 而導致選擇 annual 或 bonus 的假單假別無法正確顯示問題。

@Eileen0917 Eileen0917 merged commit c33c7bf into 5xRuby:development Aug 10, 2017
@Eileen0917 Eileen0917 mentioned this pull request Aug 10, 2017
Closed
@Eileen0917 Eileen0917 deleted the fix/leave_time_index_default branch August 11, 2017 03:55
Eileen0917 added a commit that referenced this pull request Mar 26, 2018
@Eileen0917
Release/2 (#278)
807a45f 
* Fix Parttime and Intern cannot view LeaveApplication bug

* issue #186 add plain text version for Devise Mailer View

* #192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Revert "#192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)" (#198)

This reverts commit ad556bd.

* issue #196 LeaveApplication cannot be revised and deleted if happened (#197)

* issue #199 add user_name on verify_page

* fix leave_type without 'remote' in appling leave application

* add some introdution in home page

* Fluentd 支援 (#203)

* Setup for fluentd

* Add config for capistrano

* change 'personal' i18n from 無薪事假 to 事假

* [Fixbug] #192 Show The Correct LeaveTime Hours Statistic Exclude Sick Type Record (#207)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Reset the leave_time#index setting

* #179 LeaveApplication Able to Transition from Approved to Rejected (#185)

* #179 Able to transition from approved to reject

* Add leave_application transition spec

* Fix LeaveTimeUsage not being destroyed bug

* issue #201 Fixbug: Able to query the LeaveApplication in a correct range (#208)

* issue #205 Able to create LeaveApplication in the backend part (#209)

* issue #190 Migrate from Bootstrap3 Datepicker to Flatpickr (#210)

* adjust date format at backend/user/_form

* change i18n zh-TW from ‘周’ to ‘週’

* issue #193 default leave_time effective for 'true' & issue #212 fix wrong type of leave_application (#215)

* fix little bugs - ransack and arel relation / datetimepicker default / biz holiday (#216)

* fix ransack and arel relation

* set datetimepicker default time for 9:30

* adjust the text on page/index.html

* add biz setting for 2018

* fix the date display at backend/leave_application#index

* add rule on page#index

* add modal on page#index

* move js to asset

* fix add leave_time when verify leave_application (#228)

* issue #229

* delete remote rule alert

* log

* add email alert when create leave_application (#234)

* issue #235 Fix/email config and add email alert to user when leave_application approved (#236)

* fix for config/environment/development action_mailer setting

* add alert email to user when leave_application approved

* let user information separate from admin information

* add email preview and refactor mailer sender and recipient

* fix spec for revised application.yml (#240)

* Fix/fix leave time batch builder (#241)

* add join_date in default_admin task and change role for admin_user

* Use different way to find whose join anniversary is within 60 days.

* change Timecop.freeze time if join_date is in February & it's leap year.

* updated application.yml.sample

* updated application.yml.sample remote/quota

* issue #235 revise email content (#238)

* revise email content

* fix i18n scope

* revise email title i18n (#243)

* issue #235 add test mail to subject when sending mail on staging/development env (#245)

* issue #239 需可查詢「某月份需要扣薪水的名單和時數」 (#244)

* add highlight class when the column is for personal or halfpaid_sick

* add sum_leave_hours method to count leave_hours

* remove @statistics

* rewrite statistics page

* fix rubocop

* Fix/rubocop (#248)

* auto correct

* fix (...) interpreted as grouped expression.

* fix Optional arguments should appear at the end of the argument list.

* fix rubocop

* issue #239 revise hours total (#247)

* issue #246 remove resigned from backend/user#index (#249)

* issue #230 歷年假單頁面, 預設列出最後幾筆資料 (#250)

* add status_present to search_params to show all the leave applications in any status.

* remove default predicate

* issue #235 取消會寄信通知管理員 (#251)

* send mail to admin when user canceled leave application

* move views for cancel_application to the correct folder

* issue #83 同時新增多人的休假額度 (#253)

* add style to let inline checkboxes second row will not offset to the right.

* add view/locales/routes for batch add leave time

* add batch_new/create action

* add controller test for batch_create

* remove @search_params

* remove ransack from new/create actions

* remove resigned employees

* issue #252 日期格式統一為 yyyy-mm-dd (#254)

* change time format

* change time format

* issue #230 change last to first (#255)

* delete default value for ransack when create leave_application (#256)

* issue #258 #261 LeaveApplication#statistics and filter (#265)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* set employee and parttime be the default value of specific_role

* issue #259 add contractor's leave_application record (#266)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* let contractor only create 'personal' leave_times in LeaveTimeBuilder

* add after_action in LeaveApplicationsController to auto approve leave_application for contractor

* fix user_spec

* fix rspec

* let contractor can't see the leave_time_usage in the leave_application show page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* remove except from role dropdown menu

* demove debugger

* comment out unuse code

* refactor show page to meet the current leave_time_usage format

* remove console

* move create_leave_time for contractor from automatically_import to join_date_based_import and monthly_import

* change trait :parttime to parttime and intern

* add contractor to the leave_time_batch_builder_spec

* revise the change for trait :parttime

* let contractor only can select personal as leave_type

* fix rspec

* edit leave_time #show page

* not display leave time usage in leave_application#show when current user is contractor

* issue #269 change leave_type 'sick' to 'fullpaid_sick' and 'halfpaid_sick' (#270)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* issue#268 - add new leave time type - menstrual and occpational_sick (#271)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* add menstrual and occpational_sick

* spec of menstrual

* delete exclude sick spec

* spec for all special type leave application created

* spec for verifing special type leave application

* add 'rake import:import' (#260)

* add_pagination_for_user_page (#274)

* issue #223 weekly import remote (#273)

* add weekly_import

* revise remote config in application.yml.sample

* add by_assign_date for weekly_import

* fix spec

* fix if else sentence

* fix leave time batch builder (#276)

* fix leave time batch builder

* fix spec
Eileen0917 added a commit that referenced this pull request Apr 10, 2018
@Eileen0917
Release/3 (#279)
2ff8ca1 
* Fix Parttime and Intern cannot view LeaveApplication bug

* issue #186 add plain text version for Devise Mailer View

* #192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Revert "#192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)" (#198)

This reverts commit ad556bd.

* issue #196 LeaveApplication cannot be revised and deleted if happened (#197)

* issue #199 add user_name on verify_page

* fix leave_type without 'remote' in appling leave application

* add some introdution in home page

* Fluentd 支援 (#203)

* Setup for fluentd

* Add config for capistrano

* change 'personal' i18n from 無薪事假 to 事假

* [Fixbug] #192 Show The Correct LeaveTime Hours Statistic Exclude Sick Type Record (#207)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Reset the leave_time#index setting

* #179 LeaveApplication Able to Transition from Approved to Rejected (#185)

* #179 Able to transition from approved to reject

* Add leave_application transition spec

* Fix LeaveTimeUsage not being destroyed bug

* issue #201 Fixbug: Able to query the LeaveApplication in a correct range (#208)

* issue #205 Able to create LeaveApplication in the backend part (#209)

* issue #190 Migrate from Bootstrap3 Datepicker to Flatpickr (#210)

* adjust date format at backend/user/_form

* change i18n zh-TW from ‘周’ to ‘週’

* issue #193 default leave_time effective for 'true' & issue #212 fix wrong type of leave_application (#215)

* fix little bugs - ransack and arel relation / datetimepicker default / biz holiday (#216)

* fix ransack and arel relation

* set datetimepicker default time for 9:30

* adjust the text on page/index.html

* add biz setting for 2018

* fix the date display at backend/leave_application#index

* add rule on page#index

* add modal on page#index

* move js to asset

* fix add leave_time when verify leave_application (#228)

* issue #229

* delete remote rule alert

* log

* add email alert when create leave_application (#234)

* issue #235 Fix/email config and add email alert to user when leave_application approved (#236)

* fix for config/environment/development action_mailer setting

* add alert email to user when leave_application approved

* let user information separate from admin information

* add email preview and refactor mailer sender and recipient

* fix spec for revised application.yml (#240)

* Fix/fix leave time batch builder (#241)

* add join_date in default_admin task and change role for admin_user

* Use different way to find whose join anniversary is within 60 days.

* change Timecop.freeze time if join_date is in February & it's leap year.

* updated application.yml.sample

* updated application.yml.sample remote/quota

* issue #235 revise email content (#238)

* revise email content

* fix i18n scope

* revise email title i18n (#243)

* issue #235 add test mail to subject when sending mail on staging/development env (#245)

* issue #239 需可查詢「某月份需要扣薪水的名單和時數」 (#244)

* add highlight class when the column is for personal or halfpaid_sick

* add sum_leave_hours method to count leave_hours

* remove @statistics

* rewrite statistics page

* fix rubocop

* Fix/rubocop (#248)

* auto correct

* fix (...) interpreted as grouped expression.

* fix Optional arguments should appear at the end of the argument list.

* fix rubocop

* issue #239 revise hours total (#247)

* issue #246 remove resigned from backend/user#index (#249)

* issue #230 歷年假單頁面, 預設列出最後幾筆資料 (#250)

* add status_present to search_params to show all the leave applications in any status.

* remove default predicate

* issue #235 取消會寄信通知管理員 (#251)

* send mail to admin when user canceled leave application

* move views for cancel_application to the correct folder

* issue #83 同時新增多人的休假額度 (#253)

* add style to let inline checkboxes second row will not offset to the right.

* add view/locales/routes for batch add leave time

* add batch_new/create action

* add controller test for batch_create

* remove @search_params

* remove ransack from new/create actions

* remove resigned employees

* issue #252 日期格式統一為 yyyy-mm-dd (#254)

* change time format

* change time format

* issue #230 change last to first (#255)

* delete default value for ransack when create leave_application (#256)

* issue #258 #261 LeaveApplication#statistics and filter (#265)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* set employee and parttime be the default value of specific_role

* issue #259 add contractor's leave_application record (#266)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* let contractor only create 'personal' leave_times in LeaveTimeBuilder

* add after_action in LeaveApplicationsController to auto approve leave_application for contractor

* fix user_spec

* fix rspec

* let contractor can't see the leave_time_usage in the leave_application show page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* remove except from role dropdown menu

* demove debugger

* comment out unuse code

* refactor show page to meet the current leave_time_usage format

* remove console

* move create_leave_time for contractor from automatically_import to join_date_based_import and monthly_import

* change trait :parttime to parttime and intern

* add contractor to the leave_time_batch_builder_spec

* revise the change for trait :parttime

* let contractor only can select personal as leave_type

* fix rspec

* edit leave_time #show page

* not display leave time usage in leave_application#show when current user is contractor

* issue #269 change leave_type 'sick' to 'fullpaid_sick' and 'halfpaid_sick' (#270)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* issue#268 - add new leave time type - menstrual and occpational_sick (#271)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* add menstrual and occpational_sick

* spec of menstrual

* delete exclude sick spec

* spec for all special type leave application created

* spec for verifing special type leave application

* add 'rake import:import' (#260)

* add_pagination_for_user_page (#274)

* issue #223 weekly import remote (#273)

* add weekly_import

* revise remote config in application.yml.sample

* add by_assign_date for weekly_import

* fix spec

* fix if else sentence

* fix leave time batch builder (#276)

* fix leave time batch builder

* fix spec

* change deploy ip

* add default linked_dirs
Eileen0917 added a commit that referenced this pull request Apr 12, 2018
@Eileen0917
merge master to development (#283)
f16c66f 
* Release/2 (#278)

* Fix Parttime and Intern cannot view LeaveApplication bug

* issue #186 add plain text version for Devise Mailer View

* #192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Revert "#192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)" (#198)

This reverts commit ad556bd.

* issue #196 LeaveApplication cannot be revised and deleted if happened (#197)

* issue #199 add user_name on verify_page

* fix leave_type without 'remote' in appling leave application

* add some introdution in home page

* Fluentd 支援 (#203)

* Setup for fluentd

* Add config for capistrano

* change 'personal' i18n from 無薪事假 to 事假

* [Fixbug] #192 Show The Correct LeaveTime Hours Statistic Exclude Sick Type Record (#207)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Reset the leave_time#index setting

* #179 LeaveApplication Able to Transition from Approved to Rejected (#185)

* #179 Able to transition from approved to reject

* Add leave_application transition spec

* Fix LeaveTimeUsage not being destroyed bug

* issue #201 Fixbug: Able to query the LeaveApplication in a correct range (#208)

* issue #205 Able to create LeaveApplication in the backend part (#209)

* issue #190 Migrate from Bootstrap3 Datepicker to Flatpickr (#210)

* adjust date format at backend/user/_form

* change i18n zh-TW from ‘周’ to ‘週’

* issue #193 default leave_time effective for 'true' & issue #212 fix wrong type of leave_application (#215)

* fix little bugs - ransack and arel relation / datetimepicker default / biz holiday (#216)

* fix ransack and arel relation

* set datetimepicker default time for 9:30

* adjust the text on page/index.html

* add biz setting for 2018

* fix the date display at backend/leave_application#index

* add rule on page#index

* add modal on page#index

* move js to asset

* fix add leave_time when verify leave_application (#228)

* issue #229

* delete remote rule alert

* log

* add email alert when create leave_application (#234)

* issue #235 Fix/email config and add email alert to user when leave_application approved (#236)

* fix for config/environment/development action_mailer setting

* add alert email to user when leave_application approved

* let user information separate from admin information

* add email preview and refactor mailer sender and recipient

* fix spec for revised application.yml (#240)

* Fix/fix leave time batch builder (#241)

* add join_date in default_admin task and change role for admin_user

* Use different way to find whose join anniversary is within 60 days.

* change Timecop.freeze time if join_date is in February & it's leap year.

* updated application.yml.sample

* updated application.yml.sample remote/quota

* issue #235 revise email content (#238)

* revise email content

* fix i18n scope

* revise email title i18n (#243)

* issue #235 add test mail to subject when sending mail on staging/development env (#245)

* issue #239 需可查詢「某月份需要扣薪水的名單和時數」 (#244)

* add highlight class when the column is for personal or halfpaid_sick

* add sum_leave_hours method to count leave_hours

* remove @statistics

* rewrite statistics page

* fix rubocop

* Fix/rubocop (#248)

* auto correct

* fix (...) interpreted as grouped expression.

* fix Optional arguments should appear at the end of the argument list.

* fix rubocop

* issue #239 revise hours total (#247)

* issue #246 remove resigned from backend/user#index (#249)

* issue #230 歷年假單頁面, 預設列出最後幾筆資料 (#250)

* add status_present to search_params to show all the leave applications in any status.

* remove default predicate

* issue #235 取消會寄信通知管理員 (#251)

* send mail to admin when user canceled leave application

* move views for cancel_application to the correct folder

* issue #83 同時新增多人的休假額度 (#253)

* add style to let inline checkboxes second row will not offset to the right.

* add view/locales/routes for batch add leave time

* add batch_new/create action

* add controller test for batch_create

* remove @search_params

* remove ransack from new/create actions

* remove resigned employees

* issue #252 日期格式統一為 yyyy-mm-dd (#254)

* change time format

* change time format

* issue #230 change last to first (#255)

* delete default value for ransack when create leave_application (#256)

* issue #258 #261 LeaveApplication#statistics and filter (#265)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* set employee and parttime be the default value of specific_role

* issue #259 add contractor's leave_application record (#266)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* let contractor only create 'personal' leave_times in LeaveTimeBuilder

* add after_action in LeaveApplicationsController to auto approve leave_application for contractor

* fix user_spec

* fix rspec

* let contractor can't see the leave_time_usage in the leave_application show page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* remove except from role dropdown menu

* demove debugger

* comment out unuse code

* refactor show page to meet the current leave_time_usage format

* remove console

* move create_leave_time for contractor from automatically_import to join_date_based_import and monthly_import

* change trait :parttime to parttime and intern

* add contractor to the leave_time_batch_builder_spec

* revise the change for trait :parttime

* let contractor only can select personal as leave_type

* fix rspec

* edit leave_time #show page

* not display leave time usage in leave_application#show when current user is contractor

* issue #269 change leave_type 'sick' to 'fullpaid_sick' and 'halfpaid_sick' (#270)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* issue#268 - add new leave time type - menstrual and occpational_sick (#271)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* add menstrual and occpational_sick

* spec of menstrual

* delete exclude sick spec

* spec for all special type leave application created

* spec for verifing special type leave application

* add 'rake import:import' (#260)

* add_pagination_for_user_page (#274)

* issue #223 weekly import remote (#273)

* add weekly_import

* revise remote config in application.yml.sample

* add by_assign_date for weekly_import

* fix spec

* fix if else sentence

* fix leave time batch builder (#276)

* fix leave time batch builder

* fix spec

* Release/3 (#279)

* Fix Parttime and Intern cannot view LeaveApplication bug

* issue #186 add plain text version for Devise Mailer View

* #192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Revert "#192 Exclude fullpaid_sick & halfpaid_sick Implementation (#194)" (#198)

This reverts commit ad556bd.

* issue #196 LeaveApplication cannot be revised and deleted if happened (#197)

* issue #199 add user_name on verify_page

* fix leave_type without 'remote' in appling leave application

* add some introdution in home page

* Fluentd 支援 (#203)

* Setup for fluentd

* Add config for capistrano

* change 'personal' i18n from 無薪事假 to 事假

* [Fixbug] #192 Show The Correct LeaveTime Hours Statistic Exclude Sick Type Record (#207)

* Add LeaveTime#exclude_sick

* Add LeaveTime#exclude_sick spec

* Reset the leave_time#index setting

* #179 LeaveApplication Able to Transition from Approved to Rejected (#185)

* #179 Able to transition from approved to reject

* Add leave_application transition spec

* Fix LeaveTimeUsage not being destroyed bug

* issue #201 Fixbug: Able to query the LeaveApplication in a correct range (#208)

* issue #205 Able to create LeaveApplication in the backend part (#209)

* issue #190 Migrate from Bootstrap3 Datepicker to Flatpickr (#210)

* adjust date format at backend/user/_form

* change i18n zh-TW from ‘周’ to ‘週’

* issue #193 default leave_time effective for 'true' & issue #212 fix wrong type of leave_application (#215)

* fix little bugs - ransack and arel relation / datetimepicker default / biz holiday (#216)

* fix ransack and arel relation

* set datetimepicker default time for 9:30

* adjust the text on page/index.html

* add biz setting for 2018

* fix the date display at backend/leave_application#index

* add rule on page#index

* add modal on page#index

* move js to asset

* fix add leave_time when verify leave_application (#228)

* issue #229

* delete remote rule alert

* log

* add email alert when create leave_application (#234)

* issue #235 Fix/email config and add email alert to user when leave_application approved (#236)

* fix for config/environment/development action_mailer setting

* add alert email to user when leave_application approved

* let user information separate from admin information

* add email preview and refactor mailer sender and recipient

* fix spec for revised application.yml (#240)

* Fix/fix leave time batch builder (#241)

* add join_date in default_admin task and change role for admin_user

* Use different way to find whose join anniversary is within 60 days.

* change Timecop.freeze time if join_date is in February & it's leap year.

* updated application.yml.sample

* updated application.yml.sample remote/quota

* issue #235 revise email content (#238)

* revise email content

* fix i18n scope

* revise email title i18n (#243)

* issue #235 add test mail to subject when sending mail on staging/development env (#245)

* issue #239 需可查詢「某月份需要扣薪水的名單和時數」 (#244)

* add highlight class when the column is for personal or halfpaid_sick

* add sum_leave_hours method to count leave_hours

* remove @statistics

* rewrite statistics page

* fix rubocop

* Fix/rubocop (#248)

* auto correct

* fix (...) interpreted as grouped expression.

* fix Optional arguments should appear at the end of the argument list.

* fix rubocop

* issue #239 revise hours total (#247)

* issue #246 remove resigned from backend/user#index (#249)

* issue #230 歷年假單頁面, 預設列出最後幾筆資料 (#250)

* add status_present to search_params to show all the leave applications in any status.

* remove default predicate

* issue #235 取消會寄信通知管理員 (#251)

* send mail to admin when user canceled leave application

* move views for cancel_application to the correct folder

* issue #83 同時新增多人的休假額度 (#253)

* add style to let inline checkboxes second row will not offset to the right.

* add view/locales/routes for batch add leave time

* add batch_new/create action

* add controller test for batch_create

* remove @search_params

* remove ransack from new/create actions

* remove resigned employees

* issue #252 日期格式統一為 yyyy-mm-dd (#254)

* change time format

* change time format

* issue #230 change last to first (#255)

* delete default value for ransack when create leave_application (#256)

* issue #258 #261 LeaveApplication#statistics and filter (#265)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* set employee and parttime be the default value of specific_role

* issue #259 add contractor's leave_application record (#266)

* add leave_time_summary_service to count total leave hours in different leave_type

* use leave_time_summary_service for statistics page

* add summary_from method. if user doesn't have any leave_application recoreds then create templement hash.

* add hours_for_total method.

* modify view for the new summary format

* add leave_time_summary_service_spec

* remove specific_year

* change user join_date

* add date column to leave_time_usage

* create leave_time_usage by date

* add date to show page

* remove unnecessary code & edit leave_time_summary_service

* reload leave_time_usage

* fix rspec

* add LeaveTimeSummaryService spec

* add user2

* add rake test to add date information to current leave_time_usages

* add scope filter_by_role

* add JS for role filter

* add role filter in statistics page

* let contractor only create 'personal' leave_times in LeaveTimeBuilder

* add after_action in LeaveApplicationsController to auto approve leave_application for contractor

* fix user_spec

* fix rspec

* let contractor can't see the leave_time_usage in the leave_application show page

* add specific_role

* send specific_role to LeaveTimeSummaryService in leave_applications_controller

* remove contractor from role dropdown menu

* remove except from role dropdown menu

* demove debugger

* comment out unuse code

* refactor show page to meet the current leave_time_usage format

* remove console

* move create_leave_time for contractor from automatically_import to join_date_based_import and monthly_import

* change trait :parttime to parttime and intern

* add contractor to the leave_time_batch_builder_spec

* revise the change for trait :parttime

* let contractor only can select personal as leave_type

* fix rspec

* edit leave_time #show page

* not display leave time usage in leave_application#show when current user is contractor

* issue #269 change leave_type 'sick' to 'fullpaid_sick' and 'halfpaid_sick' (#270)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* issue#268 - add new leave time type - menstrual and occpational_sick (#271)

* make fullpaid and halfpaid seperate

* fix spec/models/leave_application_spec.rb

* fix spec except spec/services/leave_time_batch_builder_spec.rb

* fix spec/services/leave_time_batch_builder_spec.rb

* fix spec and update application.yml.sample

* add TODO about spec for an application with more than two leave_times

* add menstrual and occpational_sick

* spec of menstrual

* delete exclude sick spec

* spec for all special type leave application created

* spec for verifing special type leave application

* add 'rake import:import' (#260)

* add_pagination_for_user_page (#274)

* issue #223 weekly import remote (#273)

* add weekly_import

* revise remote config in application.yml.sample

* add by_assign_date for weekly_import

* fix spec

* fix if else sentence

* fix leave time batch builder (#276)

* fix leave time batch builder

* fix spec

* change deploy ip

* add default linked_dirs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Eileen0917