#2 legend for rules and colors #86
Open
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
* 1-Select_different_colors_for_rules
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| elsif event.start_period.hour == Event::HALF_DAY && | ||
| event.end_period.hour == Event::END_DAY && | ||
| (event.end_period..event.start_period).include?(day) | ||
| working_month[day] = { state: 'second_half_of_day', title: event.rule.name } | ||
| working_month[day] = { state: 'second_half_of_day', rule: event.rule } |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [82/80]
| @@ -50,11 +50,11 @@ def half_event(day, working_month) | |||
| events.each do |_employee, employee_events| | |||
| employee_events.each do |event| | |||
| if event.end_period.to_date.eql?(day) && event.end_period.hour == Event::HALF_DAY | |||
| working_month[day] = { state: 'first_half_of_day', title: event.rule.name } | |||
| working_month[day] = { state: 'first_half_of_day', rule: event.rule } | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [81/80]
| @@ -37,7 +37,7 @@ def days_status(employee) | |||
| days.each_with_object({}) do |day, working_month| | |||
| working_month[day] = working_days.include?(day.strftime('%w').to_i) ? { state: 'work' } : { state: 'holiday' } | |||
| working_month[day] = { state: 'state_holiday' } if holidays.include?(day) | |||
| working_month[day] = { state: 'fullday_event', title: define_rule_name(employee, day) } if | |||
| working_month[day] = { state: 'fullday_event', rule: define_rule(employee, day) } if | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [92/80]
| @@ -1 +1 @@ | |||
| @import '~bulma/bulma'; | |||
| @import 'bulma'; | |||
| @@ -65,7 +65,8 @@ def companies | |||
|
|
|||
| # Never trust parameters from the scary internet, only allow the white list through. | |||
| def rule_params | |||
| params.require(:rule).permit(:name, :allowance_days, :period, :is_enabled, :is_holiday, :auto_confirm, :is_enabled) | |||
| params.require(:rule).permit(:name, :allowance_days, :period, :is_enabled, :is_holiday, | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [91/80]
| @@ -60,6 +57,7 @@ group :development, :test do | |||
| gem 'pry-byebug', platforms: %i[mri mingw x64_mingw] | |||
| gem 'rspec-rails', '~> 3.8' | |||
| gem 'factory_bot_rails' | |||
| gem 'dotenv-rails' | |||
There was a problem hiding this comment.
Bundler/OrderedGems: Gems should be sorted in an alphabetical order within their section of the Gemfile. Gem dotenv-rails should appear before factory_bot_rails.
EvgeniyR2
force-pushed
the
2-Legend_for_rules_and_colors
branch
from
6eb8062 to
c9a5490
Compare
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.
No description provided.