feat: Scan et traitement intelligent des QR Codes en préparation d'événement
Cette mise à jour majeure introduit une fonctionnalité de scan et de saisie manuelle de codes QR directement depuis la page de préparation d'un événement. Ce système accélère et fiabilise le processus de validation des équipements et des containers pour chaque étape (préparation, chargement, etc.), tout en ajoutant des retours sonores, haptiques et visuels pour une expérience utilisateur améliorée.
**Fonctionnalités et améliorations principales :**
- **Scan et saisie manuelle en préparation d'événement :**
- Ajout d'un champ de "Saisie manuelle" et d'un bouton "Scanner QR Code" sur la page de préparation (`EventPreparationPage`).
- Le scanner peut fonctionner en mode "multi-scan", permettant de valider plusieurs éléments à la suite sans fermer la caméra.
- Le système gère à la fois les équipements individuels et les containers (qui valident automatiquement tout leur contenu).
- **Logique de traitement intelligente (`QRCodeProcessingService`) :**
- Un nouveau service centralise la logique de traitement des codes.
- Pour les équipements quantitatifs, chaque scan incrémente la quantité jusqu'à atteindre la cible requise pour l'étape en cours.
- Pour les équipements non quantitatifs, le premier scan valide l'élément.
- Les scans multiples d'un élément déjà validé ou dont la quantité est atteinte génèrent une erreur.
- **Ajout dynamique d'équipements :**
- Si un code scanné n'est pas assigné à l'événement, une boîte de dialogue propose de rechercher l'équipement ou le container dans la base de données et de l'ajouter à l'événement en cours.
- **Feedbacks utilisateur :**
- Création d'un `AudioFeedbackService` pour fournir des retours sonores (succès/erreur) et haptiques (vibration) lors de chaque scan.
- Des `Snackbars` claires (vertes pour succès, orange pour erreur) informent l'utilisateur du résultat de chaque action.
- **Optimisation du chargement des données :**
- Nouvel endpoint backend `getEventWithDetails` qui charge un événement et toutes ses dépendances (équipements, containers et leurs enfants) en un seul appel, optimisant drastiquement les temps de chargement des pages de préparation et de modification d'événement.
- Le frontend (`EventPreparationPage`, `EventAssignedEquipmentSection`) utilise ce nouvel endpoint, éliminant les chargements multiples et fiabilisant l'affichage des données.
**Refactorisation et corrections :**
- **Structure du code :**
- La logique de traitement des codes est extraite dans le `QRCodeProcessingService`.
- Création de widgets dédiés (`CodeNotFoundDialog`, `AddEquipmentToEventDialog`) pour gérer les nouveaux flux utilisateurs.
- **Fiabilisation de l'état :**
- Mise à jour optimiste de l'UI lors du changement de statut d'un événement (`EventStatusButton`) pour une meilleure réactivité.
- Correction d'un bug dans la suppression d'un container d'un événement, qui pouvait retirer des équipements partagés avec d'autres containers.
- Correction d'un bug lors de l'ajout d'un container à un événement, qui n'ajoutait pas automatiquement ses équipements enfants.
- **Optimisations des performances UI :**
- Amélioration de la fluidité du défilement infini sur la page de gestion des équipements grâce à `RepaintBoundary` et à une gestion optimisée du chargement.
**Déploiement et version :**
- **Scripts de déploiement :** Ajout d'un script PowerShell (`deploy_hosting.ps1`) et amélioration du script Node.js pour automatiser et fiabiliser les déploiements sur Firebase Hosting.
- **Configuration CORS :** Les en-têtes CORS sont désormais configurés pour `version.json`, assurant le bon fonctionnement du mécanisme de mise à jour de l'application.
- **Version de l'application :** Incrémentée à `1.0.6`.
This commit is contained in:
@@ -14,7 +14,6 @@ import 'package:em2rp/views/widgets/common/qr_code_scanner_dialog.dart';
|
||||
import 'package:em2rp/views/widgets/common/qr_code_format_selector_dialog.dart';
|
||||
import 'package:em2rp/mixins/selection_mode_mixin.dart';
|
||||
import 'package:em2rp/views/widgets/management/management_card.dart';
|
||||
import 'package:em2rp/views/widgets/management/management_list.dart';
|
||||
import 'package:em2rp/utils/debug_log.dart';
|
||||
import 'package:em2rp/views/widgets/common/search_actions_bar.dart';
|
||||
import 'package:em2rp/views/widgets/notification_badge.dart';
|
||||
|
||||
@@ -17,7 +17,6 @@ import 'package:em2rp/views/widgets/common/qr_code_format_selector_dialog.dart';
|
||||
import 'package:em2rp/views/widgets/equipment/equipment_status_badge.dart';
|
||||
import 'package:em2rp/utils/debug_log.dart';
|
||||
import 'package:em2rp/mixins/selection_mode_mixin.dart';
|
||||
import 'package:em2rp/views/widgets/management/management_list.dart';
|
||||
import 'package:em2rp/views/widgets/common/search_actions_bar.dart';
|
||||
import 'package:em2rp/views/widgets/notification_badge.dart';
|
||||
|
||||
@@ -58,7 +57,7 @@ class _EquipmentManagementPageState extends State<EquipmentManagementPage>
|
||||
}
|
||||
|
||||
void _onScroll() {
|
||||
// Éviter les appels multiples
|
||||
// Éviter les appels multiples avec un flag simple (sans setState)
|
||||
if (_isLoadingMore) return;
|
||||
|
||||
final provider = context.read<EquipmentProvider>();
|
||||
@@ -70,16 +69,13 @@ class _EquipmentManagementPageState extends State<EquipmentManagementPage>
|
||||
|
||||
// Vérifier qu'on peut charger plus
|
||||
if (provider.hasMore && !provider.isLoadingMore) {
|
||||
setState(() => _isLoadingMore = true);
|
||||
// ✅ Pas de setState ici pour éviter les rebuilds pendant le scroll
|
||||
_isLoadingMore = true;
|
||||
|
||||
provider.loadNextPage().then((_) {
|
||||
if (mounted) {
|
||||
setState(() => _isLoadingMore = false);
|
||||
}
|
||||
_isLoadingMore = false;
|
||||
}).catchError((error) {
|
||||
if (mounted) {
|
||||
setState(() => _isLoadingMore = false);
|
||||
}
|
||||
_isLoadingMore = false;
|
||||
DebugLog.error('[EquipmentManagementPage] Error loading next page', error);
|
||||
});
|
||||
}
|
||||
@@ -502,15 +498,18 @@ class _EquipmentManagementPageState extends State<EquipmentManagementPage>
|
||||
return ListView.builder(
|
||||
controller: _scrollController,
|
||||
itemCount: itemCount,
|
||||
// ✅ Ajouter une estimation de la hauteur pour améliorer le scroll
|
||||
// Note : À ajuster selon la hauteur réelle de vos cartes
|
||||
// itemExtent: 140, // Décommentez si toutes les cartes ont la même hauteur
|
||||
// ✅ Augmenter le cache pour un scroll plus fluide
|
||||
cacheExtent: 500, // Précharger 500px en plus
|
||||
itemBuilder: (context, index) {
|
||||
// Dernier élément = indicateur de chargement
|
||||
if (index == equipments.length) {
|
||||
return Center(
|
||||
return const Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: provider.isLoadingMore
|
||||
? const CircularProgressIndicator()
|
||||
: const SizedBox.shrink(),
|
||||
padding: EdgeInsets.all(16.0),
|
||||
child: CircularProgressIndicator(),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -525,78 +524,81 @@ class _EquipmentManagementPageState extends State<EquipmentManagementPage>
|
||||
Widget _buildEquipmentCard(EquipmentModel equipment) {
|
||||
final isSelected = isItemSelected(equipment.id);
|
||||
|
||||
return Card(
|
||||
margin: const EdgeInsets.only(bottom: 12),
|
||||
color: isSelectionMode && isSelected
|
||||
? AppColors.rouge.withValues(alpha: 0.1)
|
||||
: null,
|
||||
child: ListTile(
|
||||
leading: isSelectionMode
|
||||
? Checkbox(
|
||||
value: isSelected,
|
||||
onChanged: (value) => toggleItemSelection(equipment.id),
|
||||
activeColor: AppColors.rouge,
|
||||
)
|
||||
: CircleAvatar(
|
||||
backgroundColor: equipment.category.color.withValues(alpha: 0.2),
|
||||
child: equipment.category.getIcon(
|
||||
size: 20,
|
||||
color: equipment.category.color,
|
||||
),
|
||||
),
|
||||
title: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
equipment.id,
|
||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
// Afficher le badge de statut calculé dynamiquement
|
||||
if (equipment.category != EquipmentCategory.consumable &&
|
||||
equipment.category != EquipmentCategory.cable)
|
||||
EquipmentStatusBadge(equipment: equipment),
|
||||
],
|
||||
),
|
||||
subtitle: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
'${equipment.brand ?? ''} ${equipment.model ?? ''}'
|
||||
.trim()
|
||||
.isNotEmpty
|
||||
? '${equipment.brand ?? ''} ${equipment.model ?? ''}'.trim()
|
||||
: 'Marque/Modèle non défini',
|
||||
style: TextStyle(color: Colors.grey[600], fontSize: 14),
|
||||
),
|
||||
// Afficher la sous-catégorie si elle existe
|
||||
if (equipment.subCategory != null && equipment.subCategory!.isNotEmpty) ...[
|
||||
const SizedBox(height: 2),
|
||||
Text(
|
||||
'📁 ${equipment.subCategory}',
|
||||
style: TextStyle(
|
||||
color: Colors.grey[500],
|
||||
fontSize: 12,
|
||||
fontStyle: FontStyle.italic,
|
||||
// ✅ RepaintBoundary pour isoler le repaint de chaque carte
|
||||
return RepaintBoundary(
|
||||
key: ValueKey(equipment.id),
|
||||
child: Card(
|
||||
margin: const EdgeInsets.only(bottom: 12),
|
||||
color: isSelectionMode && isSelected
|
||||
? AppColors.rouge.withValues(alpha: 0.1)
|
||||
: null,
|
||||
child: ListTile(
|
||||
leading: isSelectionMode
|
||||
? Checkbox(
|
||||
value: isSelected,
|
||||
onChanged: (value) => toggleItemSelection(equipment.id),
|
||||
activeColor: AppColors.rouge,
|
||||
)
|
||||
: CircleAvatar(
|
||||
backgroundColor: equipment.category.color.withValues(alpha: 0.2),
|
||||
child: equipment.category.getIcon(
|
||||
size: 20,
|
||||
color: equipment.category.color,
|
||||
),
|
||||
),
|
||||
title: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
equipment.id,
|
||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
// Afficher le badge de statut calculé dynamiquement
|
||||
if (equipment.category != EquipmentCategory.consumable &&
|
||||
equipment.category != EquipmentCategory.cable)
|
||||
EquipmentStatusBadge(equipment: equipment),
|
||||
],
|
||||
// Afficher la quantité disponible pour les consommables/câbles
|
||||
if (equipment.category == EquipmentCategory.consumable ||
|
||||
equipment.category == EquipmentCategory.cable) ...[
|
||||
),
|
||||
subtitle: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 4),
|
||||
_buildQuantityDisplay(equipment),
|
||||
Text(
|
||||
'${equipment.brand ?? ''} ${equipment.model ?? ''}'
|
||||
.trim()
|
||||
.isNotEmpty
|
||||
? '${equipment.brand ?? ''} ${equipment.model ?? ''}'.trim()
|
||||
: 'Marque/Modèle non défini',
|
||||
style: TextStyle(color: Colors.grey[600], fontSize: 14),
|
||||
),
|
||||
// Afficher la sous-catégorie si elle existe
|
||||
if (equipment.subCategory != null && equipment.subCategory!.isNotEmpty) ...[
|
||||
const SizedBox(height: 2),
|
||||
Text(
|
||||
'📁 ${equipment.subCategory}',
|
||||
style: TextStyle(
|
||||
color: Colors.grey[500],
|
||||
fontSize: 12,
|
||||
fontStyle: FontStyle.italic,
|
||||
),
|
||||
),
|
||||
],
|
||||
// Afficher la quantité disponible pour les consommables/câbles
|
||||
if (equipment.category == EquipmentCategory.consumable ||
|
||||
equipment.category == EquipmentCategory.cable) ...[
|
||||
const SizedBox(height: 4),
|
||||
_buildQuantityDisplay(equipment),
|
||||
],
|
||||
],
|
||||
],
|
||||
),
|
||||
trailing: isSelectionMode
|
||||
? null
|
||||
: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Bouton Restock (uniquement pour consommables/câbles avec permission)
|
||||
if (equipment.category == EquipmentCategory.consumable ||
|
||||
),
|
||||
trailing: isSelectionMode
|
||||
? null
|
||||
: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Bouton Restock (uniquement pour consommables/câbles avec permission)
|
||||
if (equipment.category == EquipmentCategory.consumable ||
|
||||
equipment.category == EquipmentCategory.cable)
|
||||
PermissionGate(
|
||||
requiredPermissions: const ['manage_equipment'],
|
||||
@@ -640,6 +642,7 @@ class _EquipmentManagementPageState extends State<EquipmentManagementPage>
|
||||
? () => toggleItemSelection(equipment.id)
|
||||
: () => _viewEquipmentDetails(equipment),
|
||||
),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:cloud_functions/cloud_functions.dart';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:em2rp/models/event_model.dart';
|
||||
import 'package:em2rp/models/equipment_model.dart';
|
||||
import 'package:em2rp/models/container_model.dart';
|
||||
@@ -10,8 +11,14 @@ import 'package:em2rp/providers/event_provider.dart';
|
||||
import 'package:em2rp/providers/local_user_provider.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
import 'package:em2rp/services/qr_code_processing_service.dart';
|
||||
import 'package:em2rp/services/audio_feedback_service.dart';
|
||||
import 'package:em2rp/services/equipment_service.dart';
|
||||
import 'package:em2rp/views/widgets/equipment/equipment_checklist_item.dart' show EquipmentChecklistItem, ChecklistStep;
|
||||
import 'package:em2rp/views/widgets/equipment/container_checklist_item.dart';
|
||||
import 'package:em2rp/views/widgets/common/qr_code_scanner_dialog.dart';
|
||||
import 'package:em2rp/views/widgets/event_preparation/code_not_found_dialog.dart';
|
||||
import 'package:em2rp/views/widgets/event_preparation/add_equipment_to_event_dialog.dart';
|
||||
import 'package:em2rp/utils/debug_log.dart';
|
||||
import 'package:em2rp/views/widgets/equipment/missing_equipment_dialog.dart';
|
||||
import 'package:em2rp/utils/colors.dart';
|
||||
@@ -40,6 +47,7 @@ class EventPreparationPage extends StatefulWidget {
|
||||
class _EventPreparationPageState extends State<EventPreparationPage> with SingleTickerProviderStateMixin {
|
||||
late AnimationController _animationController;
|
||||
late final DataService _dataService;
|
||||
late final QRCodeProcessingService _qrCodeService;
|
||||
|
||||
Map<String, EquipmentModel> _equipmentCache = {};
|
||||
Map<String, ContainerModel> _containerCache = {};
|
||||
@@ -48,8 +56,7 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
// État local des validations (non sauvegardé jusqu'à la validation finale)
|
||||
Map<String, bool> _localValidationState = {};
|
||||
|
||||
|
||||
// NOUVEAU : Gestion des quantités par étape
|
||||
// Gestion des quantités par étape
|
||||
Map<String, int> _quantitiesAtPreparation = {};
|
||||
Map<String, int> _quantitiesAtLoading = {};
|
||||
Map<String, int> _quantitiesAtUnloading = {};
|
||||
@@ -63,6 +70,10 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
// Stockage de l'événement actuel
|
||||
late EventModel _currentEvent;
|
||||
|
||||
// 🆕 Pour la saisie manuelle de codes
|
||||
final TextEditingController _manualCodeController = TextEditingController();
|
||||
final FocusNode _manualCodeFocusNode = FocusNode();
|
||||
|
||||
// Détermine l'étape actuelle selon le statut de l'événement
|
||||
PreparationStep get _currentStep {
|
||||
final prep = _currentEvent.preparationStatus ?? PreparationStatus.notStarted;
|
||||
@@ -100,6 +111,7 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
super.initState();
|
||||
_currentEvent = widget.initialEvent;
|
||||
_dataService = DataService(FirebaseFunctionsApiService());
|
||||
_qrCodeService = QRCodeProcessingService();
|
||||
_animationController = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(milliseconds: 500),
|
||||
@@ -140,6 +152,8 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
@override
|
||||
void dispose() {
|
||||
_animationController.dispose();
|
||||
_manualCodeController.dispose();
|
||||
_manualCodeFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -147,20 +161,46 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
setState(() => _isLoading = true);
|
||||
|
||||
try {
|
||||
final equipmentProvider = context.read<EquipmentProvider>();
|
||||
final containerProvider = context.read<ContainerProvider>();
|
||||
// 🔧 FIX: Utiliser getEventWithDetails pour charger toutes les données d'un coup
|
||||
DebugLog.info('[EventPreparationPage] Loading event with details: ${_currentEvent.id}');
|
||||
|
||||
// S'assurer que les équipements sont chargés
|
||||
await equipmentProvider.ensureLoaded();
|
||||
await containerProvider.ensureLoaded();
|
||||
final result = await _dataService.getEventWithDetails(_currentEvent.id);
|
||||
final equipmentsMap = result['equipments'] as Map<String, dynamic>;
|
||||
final containersMap = result['containers'] as Map<String, dynamic>;
|
||||
|
||||
final equipment = await equipmentProvider.equipmentStream.first;
|
||||
final containers = await containerProvider.containersStream.first;
|
||||
DebugLog.info('[EventPreparationPage] Loaded ${equipmentsMap.length} equipments and ${containersMap.length} containers with details');
|
||||
|
||||
// Remplir les caches
|
||||
_equipmentCache.clear();
|
||||
_containerCache.clear();
|
||||
|
||||
// Remplir le cache d'équipements
|
||||
equipmentsMap.forEach((id, data) {
|
||||
try {
|
||||
final equipment = EquipmentModel.fromMap(data as Map<String, dynamic>, id);
|
||||
_equipmentCache[id] = equipment;
|
||||
} catch (e) {
|
||||
DebugLog.error('[EventPreparationPage] Error parsing equipment $id', e);
|
||||
}
|
||||
});
|
||||
|
||||
// Remplir le cache de containers
|
||||
containersMap.forEach((id, data) {
|
||||
try {
|
||||
final container = ContainerModel.fromMap(data as Map<String, dynamic>, id);
|
||||
_containerCache[id] = container;
|
||||
} catch (e) {
|
||||
DebugLog.error('[EventPreparationPage] Error parsing container $id', e);
|
||||
}
|
||||
});
|
||||
|
||||
// Initialiser les états de validation et quantités pour chaque équipement assigné
|
||||
for (var eq in _currentEvent.assignedEquipment) {
|
||||
final equipmentItem = equipment.firstWhere(
|
||||
(e) => e.id == eq.equipmentId,
|
||||
orElse: () => EquipmentModel(
|
||||
final equipmentItem = _equipmentCache[eq.equipmentId];
|
||||
|
||||
// S'assurer que l'équipement est dans le cache (même si inconnu)
|
||||
if (equipmentItem == null) {
|
||||
_equipmentCache[eq.equipmentId] = EquipmentModel(
|
||||
id: eq.equipmentId,
|
||||
name: 'Équipement inconnu',
|
||||
category: EquipmentCategory.other,
|
||||
@@ -168,9 +208,8 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
maintenanceIds: [],
|
||||
createdAt: DateTime.now(),
|
||||
updatedAt: DateTime.now(),
|
||||
),
|
||||
);
|
||||
_equipmentCache[eq.equipmentId] = equipmentItem;
|
||||
);
|
||||
}
|
||||
|
||||
// Initialiser l'état local de validation depuis l'événement
|
||||
switch (_currentStep) {
|
||||
@@ -190,15 +229,15 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
|
||||
if ((_currentStep == PreparationStep.return_ ||
|
||||
_currentStep == PreparationStep.unloadingReturn) &&
|
||||
equipmentItem.hasQuantity) {
|
||||
(equipmentItem?.hasQuantity ?? false)) {
|
||||
_returnedQuantities[eq.equipmentId] = eq.quantityAtReturn ?? eq.quantity;
|
||||
}
|
||||
}
|
||||
|
||||
// S'assurer que les containers assignés sont dans le cache (même si inconnus)
|
||||
for (var containerId in _currentEvent.assignedContainers) {
|
||||
final container = containers.firstWhere(
|
||||
(c) => c.id == containerId,
|
||||
orElse: () => ContainerModel(
|
||||
if (!_containerCache.containsKey(containerId)) {
|
||||
_containerCache[containerId] = ContainerModel(
|
||||
id: containerId,
|
||||
name: 'Conteneur inconnu',
|
||||
type: ContainerType.flightCase,
|
||||
@@ -206,9 +245,8 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
equipmentIds: [],
|
||||
updatedAt: DateTime.now(),
|
||||
createdAt: DateTime.now(),
|
||||
),
|
||||
);
|
||||
_containerCache[containerId] = container;
|
||||
);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
DebugLog.error('[EventPreparationPage] Error', e);
|
||||
@@ -564,6 +602,311 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// 🆕 NOUVELLES MÉTHODES POUR LE SCAN QR ET LA SAISIE MANUELLE
|
||||
// ========================================================================
|
||||
|
||||
/// Ouvrir le scanner QR en mode multi-scan
|
||||
Future<void> _openQRScanner() async {
|
||||
await showDialog(
|
||||
context: context,
|
||||
builder: (context) => QRCodeScannerDialog(
|
||||
multiScanMode: true,
|
||||
onCodeScanned: _handleScannedCode,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Traiter un code (scanné ou saisi manuellement)
|
||||
Future<void> _handleScannedCode(String code) async {
|
||||
final result = await _qrCodeService.processCode(
|
||||
code: code.trim(),
|
||||
event: _currentEvent,
|
||||
step: _currentStep,
|
||||
equipmentCache: _equipmentCache,
|
||||
containerCache: _containerCache,
|
||||
validationState: _localValidationState,
|
||||
currentQuantities: _getCurrentQuantitiesMap(),
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
// ✅ Succès : mettre à jour l'état
|
||||
setState(() {
|
||||
if (result.updatedValidationState != null) {
|
||||
_localValidationState.addAll(result.updatedValidationState!);
|
||||
}
|
||||
if (result.updatedQuantities != null) {
|
||||
_updateQuantitiesMap(result.updatedQuantities!);
|
||||
}
|
||||
});
|
||||
|
||||
// 🔊 Jouer le feedback sonore et haptique
|
||||
await AudioFeedbackService.playFullFeedback(isSuccess: true);
|
||||
|
||||
// Feedback visuel
|
||||
_showSuccessFeedback(result.message ?? 'Code traité avec succès');
|
||||
|
||||
} else if (result.codeNotFoundInEvent) {
|
||||
// 🔍 Code non trouvé dans l'événement → proposer de l'ajouter
|
||||
await _handleCodeNotFoundInEvent(code.trim());
|
||||
|
||||
} else {
|
||||
// ❌ Erreur (ex: quantité déjà atteinte, déjà coché)
|
||||
await AudioFeedbackService.playFullFeedback(isSuccess: false);
|
||||
_showErrorFeedback(result.message ?? 'Erreur lors du traitement');
|
||||
}
|
||||
}
|
||||
|
||||
/// Gérer un code non trouvé dans l'événement
|
||||
Future<void> _handleCodeNotFoundInEvent(String code) async {
|
||||
// Afficher le dialog de confirmation
|
||||
final shouldSearch = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => CodeNotFoundDialog(scannedCode: code),
|
||||
);
|
||||
|
||||
if (shouldSearch != true) return;
|
||||
|
||||
// Afficher le dialog de chargement
|
||||
showDialog(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (context) => const AddEquipmentToEventDialog(
|
||||
state: AddEquipmentState.loading,
|
||||
),
|
||||
);
|
||||
|
||||
try {
|
||||
// Identifier le type selon le préfixe
|
||||
final isContainer = code.startsWith('BOX_');
|
||||
|
||||
if (isContainer) {
|
||||
await _addContainerToEvent(code);
|
||||
} else {
|
||||
await _addEquipmentToEvent(code);
|
||||
}
|
||||
|
||||
// 🔊 Bip de succès
|
||||
await AudioFeedbackService.playFullFeedback(isSuccess: true);
|
||||
|
||||
} catch (e) {
|
||||
DebugLog.error('[EventPreparationPage] Error adding item to event', e);
|
||||
|
||||
// Fermer le dialog de chargement et afficher l'erreur
|
||||
if (mounted) Navigator.of(context).pop();
|
||||
|
||||
await showDialog(
|
||||
context: context,
|
||||
builder: (context) => AddEquipmentToEventDialog(
|
||||
state: AddEquipmentState.error,
|
||||
errorMessage: e.toString(),
|
||||
),
|
||||
);
|
||||
|
||||
// 🔊 Bip d'erreur
|
||||
await AudioFeedbackService.playFullFeedback(isSuccess: false);
|
||||
}
|
||||
}
|
||||
|
||||
/// Ajouter un équipement à l'événement
|
||||
Future<void> _addEquipmentToEvent(String equipmentId) async {
|
||||
// Rechercher l'équipement dans la base de données
|
||||
final equipmentProvider = context.read<EquipmentProvider>();
|
||||
await equipmentProvider.ensureLoaded();
|
||||
|
||||
// Chercher d'abord dans le cache
|
||||
EquipmentModel? equipment = equipmentProvider.allEquipment
|
||||
.cast<EquipmentModel?>()
|
||||
.firstWhere(
|
||||
(eq) => eq?.id == equipmentId,
|
||||
orElse: () => null,
|
||||
);
|
||||
|
||||
// Si pas dans le cache, charger depuis Firestore
|
||||
if (equipment == null) {
|
||||
final equipmentService = EquipmentService();
|
||||
equipment = await equipmentService.getEquipmentById(equipmentId);
|
||||
}
|
||||
|
||||
if (equipment == null) {
|
||||
throw Exception('Équipement non trouvé dans la base de données');
|
||||
}
|
||||
|
||||
// Ajouter l'équipement à l'événement
|
||||
final newEventEquipment = EventEquipment(
|
||||
equipmentId: equipmentId,
|
||||
quantity: 1,
|
||||
);
|
||||
|
||||
final updatedEquipment = List<EventEquipment>.from(_currentEvent.assignedEquipment)
|
||||
..add(newEventEquipment);
|
||||
|
||||
await _dataService.updateEvent(_currentEvent.id, {
|
||||
'assignedEquipment': updatedEquipment.map((e) => e.toMap()).toList(),
|
||||
});
|
||||
|
||||
// Mettre à jour l'état local
|
||||
setState(() {
|
||||
_currentEvent = _currentEvent.copyWith(
|
||||
assignedEquipment: updatedEquipment,
|
||||
);
|
||||
_equipmentCache[equipmentId] = equipment!;
|
||||
_localValidationState[equipmentId] = false;
|
||||
});
|
||||
|
||||
// Fermer le dialog de chargement et afficher le succès
|
||||
if (mounted) Navigator.of(context).pop();
|
||||
|
||||
await showDialog(
|
||||
context: context,
|
||||
builder: (context) => AddEquipmentToEventDialog(
|
||||
state: AddEquipmentState.success,
|
||||
itemName: equipment!.name,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Ajouter un container à l'événement
|
||||
Future<void> _addContainerToEvent(String containerId) async {
|
||||
// Rechercher le container dans la base de données
|
||||
final containerProvider = context.read<ContainerProvider>();
|
||||
await containerProvider.ensureLoaded();
|
||||
|
||||
final container = await containerProvider.getContainerById(containerId);
|
||||
|
||||
if (container == null) {
|
||||
throw Exception('Container non trouvé dans la base de données');
|
||||
}
|
||||
|
||||
// Ajouter le container à l'événement
|
||||
final updatedContainers = List<String>.from(_currentEvent.assignedContainers)
|
||||
..add(containerId);
|
||||
|
||||
await _dataService.updateEvent(_currentEvent.id, {
|
||||
'assignedContainers': updatedContainers,
|
||||
});
|
||||
|
||||
// Mettre à jour l'état local
|
||||
setState(() {
|
||||
_currentEvent = _currentEvent.copyWith(
|
||||
assignedContainers: updatedContainers,
|
||||
);
|
||||
_containerCache[containerId] = container;
|
||||
});
|
||||
|
||||
// Fermer le dialog de chargement et afficher le succès
|
||||
if (mounted) Navigator.of(context).pop();
|
||||
|
||||
await showDialog(
|
||||
context: context,
|
||||
builder: (context) => AddEquipmentToEventDialog(
|
||||
state: AddEquipmentState.success,
|
||||
itemName: 'Container ${container.name}',
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Traiter la saisie manuelle d'un code
|
||||
Future<void> _handleManualCodeEntry(String code) async {
|
||||
if (code.trim().isEmpty) return;
|
||||
|
||||
await _handleScannedCode(code.trim());
|
||||
|
||||
// Effacer le champ après traitement
|
||||
_manualCodeController.clear();
|
||||
}
|
||||
|
||||
/// Obtenir les quantités actuelles selon l'étape
|
||||
Map<String, int> _getCurrentQuantitiesMap() {
|
||||
switch (_currentStep) {
|
||||
case PreparationStep.preparation:
|
||||
return _quantitiesAtPreparation;
|
||||
case PreparationStep.loadingOutbound:
|
||||
return _quantitiesAtLoading;
|
||||
case PreparationStep.unloadingReturn:
|
||||
return _quantitiesAtUnloading;
|
||||
case PreparationStep.return_:
|
||||
return _quantitiesAtReturn;
|
||||
}
|
||||
}
|
||||
|
||||
/// Mettre à jour les quantités selon l'étape
|
||||
void _updateQuantitiesMap(Map<String, int> quantities) {
|
||||
switch (_currentStep) {
|
||||
case PreparationStep.preparation:
|
||||
_quantitiesAtPreparation.addAll(quantities);
|
||||
break;
|
||||
case PreparationStep.loadingOutbound:
|
||||
_quantitiesAtLoading.addAll(quantities);
|
||||
break;
|
||||
case PreparationStep.unloadingReturn:
|
||||
_quantitiesAtUnloading.addAll(quantities);
|
||||
break;
|
||||
case PreparationStep.return_:
|
||||
_quantitiesAtReturn.addAll(quantities);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/// Obtenir la quantité requise selon l'étape (nouvelle logique)
|
||||
int _getTargetQuantity(EventEquipment eventEquipment) {
|
||||
switch (_currentStep) {
|
||||
case PreparationStep.preparation:
|
||||
return eventEquipment.quantity; // Quantité initiale
|
||||
case PreparationStep.loadingOutbound:
|
||||
return eventEquipment.quantityAtPreparation ?? eventEquipment.quantity;
|
||||
case PreparationStep.unloadingReturn:
|
||||
return eventEquipment.quantityAtLoading ??
|
||||
eventEquipment.quantityAtPreparation ??
|
||||
eventEquipment.quantity;
|
||||
case PreparationStep.return_:
|
||||
return eventEquipment.quantityAtUnloading ??
|
||||
eventEquipment.quantityAtLoading ??
|
||||
eventEquipment.quantityAtPreparation ??
|
||||
eventEquipment.quantity;
|
||||
}
|
||||
}
|
||||
|
||||
/// Afficher un message de succès
|
||||
void _showSuccessFeedback(String message) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Row(
|
||||
children: [
|
||||
const Icon(Icons.check_circle, color: Colors.white),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: Text(message)),
|
||||
],
|
||||
),
|
||||
backgroundColor: Colors.green,
|
||||
duration: const Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Afficher un message d'erreur
|
||||
void _showErrorFeedback(String message) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Row(
|
||||
children: [
|
||||
const Icon(Icons.error, color: Colors.white),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: Text(message)),
|
||||
],
|
||||
),
|
||||
backgroundColor: Colors.orange,
|
||||
duration: const Duration(seconds: 3),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// FIN DES NOUVELLES MÉTHODES
|
||||
// ========================================================================
|
||||
|
||||
Future<void> _confirm() async {
|
||||
// Vérifier s'il y a des équipements manquants (non cochés localement)
|
||||
final missingEquipmentIds = _currentEvent.assignedEquipment
|
||||
@@ -842,6 +1185,50 @@ class _EventPreparationPageState extends State<EventPreparationPage> with Single
|
||||
contentPadding: EdgeInsets.zero,
|
||||
),
|
||||
|
||||
// 🆕 Champ de saisie manuelle de code
|
||||
const SizedBox(height: 16),
|
||||
TextField(
|
||||
controller: _manualCodeController,
|
||||
focusNode: _manualCodeFocusNode,
|
||||
decoration: InputDecoration(
|
||||
labelText: 'Saisie manuelle d\'un code',
|
||||
hintText: 'Entrez un ID d\'équipement ou container',
|
||||
prefixIcon: const Icon(Icons.keyboard, color: AppColors.bleuFonce),
|
||||
suffixIcon: _manualCodeController.text.isNotEmpty
|
||||
? IconButton(
|
||||
icon: const Icon(Icons.clear),
|
||||
onPressed: () {
|
||||
_manualCodeController.clear();
|
||||
setState(() {});
|
||||
},
|
||||
)
|
||||
: null,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: const BorderSide(color: AppColors.bleuFonce, width: 2),
|
||||
),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
),
|
||||
onSubmitted: _handleManualCodeEntry,
|
||||
onChanged: (value) => setState(() {}),
|
||||
textInputAction: TextInputAction.done,
|
||||
),
|
||||
|
||||
// 🆕 Bouton Scanner QR Code
|
||||
const SizedBox(height: 12),
|
||||
ElevatedButton.icon(
|
||||
onPressed: _openQRScanner,
|
||||
icon: const Icon(Icons.qr_code_scanner),
|
||||
label: const Text('Scanner QR Code'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Colors.blue[700],
|
||||
padding: const EdgeInsets.symmetric(vertical: 12),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 8),
|
||||
ElevatedButton.icon(
|
||||
onPressed: allValidated ? null : _validateAllAndConfirm,
|
||||
|
||||
@@ -23,39 +23,40 @@ class EventStatusButton extends StatefulWidget {
|
||||
|
||||
class _EventStatusButtonState extends State<EventStatusButton> {
|
||||
bool _loading = false;
|
||||
EventStatus? _optimisticStatus;
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
|
||||
Future<void> _changeStatus(EventStatus newStatus) async {
|
||||
if (widget.event.status == newStatus) return;
|
||||
setState(() => _loading = true);
|
||||
|
||||
if ((widget.event.status == newStatus) || _loading) return;
|
||||
setState(() {
|
||||
_loading = true;
|
||||
_optimisticStatus = newStatus;
|
||||
});
|
||||
final oldStatus = widget.event.status;
|
||||
try {
|
||||
// Mettre à jour via l'API
|
||||
await _dataService.updateEvent(widget.event.id, {
|
||||
'status': eventStatusToString(newStatus),
|
||||
});
|
||||
|
||||
// Récupérer l'événement mis à jour via l'API
|
||||
final result = await _dataService.getEvents();
|
||||
final eventsList = result['events'] as List<dynamic>;
|
||||
final eventData = eventsList.firstWhere(
|
||||
(e) => e['id'] == widget.event.id,
|
||||
orElse: () => <String, dynamic>{},
|
||||
);
|
||||
|
||||
if (eventData.isNotEmpty) {
|
||||
final updatedEvent = EventModel.fromMap(eventData, widget.event.id);
|
||||
|
||||
widget.onSelectEvent(
|
||||
updatedEvent,
|
||||
widget.selectedDate ?? updatedEvent.startDateTime,
|
||||
);
|
||||
|
||||
await Provider.of<EventProvider>(context, listen: false)
|
||||
.updateEvent(updatedEvent);
|
||||
}
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_optimisticStatus = oldStatus;
|
||||
});
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Erreur lors du changement de statut: $e')),
|
||||
);
|
||||
@@ -69,11 +70,22 @@ class _EventStatusButtonState extends State<EventStatusButton> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final status = widget.event.status;
|
||||
final status = _optimisticStatus ?? widget.event.status;
|
||||
String texte;
|
||||
Color couleurFond;
|
||||
List<Widget> enfants = [];
|
||||
|
||||
if (_loading) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
child: const SizedBox(
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
switch (status) {
|
||||
case EventStatus.waitingForApproval:
|
||||
texte = "En Attente";
|
||||
|
||||
@@ -4,7 +4,17 @@ import 'package:em2rp/utils/colors.dart';
|
||||
|
||||
/// Dialog pour scanner un QR code et récupérer l'ID
|
||||
class QRCodeScannerDialog extends StatefulWidget {
|
||||
const QRCodeScannerDialog({super.key});
|
||||
/// Callback appelé quand un code est scanné (mode multi-scan)
|
||||
final Function(String code)? onCodeScanned;
|
||||
|
||||
/// Active le mode scan continu (ne ferme pas automatiquement)
|
||||
final bool multiScanMode;
|
||||
|
||||
const QRCodeScannerDialog({
|
||||
super.key,
|
||||
this.onCodeScanned,
|
||||
this.multiScanMode = false,
|
||||
});
|
||||
|
||||
@override
|
||||
State<QRCodeScannerDialog> createState() => _QRCodeScannerDialogState();
|
||||
@@ -45,12 +55,27 @@ class _QRCodeScannerDialogState extends State<QRCodeScannerDialog> {
|
||||
_scannedCode = code;
|
||||
});
|
||||
|
||||
// Retourner le code après un court délai pour montrer le feedback visuel
|
||||
Future.delayed(const Duration(milliseconds: 500), () {
|
||||
if (mounted) {
|
||||
Navigator.of(context).pop(code);
|
||||
}
|
||||
});
|
||||
if (widget.multiScanMode && widget.onCodeScanned != null) {
|
||||
// Mode multi-scan : appeler le callback et rester ouvert
|
||||
widget.onCodeScanned!(code);
|
||||
|
||||
// Réinitialiser après un délai pour permettre un nouveau scan
|
||||
Future.delayed(const Duration(milliseconds: 800), () {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isProcessing = false;
|
||||
_scannedCode = null;
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// Mode simple : retourner le code et fermer
|
||||
Future.delayed(const Duration(milliseconds: 500), () {
|
||||
if (mounted) {
|
||||
Navigator.of(context).pop(code);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@ import 'package:em2rp/models/equipment_model.dart';
|
||||
import 'package:em2rp/models/container_model.dart';
|
||||
import 'package:em2rp/providers/equipment_provider.dart';
|
||||
import 'package:em2rp/providers/container_provider.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
import 'package:em2rp/utils/colors.dart';
|
||||
import 'package:em2rp/views/widgets/event/equipment_selection_dialog.dart';
|
||||
import 'package:em2rp/views/widgets/event/equipment_conflict_dialog.dart';
|
||||
@@ -37,6 +39,7 @@ class EventAssignedEquipmentSection extends StatefulWidget {
|
||||
class _EventAssignedEquipmentSectionState extends State<EventAssignedEquipmentSection> {
|
||||
bool get _canAddMaterial => widget.startDate != null && widget.endDate != null;
|
||||
final EventAvailabilityService _availabilityService = EventAvailabilityService();
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
Map<String, EquipmentModel> _equipmentCache = {};
|
||||
Map<String, ContainerModel> _containerCache = {};
|
||||
bool _isLoading = true;
|
||||
@@ -64,52 +67,100 @@ class _EventAssignedEquipmentSectionState extends State<EventAssignedEquipmentSe
|
||||
final equipmentProvider = context.read<EquipmentProvider>();
|
||||
final containerProvider = context.read<ContainerProvider>();
|
||||
|
||||
// Extraire les IDs des équipements assignés
|
||||
final equipmentIds = widget.assignedEquipment
|
||||
.map((eq) => eq.equipmentId)
|
||||
.toList();
|
||||
// 🔧 FIX: Si on a un eventId, utiliser getEventWithDetails pour charger les données complètes
|
||||
if (widget.eventId != null && widget.eventId!.isNotEmpty) {
|
||||
DebugLog.info('[EventAssignedEquipmentSection] Loading event with details: ${widget.eventId}');
|
||||
|
||||
// Charger UNIQUEMENT les équipements nécessaires (optimisé)
|
||||
final equipment = await equipmentProvider.getEquipmentsByIds(equipmentIds);
|
||||
final result = await _dataService.getEventWithDetails(widget.eventId!);
|
||||
final equipmentsMap = result['equipments'] as Map<String, dynamic>;
|
||||
final containersMap = result['containers'] as Map<String, dynamic>;
|
||||
|
||||
// Charger UNIQUEMENT les conteneurs nécessaires (optimisé)
|
||||
final containers = await containerProvider.getContainersByIds(widget.assignedContainers);
|
||||
DebugLog.info('[EventAssignedEquipmentSection] Loaded ${equipmentsMap.length} equipments and ${containersMap.length} containers with details');
|
||||
|
||||
// Créer le cache des équipements
|
||||
for (var eq in widget.assignedEquipment) {
|
||||
final equipmentItem = equipment.firstWhere(
|
||||
(e) => e.id == eq.equipmentId,
|
||||
orElse: () => EquipmentModel(
|
||||
id: eq.equipmentId,
|
||||
name: 'Équipement inconnu',
|
||||
category: EquipmentCategory.other,
|
||||
status: EquipmentStatus.available,
|
||||
maintenanceIds: [],
|
||||
createdAt: DateTime.now(),
|
||||
updatedAt: DateTime.now(),
|
||||
),
|
||||
);
|
||||
_equipmentCache[eq.equipmentId] = equipmentItem;
|
||||
}
|
||||
// Construire les caches à partir des données reçues
|
||||
_equipmentCache.clear();
|
||||
_containerCache.clear();
|
||||
|
||||
// Créer le cache des conteneurs
|
||||
for (var containerId in widget.assignedContainers) {
|
||||
final container = containers.firstWhere(
|
||||
(c) => c.id == containerId,
|
||||
orElse: () => ContainerModel(
|
||||
id: containerId,
|
||||
name: 'Conteneur inconnu',
|
||||
type: ContainerType.flightCase,
|
||||
status: EquipmentStatus.available,
|
||||
equipmentIds: [],
|
||||
updatedAt: DateTime.now(),
|
||||
createdAt: DateTime.now(),
|
||||
),
|
||||
);
|
||||
_containerCache[containerId] = container;
|
||||
// Remplir le cache d'équipements
|
||||
equipmentsMap.forEach((id, data) {
|
||||
try {
|
||||
_equipmentCache[id] = EquipmentModel.fromMap(data as Map<String, dynamic>, id);
|
||||
} catch (e) {
|
||||
DebugLog.error('[EventAssignedEquipmentSection] Error parsing equipment $id', e);
|
||||
}
|
||||
});
|
||||
|
||||
// Remplir le cache de containers
|
||||
containersMap.forEach((id, data) {
|
||||
try {
|
||||
_containerCache[id] = ContainerModel.fromMap(data as Map<String, dynamic>, id);
|
||||
} catch (e) {
|
||||
DebugLog.error('[EventAssignedEquipmentSection] Error parsing container $id', e);
|
||||
}
|
||||
});
|
||||
|
||||
DebugLog.info('[EventAssignedEquipmentSection] Caches populated: ${_equipmentCache.length} equipments, ${_containerCache.length} containers');
|
||||
|
||||
} else {
|
||||
// Mode création d'événement : charger via les providers
|
||||
DebugLog.info('[EventAssignedEquipmentSection] Loading via providers (creation mode)');
|
||||
|
||||
// Extraire les IDs des équipements assignés
|
||||
final equipmentIds = widget.assignedEquipment
|
||||
.map((eq) => eq.equipmentId)
|
||||
.toList();
|
||||
|
||||
// Charger les conteneurs
|
||||
final containers = await containerProvider.getContainersByIds(widget.assignedContainers);
|
||||
|
||||
// Extraire les IDs des équipements enfants des containers
|
||||
final childEquipmentIds = <String>[];
|
||||
for (var container in containers) {
|
||||
childEquipmentIds.addAll(container.equipmentIds);
|
||||
}
|
||||
|
||||
// Combiner les IDs des équipements assignés + enfants des containers
|
||||
final allEquipmentIds = <String>{...equipmentIds, ...childEquipmentIds}.toList();
|
||||
|
||||
// Charger TOUS les équipements nécessaires
|
||||
final equipment = await equipmentProvider.getEquipmentsByIds(allEquipmentIds);
|
||||
|
||||
// Créer le cache des équipements
|
||||
for (var eq in widget.assignedEquipment) {
|
||||
final equipmentItem = equipment.firstWhere(
|
||||
(e) => e.id == eq.equipmentId,
|
||||
orElse: () => EquipmentModel(
|
||||
id: eq.equipmentId,
|
||||
name: 'Équipement inconnu',
|
||||
category: EquipmentCategory.other,
|
||||
status: EquipmentStatus.available,
|
||||
maintenanceIds: [],
|
||||
createdAt: DateTime.now(),
|
||||
updatedAt: DateTime.now(),
|
||||
),
|
||||
);
|
||||
_equipmentCache[eq.equipmentId] = equipmentItem;
|
||||
}
|
||||
|
||||
// Créer le cache des conteneurs
|
||||
for (var containerId in widget.assignedContainers) {
|
||||
final container = containers.firstWhere(
|
||||
(c) => c.id == containerId,
|
||||
orElse: () => ContainerModel(
|
||||
id: containerId,
|
||||
name: 'Conteneur inconnu',
|
||||
type: ContainerType.flightCase,
|
||||
status: EquipmentStatus.available,
|
||||
equipmentIds: [],
|
||||
updatedAt: DateTime.now(),
|
||||
createdAt: DateTime.now(),
|
||||
),
|
||||
);
|
||||
_containerCache[containerId] = container;
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// Erreur silencieuse - le cache restera vide
|
||||
DebugLog.error('[EventAssignedEquipmentSection] Error loading equipment and containers', e);
|
||||
} finally {
|
||||
setState(() => _isLoading = false);
|
||||
}
|
||||
@@ -156,6 +207,26 @@ class _EventAssignedEquipmentSectionState extends State<EventAssignedEquipmentSe
|
||||
|
||||
DebugLog.info('[EventAssignedEquipmentSection] Found ${newEquipment.length} equipment(s) and ${newContainers.length} container(s)');
|
||||
|
||||
// 🔧 FIX: Pour chaque container sélectionné, ajouter aussi ses équipements enfants
|
||||
if (newContainers.isNotEmpty) {
|
||||
final containerProvider = context.read<ContainerProvider>();
|
||||
final containers = await containerProvider.getContainersByIds(newContainers);
|
||||
|
||||
for (var container in containers) {
|
||||
for (var childEquipmentId in container.equipmentIds) {
|
||||
// Vérifier si l'équipement enfant n'est pas déjà dans la liste
|
||||
final existsInNew = newEquipment.any((eq) => eq.equipmentId == childEquipmentId);
|
||||
if (!existsInNew) {
|
||||
newEquipment.add(EventEquipment(
|
||||
equipmentId: childEquipmentId,
|
||||
quantity: 1,
|
||||
));
|
||||
DebugLog.info('[EventAssignedEquipmentSection] Adding child equipment $childEquipmentId from container ${container.id}');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ✅ Pas de vérification de conflits : déjà fait dans le pop-up
|
||||
// On enregistre directement la sélection
|
||||
|
||||
@@ -217,25 +288,47 @@ class _EventAssignedEquipmentSectionState extends State<EventAssignedEquipmentSe
|
||||
.where((id) => id != containerId)
|
||||
.toList();
|
||||
|
||||
// Retirer les équipements enfants de la liste des équipements assignés
|
||||
final updatedEquipment = widget.assignedEquipment.where((eq) {
|
||||
if (container != null) {
|
||||
// Garder uniquement les équipements qui ne sont PAS dans ce conteneur
|
||||
return !container.equipmentIds.contains(eq.equipmentId);
|
||||
}
|
||||
return true;
|
||||
}).toList();
|
||||
// 🔧 FIX: Ne supprimer les équipements enfants QUE s'ils ne sont pas dans un autre container
|
||||
final updatedEquipment = <EventEquipment>[];
|
||||
|
||||
if (container != null) {
|
||||
// Collecter les IDs d'équipements dans les autres containers
|
||||
final Set<String> equipmentIdsInOtherContainers = {};
|
||||
for (var otherContainerId in updatedContainers) {
|
||||
final otherContainer = _containerCache[otherContainerId];
|
||||
if (otherContainer != null) {
|
||||
equipmentIdsInOtherContainers.addAll(otherContainer.equipmentIds);
|
||||
}
|
||||
}
|
||||
|
||||
// Garder les équipements qui :
|
||||
// 1. Ne sont PAS dans le container supprimé OU
|
||||
// 2. Sont dans le container supprimé MAIS aussi dans un autre container
|
||||
for (var eq in widget.assignedEquipment) {
|
||||
final isInRemovedContainer = container.equipmentIds.contains(eq.equipmentId);
|
||||
final isInOtherContainer = equipmentIdsInOtherContainers.contains(eq.equipmentId);
|
||||
|
||||
if (!isInRemovedContainer || isInOtherContainer) {
|
||||
updatedEquipment.add(eq);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Si le container n'est pas dans le cache, garder tous les équipements
|
||||
updatedEquipment.addAll(widget.assignedEquipment);
|
||||
}
|
||||
|
||||
// Notifier le changement avec les deux listes mises à jour
|
||||
widget.onChanged(updatedEquipment, updatedContainers);
|
||||
|
||||
setState(() {
|
||||
_containerCache.remove(containerId);
|
||||
// Retirer aussi les équipements enfants du cache
|
||||
// Nettoyer le cache uniquement pour les équipements effectivement supprimés
|
||||
if (container != null) {
|
||||
final remainingEquipmentIds = updatedEquipment.map((eq) => eq.equipmentId).toSet();
|
||||
for (var equipmentId in container.equipmentIds) {
|
||||
_equipmentCache.remove(equipmentId);
|
||||
if (!remainingEquipmentIds.contains(equipmentId)) {
|
||||
_equipmentCache.remove(equipmentId);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -444,79 +537,69 @@ class _EventAssignedEquipmentSectionState extends State<EventAssignedEquipmentSe
|
||||
onPressed: () => _removeContainer(container.id),
|
||||
),
|
||||
children: [
|
||||
// Afficher les équipements enfants (par composition)
|
||||
Consumer<EquipmentProvider>(
|
||||
builder: (context, provider, child) {
|
||||
return StreamBuilder<List<EquipmentModel>>(
|
||||
stream: provider.equipmentStream,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||
return const Padding(
|
||||
padding: EdgeInsets.all(16),
|
||||
child: Center(child: CircularProgressIndicator()),
|
||||
);
|
||||
}
|
||||
// 🔧 FIX: Utiliser directement le cache local au lieu du provider stream
|
||||
Builder(
|
||||
builder: (context) {
|
||||
// Récupérer les équipements enfants depuis le cache local
|
||||
final childEquipments = container.equipmentIds
|
||||
.map((id) => _equipmentCache[id])
|
||||
.where((eq) => eq != null)
|
||||
.cast<EquipmentModel>()
|
||||
.toList();
|
||||
|
||||
final allEquipment = snapshot.data ?? [];
|
||||
final childEquipments = allEquipment
|
||||
.where((eq) => container.equipmentIds.contains(eq.id))
|
||||
.toList();
|
||||
if (childEquipments.isEmpty) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Text(
|
||||
'Aucun équipement dans ce conteneur (${container.equipmentIds.length} attendu(s))',
|
||||
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (childEquipments.isEmpty) {
|
||||
return const Padding(
|
||||
padding: EdgeInsets.all(16),
|
||||
child: Text(
|
||||
'Aucun équipement dans ce conteneur',
|
||||
style: TextStyle(color: Colors.grey),
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Contenu (${childEquipments.length} équipement(s))',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: Colors.grey.shade700,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Contenu (${childEquipments.length} équipement(s))',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: Colors.grey.shade700,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
...childEquipments.map((eq) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(width: 16),
|
||||
Icon(
|
||||
Icons.subdirectory_arrow_right,
|
||||
size: 16,
|
||||
color: Colors.grey.shade600,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
eq.category.getIcon(size: 16, color: eq.category.color),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
eq.id,
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
color: Colors.grey.shade700,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
const SizedBox(height: 8),
|
||||
...childEquipments.map((eq) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(width: 16),
|
||||
Icon(
|
||||
Icons.subdirectory_arrow_right,
|
||||
size: 16,
|
||||
color: Colors.grey.shade600,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
eq.category.getIcon(size: 16, color: eq.category.color),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
eq.id,
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
color: Colors.grey.shade700,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:em2rp/utils/colors.dart';
|
||||
|
||||
/// États possibles lors de l'ajout d'un équipement
|
||||
enum AddEquipmentState {
|
||||
loading,
|
||||
success,
|
||||
error,
|
||||
}
|
||||
|
||||
/// Dialog pour afficher le résultat de l'ajout d'un équipement/container
|
||||
class AddEquipmentToEventDialog extends StatelessWidget {
|
||||
final AddEquipmentState state;
|
||||
final String? itemName;
|
||||
final String? errorMessage;
|
||||
|
||||
const AddEquipmentToEventDialog({
|
||||
super.key,
|
||||
required this.state,
|
||||
this.itemName,
|
||||
this.errorMessage,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Dialog(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_buildIcon(),
|
||||
const SizedBox(height: 16),
|
||||
_buildMessage(),
|
||||
if (state != AddEquipmentState.loading) ...[
|
||||
const SizedBox(height: 24),
|
||||
ElevatedButton(
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: AppColors.rouge,
|
||||
),
|
||||
child: const Text('OK'),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildIcon() {
|
||||
switch (state) {
|
||||
case AddEquipmentState.loading:
|
||||
return const SizedBox(
|
||||
width: 64,
|
||||
height: 64,
|
||||
child: CircularProgressIndicator(
|
||||
color: AppColors.rouge,
|
||||
strokeWidth: 4,
|
||||
),
|
||||
);
|
||||
case AddEquipmentState.success:
|
||||
return const Icon(
|
||||
Icons.check_circle,
|
||||
size: 64,
|
||||
color: Colors.green,
|
||||
);
|
||||
case AddEquipmentState.error:
|
||||
return const Icon(
|
||||
Icons.error,
|
||||
size: 64,
|
||||
color: Colors.red,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Widget _buildMessage() {
|
||||
switch (state) {
|
||||
case AddEquipmentState.loading:
|
||||
return const Text(
|
||||
'Recherche en cours...',
|
||||
style: TextStyle(fontSize: 16),
|
||||
);
|
||||
case AddEquipmentState.success:
|
||||
return Column(
|
||||
children: [
|
||||
const Text(
|
||||
'Ajouté avec succès !',
|
||||
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
||||
),
|
||||
if (itemName != null) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
itemName!,
|
||||
style: const TextStyle(fontSize: 16),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
case AddEquipmentState.error:
|
||||
return Column(
|
||||
children: [
|
||||
const Text(
|
||||
'Non trouvé',
|
||||
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
||||
),
|
||||
if (errorMessage != null) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
errorMessage!,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(color: Colors.grey[600]),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:em2rp/utils/colors.dart';
|
||||
|
||||
/// Dialog affiché quand un code scanné n'est pas trouvé dans l'événement
|
||||
class CodeNotFoundDialog extends StatelessWidget {
|
||||
final String scannedCode;
|
||||
|
||||
const CodeNotFoundDialog({
|
||||
super.key,
|
||||
required this.scannedCode,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AlertDialog(
|
||||
icon: const Icon(
|
||||
Icons.warning_amber_rounded,
|
||||
size: 64,
|
||||
color: Colors.orange,
|
||||
),
|
||||
title: const Text('Code non reconnu'),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Text(
|
||||
'Le code scanné n\'est pas assigné à cet événement :',
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.grey[200],
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Text(
|
||||
scannedCode,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'monospace',
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 16,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const Text(
|
||||
'Voulez-vous le rechercher dans la base de données et l\'ajouter à l\'événement ?',
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
child: const Text('Non'),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
style: ElevatedButton.styleFrom(backgroundColor: AppColors.rouge),
|
||||
child: const Text('Oui, rechercher'),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user