Skip to content

Commit

Permalink
Merge branch 'agd/fix-agent-off-days-contrast' into agd/fix-flaky-age…
Browse files Browse the repository at this point in the history
…nt-can-create-rdv-collectif
  • Loading branch information
adipasquale authored Dec 26, 2024
2 parents 70ebbe0 + 45952bf commit 788459e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/helpers/absences_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module AbsencesHelper
CALENDAR_BACKGROUND_COLOR = "rgba(127, 140, 141, 0.7)".freeze
CALENDAR_BACKGROUND_COLOR = "rgba(52, 57, 58, 0.7)".freeze

def absence_tag(absence)
if absence.expired?
Expand Down
1 change: 1 addition & 0 deletions app/services/off_days.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def self.to_full_calendar_array
start: jour_ferie.beginning_of_day.as_json,
end: jour_ferie.end_of_day.as_json,
backgroundColor: AbsencesHelper::CALENDAR_BACKGROUND_COLOR,
textColor: "white",
}
end
end
Expand Down

0 comments on commit 788459e

Please sign in to comment.