@@ -54,14 +54,18 @@ def slot_icalendar_event(cal)
5454 reservations = load_reservations
5555
5656 reservations . find_each do |reservation |
57- reservation . slots_reservations . where ( canceled_at : nil ) . each do |slots_reservation |
57+ reservation . slots_reservations . each do |slots_reservation |
58+ description = user_name ( slots_reservation . reservation )
59+ description += " (#{ I18n . t ( 'app.admin.calendar.cancelled' ) } )" if slots_reservation . canceled_at
5860 cal . event do |e |
5961 e . dtstart = slots_reservation . slot . start_at
6062 e . dtend = slots_reservation . slot . end_at
6163 e . summary = slots_reservation . reservation . reservable . name
62- e . description = user_name ( slots_reservation . reservation )
64+ e . description = description
6365 e . uid = "#{ reservable_type } -#{ slots_reservation . reservation . reservable . id } -#{ slots_reservation . slot . start_at . to_i } @fabmanager"
64- # e.status = slots_reservation.canceled_at ? 'CANCELLED' : 'CONFIRMED'
66+ e . status = slots_reservation . canceled_at ? 'CANCELLED' : 'CONFIRMED'
67+ e . sequence = slots_reservation . reservation . updated_at . to_i
68+ e . last_modified = slots_reservation . reservation . updated_at
6569 end
6670 end
6771 # reservation.grouped_slots.each do |_date, daily_groups|
@@ -95,6 +99,8 @@ def training_icalendar_event(cal)
9599 e . description = reservations_not_canceled . map { |r | user_name ( r ) } . join ( '\n' )
96100 e . uid = "#{ reservable_type } -#{ reservation . reservable_id } -#{ reservation . slots . first . start_at . to_i } @fabmanager"
97101 e . status = reservations_not_canceled . present? ? 'CONFIRMED' : 'CANCELLED'
102+ e . sequence = reservations . size
103+ e . last_modified = reservations . last . updated_at
98104 end
99105 end
100106 end
@@ -112,6 +118,8 @@ def event_icalendar_event(cal)
112118 e . description = build_event_description ( reservations_not_canceled )
113119 e . uid = "#{ reservable_type } -#{ reservation . reservable_id } -#{ reservation . slots . first . start_at . to_i } @fabmanager"
114120 e . status = reservations_not_canceled . present? ? 'CONFIRMED' : 'CANCELLED'
121+ e . sequence = reservations . size
122+ e . last_modified = reservations . last . updated_at
115123 end
116124 end
117125 end
0 commit comments