1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00

(bug) canceled reservations in dashboard

This commit is contained in:
Sylvain 2023-01-06 12:51:09 +01:00
parent a86a053636
commit 75a4783e43
3 changed files with 17 additions and 2 deletions

View File

@ -1,5 +1,6 @@
# Changelog Fab-manager
- Fix a bug: canceled reservations/slots not shown as it in the reservations dashboard
- Fix a bug: no main item on some invoices
- Fix a bug: unable to build accounting lines if no invoices
- Fix a bug: unable to apply rounding correction on accounting lines

View File

@ -89,18 +89,25 @@ const ReservationsPanel: React.FC<SpaceReservationsProps> = ({ userId, onError,
);
};
/**
* Check if all slots of the given reservation are canceled
*/
const isCancelled = (reservation: Reservation): boolean => {
return reservation.slots_reservations_attributes.map(sr => sr.canceled_at).every(ca => ca != null);
};
/**
* Render the reservation in a user-friendly way
*/
const renderReservation = (reservation: Reservation, state: 'past' | 'futur'): ReactNode => {
return (
<li key={reservation.id} className="reservation">
<a className={`reservation-title ${details[reservation.id] ? 'clicked' : ''}`} onClick={toggleDetails(reservation.id)}>
<a className={`reservation-title ${details[reservation.id] ? 'clicked' : ''} ${isCancelled(reservation) ? 'canceled' : ''}`} onClick={toggleDetails(reservation.id)}>
{reservation.reservable.name} - {FormatLib.date(reservation.slots_reservations_attributes[0].slot_attributes.start_at)}
</a>
{details[reservation.id] && <FabPopover title={t('app.logged.dashboard.reservations.reservations_panel.slots_details')}>
{reservation.slots_reservations_attributes.filter(s => filterSlot(s, state)).map(
slotReservation => <span key={slotReservation.id} className="slot-details">
slotReservation => <span key={slotReservation.id} className={`slot-details ${slotReservation.canceled_at ? 'canceled' : ''}`}>
{FormatLib.date(slotReservation.slot_attributes.start_at)}, {FormatLib.time(slotReservation.slot_attributes.start_at)} - {FormatLib.time(slotReservation.slot_attributes.end_at)}
</span>
)}

View File

@ -8,9 +8,16 @@
&.clicked {
color: var(--secondary-dark);
}
&.canceled {
text-decoration: line-through;
}
}
.slot-details {
display: block;
&.canceled {
text-decoration: line-through;
}
}
.fab-popover {