ElPoyo/EM2_ERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix : probleme de la détection d'utilisation par un autre événement

Browse Source
This commit is contained in:
ElPoyo
2026-01-13 18:07:16 +01:00
parent 0f7a886cf7
commit 272b4bc9c9
7 changed files with 601 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
em2rp/lib/services/event_availability_service.dart
View File

@@ -84,6 +84,8 @@ class EventAvailabilityService {
final conflicts = <AvailabilityConflict>[];
try {
print('[EventAvailabilityService] Checking availability for equipment $equipmentId ($equipmentName)');
// Utiliser la Cloud Function pour vérifier la disponibilité
final result = await _dataService.checkEquipmentAvailability(
equipmentId: equipmentId,
@@ -92,24 +94,23 @@ class EventAvailabilityService {
excludeEventId: excludeEventId,
);
print('[EventAvailabilityService] Result for $equipmentId: $result');
final available = result['available'] as bool? ?? true;
print('[EventAvailabilityService] Equipment $equipmentId available: $available');
if (!available) {
final conflictsData = result['conflicts'] as List<dynamic>? ?? [];
// Récupérer les détails des événements en conflit
final eventsData = await _getEventsList();
print('[EventAvailabilityService] Found ${conflictsData.length} conflicts for equipment $equipmentId');
for (final conflictData in conflictsData) {
final conflict = conflictData as Map<String, dynamic>;
final eventId = conflict['eventId'] as String;
// Trouver l'événement correspondant
final eventData = eventsData.firstWhere(
(e) => e['id'] == eventId,
orElse: () => <String, dynamic>{},
);
// Le backend retourne déjà eventData
final eventData = conflict['eventData'] as Map<String, dynamic>?;
if (eventData.isNotEmpty) {
if (eventData != null && eventData.isNotEmpty) {
try {
final event = EventModel.fromMap(eventData, eventId);
conflicts.add(AvailabilityConflict(
@@ -118,8 +119,10 @@ class EventAvailabilityService {
conflictingEvent: event,
overlapDays: conflict['overlapDays'] as int? ?? 0,
));
print('[EventAvailabilityService] Added conflict with event ${event.name}');
} catch (e) {
print('[EventAvailabilityService] Error creating EventModel: $e');
print('[EventAvailabilityService] EventData: $eventData');
}
}
}
@@ -128,6 +131,7 @@ class EventAvailabilityService {
print('[EventAvailabilityService] Error checking availability: $e');
}
print('[EventAvailabilityService] Returning ${conflicts.length} conflicts for equipment $equipmentId');
return conflicts;
}