Skip to content

Commit c648519

Browse files
committed
add sequence, last_modified to ical event
1 parent 37683ea commit c648519

File tree

12 files changed

+22
-3
lines changed

12 files changed

+22
-3
lines changed

app/services/reservation_calendar_service.rb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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

config/locales/app.admin.de.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ de:
415415
training_reservations: "Training Reservations"
416416
event_reservations: "Event Reservations"
417417
space_reservations: "Space Reservations"
418+
cancelled: "Cancelled"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "iCalendar Import"

config/locales/app.admin.en.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ en:
415415
training_reservations: "Training Reservations"
416416
event_reservations: "Event Reservations"
417417
space_reservations: "Space Reservations"
418+
cancelled: "Cancelled"
418419
# import external iCal calendar
419420
icalendar:
420421
icalendar_import: "iCalendar import"

config/locales/app.admin.es-MX.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ es-MX:
415415
training_reservations: "Reserva de formación"
416416
event_reservations: "Reserva de evento"
417417
space_reservations: "Reservas de espacios"
418+
cancelled: "Cancelado"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "Importar iCalendar"

config/locales/app.admin.es.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ es:
415415
training_reservations: "Reserva de formación"
416416
event_reservations: "Reserva de evento"
417417
space_reservations: "Reservas de espacios"
418+
cancelled: "Cancelado"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "Importar iCalendar"

config/locales/app.admin.fr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ fr:
415415
training_reservations: "Réservation de formations"
416416
event_reservations: "Réservation d'événements"
417417
space_reservations: "Réservations d'espaces"
418+
cancelled: "Annulé"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "Import iCalendar"

config/locales/app.admin.it.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ it:
415415
training_reservations: "Training Reservations"
416416
event_reservations: "Event Reservations"
417417
space_reservations: "Space Reservations"
418+
cancelled: "Cancelled"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "importazione iCalendar"

config/locales/app.admin.no.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@
415415
training_reservations: "Training Reservations"
416416
event_reservations: "Event Reservations"
417417
space_reservations: "Space Reservations"
418+
cancelled: "Cancelled"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "iCalendar import"

config/locales/app.admin.pt.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ pt:
415415
training_reservations: "Training Reservations"
416416
event_reservations: "Event Reservations"
417417
space_reservations: "Space Reservations"
418+
cancelled: "Cancelled"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "importar iCalendar"

config/locales/app.admin.sv.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ sv:
415415
training_reservations: "Training Reservations"
416416
event_reservations: "Event Reservations"
417417
space_reservations: "Space Reservations"
418+
cancelled: "Cancelled"
418419
#import external iCal calendar
419420
icalendar:
420421
icalendar_import: "importera iCalendar"

0 commit comments

Comments
 (0)