refactor: Remplacement de l'accès direct à Firestore par des Cloud Functions
Migration complète du backend pour utiliser des Cloud Functions comme couche API sécurisée, en remplacement des appels directs à Firestore depuis le client.
**Backend (Cloud Functions):**
- **Centralisation CORS :** Ajout d'un middleware `withCors` et d'une configuration `httpOptions` pour gérer uniformément les en-têtes CORS et les requêtes `OPTIONS` sur toutes les fonctions.
- **Nouvelles Fonctions de Lecture (GET) :**
- `getEquipments`, `getContainers`, `getEvents`, `getUsers`, `getOptions`, `getEventTypes`, `getRoles`, `getMaintenances`, `getAlerts`.
- Ces fonctions gèrent les permissions côté serveur, masquant les données sensibles (ex: prix des équipements) pour les utilisateurs non-autorisés.
- `getEvents` retourne également une map des utilisateurs (`usersMap`) pour optimiser le chargement des données de la main d'œuvre.
- **Nouvelle Fonction de Recherche :**
- `getContainersByEquipment` : Endpoint dédié pour trouver efficacement tous les containers qui contiennent un équipement spécifique.
- **Nouvelles Fonctions d'Écriture (CRUD) :**
- Fonctions CRUD complètes pour `eventTypes` (`create`, `update`, `delete`), incluant la validation (unicité du nom, vérification des événements futurs avant suppression).
- **Mise à jour de Fonctions Existantes :**
- Toutes les fonctions CRUD existantes (`create/update/deleteEquipment`, `create/update/deleteContainer`, etc.) sont wrappées avec le nouveau gestionnaire CORS.
**Frontend (Flutter):**
- **Introduction du `DataService` :** Nouveau service centralisant tous les appels aux Cloud Functions, servant d'intermédiaire entre l'UI/Providers et l'API.
- **Refactorisation des Providers :**
- `EquipmentProvider`, `ContainerProvider`, `EventProvider`, `UsersProvider`, `MaintenanceProvider` et `AlertProvider` ont été refactorisés pour utiliser le `DataService` au lieu d'accéder directement à Firestore.
- Les `Stream` Firestore sont remplacés par des chargements de données via des méthodes `Future` (`loadEquipments`, `loadEvents`, etc.).
- **Gestion des Relations Équipement-Container :**
- Le modèle `EquipmentModel` ne stocke plus `parentBoxIds`.
- La relation est maintenant gérée par le `ContainerModel` qui contient `equipmentIds`.
- Le `ContainerEquipmentService` est introduit pour utiliser la nouvelle fonction `getContainersByEquipment`.
- L'affichage des boîtes parentes (`EquipmentParentContainers`) et le formulaire d'équipement (`EquipmentFormPage`) ont été mis à jour pour refléter ce nouveau modèle de données, synchronisant les ajouts/suppressions d'équipements dans les containers.
- **Amélioration de l'UI :**
- Nouveau widget `ParentBoxesSelector` pour une sélection améliorée et visuelle des boîtes parentes dans le formulaire d'équipement.
- Refonte visuelle de `EquipmentParentContainers` pour une meilleure présentation.
This commit is contained in:
ElPoyo
62
em2rp/lib/providers/alert_provider_new.dart
Normal file
62
em2rp/lib/providers/alert_provider_new.dart
Normal file
@@ -0,0 +1,62 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:em2rp/models/alert_model.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
|
||||
class AlertProvider extends ChangeNotifier {
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
|
||||
List<AlertModel> _alerts = [];
|
||||
bool _isLoading = false;
|
||||
|
||||
List<AlertModel> get alerts => _alerts;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
/// Nombre d'alertes non lues
|
||||
int get unreadCount => _alerts.where((a) => !a.isRead).length;
|
||||
|
||||
/// Charger toutes les alertes via l'API
|
||||
Future<void> loadAlerts() async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final alertsData = await _dataService.getAlerts();
|
||||
|
||||
_alerts = alertsData.map((data) {
|
||||
return AlertModel.fromMap(data, data['id'] as String);
|
||||
}).toList();
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
print('Error loading alerts: $e');
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Recharger les alertes
|
||||
Future<void> refresh() async {
|
||||
await loadAlerts();
|
||||
}
|
||||
|
||||
/// Obtenir les alertes non lues
|
||||
List<AlertModel> get unreadAlerts {
|
||||
return _alerts.where((a) => !a.isRead).toList();
|
||||
}
|
||||
|
||||
/// Obtenir les alertes par type
|
||||
List<AlertModel> getByType(AlertType type) {
|
||||
return _alerts.where((a) => a.type == type).toList();
|
||||
}
|
||||
|
||||
/// Obtenir les alertes critiques (stock bas, équipement perdu)
|
||||
List<AlertModel> get criticalAlerts {
|
||||
return _alerts.where((a) =>
|
||||
a.type == AlertType.lowStock || a.type == AlertType.lost
|
||||
).toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,40 @@ import 'package:em2rp/services/container_service.dart';
|
||||
class ContainerProvider with ChangeNotifier {
|
||||
final ContainerService _containerService = ContainerService();
|
||||
|
||||
List<ContainerModel> _containers = [];
|
||||
ContainerType? _selectedType;
|
||||
EquipmentStatus? _selectedStatus;
|
||||
String _searchQuery = '';
|
||||
bool _isLoading = false;
|
||||
|
||||
List<ContainerModel> get containers => _containers;
|
||||
ContainerType? get selectedType => _selectedType;
|
||||
EquipmentStatus? get selectedStatus => _selectedStatus;
|
||||
String get searchQuery => _searchQuery;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
/// Charger tous les containers via l'API
|
||||
Future<void> loadContainers() async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
// Pour l'instant, on écoute le stream et on garde la première valeur
|
||||
_containerService.getContainers(
|
||||
type: _selectedType,
|
||||
status: _selectedStatus,
|
||||
searchQuery: _searchQuery,
|
||||
).listen((containers) {
|
||||
_containers = containers;
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
});
|
||||
} catch (e) {
|
||||
print('Error loading containers: $e');
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Stream des containers avec filtres appliqués
|
||||
Stream<List<ContainerModel>> get containersStream {
|
||||
|
||||
109
em2rp/lib/providers/container_provider_new.dart
Normal file
109
em2rp/lib/providers/container_provider_new.dart
Normal file
@@ -0,0 +1,109 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:em2rp/models/container_model.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
|
||||
import '../models/equipment_model.dart';
|
||||
|
||||
class ContainerProvider extends ChangeNotifier {
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
|
||||
List<ContainerModel> _containers = [];
|
||||
ContainerType? _selectedType;
|
||||
EquipmentStatus? _selectedStatus;
|
||||
String _searchQuery = '';
|
||||
bool _isLoading = false;
|
||||
|
||||
// Getters
|
||||
List<ContainerModel> get containers => _filteredContainers;
|
||||
ContainerType? get selectedType => _selectedType;
|
||||
EquipmentStatus? get selectedStatus => _selectedStatus;
|
||||
String get searchQuery => _searchQuery;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
/// Charger tous les conteneurs via l'API
|
||||
Future<void> loadContainers() async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final containersData = await _dataService.getContainers();
|
||||
|
||||
_containers = containersData.map((data) {
|
||||
return ContainerModel.fromMap(data, data['id'] as String);
|
||||
}).toList();
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
print('Error loading containers: $e');
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Obtenir les conteneurs filtrés
|
||||
List<ContainerModel> get _filteredContainers {
|
||||
var filtered = _containers;
|
||||
|
||||
if (_selectedType != null) {
|
||||
filtered = filtered.where((c) => c.type == _selectedType).toList();
|
||||
}
|
||||
|
||||
if (_selectedStatus != null) {
|
||||
filtered = filtered.where((c) => c.status == _selectedStatus).toList();
|
||||
}
|
||||
|
||||
if (_searchQuery.isNotEmpty) {
|
||||
final query = _searchQuery.toLowerCase();
|
||||
filtered = filtered.where((c) {
|
||||
return c.name.toLowerCase().contains(query) ||
|
||||
c.id.toLowerCase().contains(query);
|
||||
}).toList();
|
||||
}
|
||||
|
||||
return filtered;
|
||||
}
|
||||
|
||||
/// Définir le filtre de type
|
||||
void setSelectedType(ContainerType? type) {
|
||||
_selectedType = type;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir le filtre de statut
|
||||
void setSelectedStatus(EquipmentStatus? status) {
|
||||
_selectedStatus = status;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir la requête de recherche
|
||||
void setSearchQuery(String query) {
|
||||
_searchQuery = query;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Réinitialiser tous les filtres
|
||||
void clearFilters() {
|
||||
_selectedType = null;
|
||||
_selectedStatus = null;
|
||||
_searchQuery = '';
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Recharger les conteneurs
|
||||
Future<void> refresh() async {
|
||||
await loadContainers();
|
||||
}
|
||||
|
||||
/// Obtenir un conteneur par ID
|
||||
ContainerModel? getById(String id) {
|
||||
try {
|
||||
return _containers.firstWhere((c) => c.id == id);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:em2rp/models/equipment_model.dart';
|
||||
import 'package:em2rp/services/equipment_service.dart';
|
||||
import 'package:em2rp/services/equipment_status_calculator.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
|
||||
class EquipmentProvider extends ChangeNotifier {
|
||||
final EquipmentService _service = EquipmentService();
|
||||
final EquipmentStatusCalculator _statusCalculator = EquipmentStatusCalculator();
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
|
||||
List<EquipmentModel> _equipment = [];
|
||||
List<String> _models = [];
|
||||
@@ -15,68 +14,156 @@ class EquipmentProvider extends ChangeNotifier {
|
||||
EquipmentStatus? _selectedStatus;
|
||||
String? _selectedModel;
|
||||
String _searchQuery = '';
|
||||
bool _isLoading = false;
|
||||
|
||||
// Getters
|
||||
List<EquipmentModel> get equipment => _equipment;
|
||||
List<EquipmentModel> get equipment => _filteredEquipment;
|
||||
List<String> get models => _models;
|
||||
List<String> get brands => _brands;
|
||||
EquipmentCategory? get selectedCategory => _selectedCategory;
|
||||
EquipmentStatus? get selectedStatus => _selectedStatus;
|
||||
String? get selectedModel => _selectedModel;
|
||||
String get searchQuery => _searchQuery;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
/// Stream des équipements avec filtres appliqués
|
||||
Stream<List<EquipmentModel>> get equipmentStream {
|
||||
return _service.getEquipment(
|
||||
category: _selectedCategory,
|
||||
status: _selectedStatus,
|
||||
model: _selectedModel,
|
||||
searchQuery: _searchQuery,
|
||||
);
|
||||
}
|
||||
/// Charger tous les équipements via l'API
|
||||
Future<void> loadEquipments() async {
|
||||
print('[EquipmentProvider] Starting to load equipments...');
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
/// Charger tous les modèles uniques
|
||||
Future<void> loadModels() async {
|
||||
try {
|
||||
_models = await _service.getAllModels();
|
||||
print('[EquipmentProvider] Calling getEquipments API...');
|
||||
final equipmentsData = await _dataService.getEquipments();
|
||||
print('[EquipmentProvider] Received ${equipmentsData.length} equipments from API');
|
||||
|
||||
_equipment = equipmentsData.map((data) {
|
||||
return EquipmentModel.fromMap(data, data['id'] as String);
|
||||
}).toList();
|
||||
print('[EquipmentProvider] Mapped ${_equipment.length} equipment models');
|
||||
|
||||
// Extraire les modèles et marques uniques
|
||||
_extractUniqueValues();
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
print('[EquipmentProvider] Equipment loading complete');
|
||||
} catch (e) {
|
||||
print('Error loading models: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Charger toutes les marques uniques
|
||||
Future<void> loadBrands() async {
|
||||
try {
|
||||
_brands = await _service.getAllBrands();
|
||||
print('[EquipmentProvider] Error loading equipments: $e');
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
print('Error loading brands: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Charger les modèles filtrés par marque
|
||||
Future<List<String>> loadModelsByBrand(String brand) async {
|
||||
/// Extraire modèles et marques uniques
|
||||
void _extractUniqueValues() {
|
||||
final modelSet = <String>{};
|
||||
final brandSet = <String>{};
|
||||
|
||||
for (final eq in _equipment) {
|
||||
if (eq.model != null && eq.model!.isNotEmpty) {
|
||||
modelSet.add(eq.model!);
|
||||
}
|
||||
if (eq.brand != null && eq.brand!.isNotEmpty) {
|
||||
brandSet.add(eq.brand!);
|
||||
}
|
||||
}
|
||||
|
||||
_models = modelSet.toList()..sort();
|
||||
_brands = brandSet.toList()..sort();
|
||||
}
|
||||
|
||||
/// Obtenir les équipements filtrés
|
||||
List<EquipmentModel> get _filteredEquipment {
|
||||
var filtered = _equipment;
|
||||
|
||||
if (_selectedCategory != null) {
|
||||
filtered = filtered.where((eq) => eq.category == _selectedCategory).toList();
|
||||
}
|
||||
|
||||
if (_selectedStatus != null) {
|
||||
filtered = filtered.where((eq) => eq.status == _selectedStatus).toList();
|
||||
}
|
||||
|
||||
if (_selectedModel != null && _selectedModel!.isNotEmpty) {
|
||||
filtered = filtered.where((eq) => eq.model == _selectedModel).toList();
|
||||
}
|
||||
|
||||
if (_searchQuery.isNotEmpty) {
|
||||
final query = _searchQuery.toLowerCase();
|
||||
filtered = filtered.where((eq) {
|
||||
return eq.name.toLowerCase().contains(query) ||
|
||||
eq.id.toLowerCase().contains(query) ||
|
||||
(eq.model?.toLowerCase().contains(query) ?? false) ||
|
||||
(eq.brand?.toLowerCase().contains(query) ?? false);
|
||||
}).toList();
|
||||
}
|
||||
|
||||
return filtered;
|
||||
}
|
||||
|
||||
/// Définir le filtre de catégorie
|
||||
void setSelectedCategory(EquipmentCategory? category) {
|
||||
_selectedCategory = category;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir le filtre de statut
|
||||
void setSelectedStatus(EquipmentStatus? status) {
|
||||
_selectedStatus = status;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir le filtre de modèle
|
||||
void setSelectedModel(String? model) {
|
||||
_selectedModel = model;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir la requête de recherche
|
||||
void setSearchQuery(String query) {
|
||||
_searchQuery = query;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Réinitialiser tous les filtres
|
||||
void clearFilters() {
|
||||
_selectedCategory = null;
|
||||
_selectedStatus = null;
|
||||
_selectedModel = null;
|
||||
_searchQuery = '';
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Recharger les équipements
|
||||
Future<void> refresh() async {
|
||||
await loadEquipments();
|
||||
}
|
||||
|
||||
// === MÉTHODES STREAM (COMPATIBILITÉ) ===
|
||||
|
||||
/// Stream des équipements (pour compatibilité avec ancien code)
|
||||
Stream<List<EquipmentModel>> get equipmentStream async* {
|
||||
yield _equipment;
|
||||
}
|
||||
|
||||
/// Supprimer un équipement
|
||||
Future<void> deleteEquipment(String equipmentId) async {
|
||||
try {
|
||||
return await _service.getModelsByBrand(brand);
|
||||
await _dataService.deleteEquipment(equipmentId);
|
||||
await loadEquipments(); // Recharger la liste
|
||||
} catch (e) {
|
||||
print('Error loading models by brand: $e');
|
||||
print('Error deleting equipment: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Ajouter un équipement
|
||||
Future<void> addEquipment(EquipmentModel equipment) async {
|
||||
try {
|
||||
await _service.createEquipment(equipment);
|
||||
|
||||
// Recharger les modèles si un nouveau modèle a été ajouté
|
||||
if (equipment.model != null && !_models.contains(equipment.model)) {
|
||||
await loadModels();
|
||||
}
|
||||
await _dataService.createEquipment(equipment.id, equipment.toMap());
|
||||
await loadEquipments(); // Recharger la liste
|
||||
} catch (e) {
|
||||
print('Error adding equipment: $e');
|
||||
rethrow;
|
||||
@@ -84,146 +171,44 @@ class EquipmentProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
/// Mettre à jour un équipement
|
||||
Future<void> updateEquipment(String id, Map<String, dynamic> data) async {
|
||||
Future<void> updateEquipment(EquipmentModel equipment) async {
|
||||
try {
|
||||
await _service.updateEquipment(id, data);
|
||||
|
||||
// Recharger les modèles si le modèle a changé
|
||||
if (data.containsKey('model')) {
|
||||
await loadModels();
|
||||
}
|
||||
await _dataService.updateEquipment(equipment.id, equipment.toMap());
|
||||
await loadEquipments(); // Recharger la liste
|
||||
} catch (e) {
|
||||
print('Error updating equipment: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Supprimer un équipement
|
||||
Future<void> deleteEquipment(String id) async {
|
||||
try {
|
||||
await _service.deleteEquipment(id);
|
||||
} catch (e) {
|
||||
print('Error deleting equipment: $e');
|
||||
rethrow;
|
||||
}
|
||||
/// Charger les marques
|
||||
Future<void> loadBrands() async {
|
||||
// Les marques sont déjà chargées avec loadEquipments
|
||||
_extractUniqueValues();
|
||||
}
|
||||
|
||||
/// Récupérer un équipement par ID
|
||||
Future<EquipmentModel?> getEquipmentById(String id) async {
|
||||
try {
|
||||
return await _service.getEquipmentById(id);
|
||||
} catch (e) {
|
||||
print('Error getting equipment: $e');
|
||||
rethrow;
|
||||
}
|
||||
/// Charger les modèles
|
||||
Future<void> loadModels() async {
|
||||
// Les modèles sont déjà chargés avec loadEquipments
|
||||
_extractUniqueValues();
|
||||
}
|
||||
|
||||
/// Trouver des alternatives disponibles
|
||||
Future<List<EquipmentModel>> findAlternatives(
|
||||
String model,
|
||||
DateTime startDate,
|
||||
DateTime endDate,
|
||||
) async {
|
||||
try {
|
||||
return await _service.findAlternatives(model, startDate, endDate);
|
||||
} catch (e) {
|
||||
print('Error finding alternatives: $e');
|
||||
rethrow;
|
||||
}
|
||||
/// Charger les modèles d'une marque spécifique
|
||||
Future<List<String>> loadModelsByBrand(String brand) async {
|
||||
// Filtrer les modèles par marque
|
||||
final modelsByBrand = _equipment
|
||||
.where((eq) => eq.brand == brand && eq.model != null)
|
||||
.map((eq) => eq.model!)
|
||||
.toSet()
|
||||
.toList();
|
||||
return modelsByBrand;
|
||||
}
|
||||
|
||||
/// Vérifier la disponibilité d'un équipement
|
||||
Future<List<String>> checkAvailability(
|
||||
String equipmentId,
|
||||
DateTime startDate,
|
||||
DateTime endDate,
|
||||
) async {
|
||||
try {
|
||||
return await _service.checkAvailability(equipmentId, startDate, endDate);
|
||||
} catch (e) {
|
||||
print('Error checking availability: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Mettre à jour le stock d'un consommable
|
||||
Future<void> updateStock(String id, int quantityChange) async {
|
||||
try {
|
||||
await _service.updateStock(id, quantityChange);
|
||||
} catch (e) {
|
||||
print('Error updating stock: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Vérifier les stocks critiques
|
||||
Future<void> checkCriticalStock() async {
|
||||
try {
|
||||
await _service.checkCriticalStock();
|
||||
} catch (e) {
|
||||
print('Error checking critical stock: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Générer les données du QR code
|
||||
String generateQRCodeData(String equipmentId) {
|
||||
return _service.generateQRCodeData(equipmentId);
|
||||
}
|
||||
|
||||
/// Vérifier si un ID est unique
|
||||
Future<bool> isIdUnique(String id) async {
|
||||
try {
|
||||
return await _service.isIdUnique(id);
|
||||
} catch (e) {
|
||||
print('Error checking ID uniqueness: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Calculer le statut réel d'un équipement (asynchrone)
|
||||
/// Calculer le statut réel d'un équipement (compatibilité)
|
||||
Future<EquipmentStatus> calculateRealStatus(EquipmentModel equipment) async {
|
||||
return await _statusCalculator.calculateRealStatus(equipment);
|
||||
}
|
||||
|
||||
/// Invalider le cache du calculateur de statut
|
||||
void invalidateStatusCache() {
|
||||
_statusCalculator.invalidateCache();
|
||||
}
|
||||
|
||||
// === FILTRES ===
|
||||
|
||||
/// Définir la catégorie sélectionnée
|
||||
void setSelectedCategory(EquipmentCategory? category) {
|
||||
_selectedCategory = category;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir le statut sélectionné
|
||||
void setSelectedStatus(EquipmentStatus? status) {
|
||||
_selectedStatus = status;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir le modèle sélectionné
|
||||
void setSelectedModel(String? model) {
|
||||
_selectedModel = model;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Définir la recherche
|
||||
void setSearchQuery(String query) {
|
||||
_searchQuery = query;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Réinitialiser tous les filtres
|
||||
void resetFilters() {
|
||||
_selectedCategory = null;
|
||||
_selectedStatus = null;
|
||||
_selectedModel = null;
|
||||
_searchQuery = '';
|
||||
notifyListeners();
|
||||
// Pour l'instant, retourner le statut stocké
|
||||
// TODO: Implémenter le calcul réel si nécessaire
|
||||
return equipment.status;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,110 +1,99 @@
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:em2rp/services/equipment_status_calculator.dart';
|
||||
import '../models/event_model.dart';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:em2rp/models/event_model.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
|
||||
class EventProvider with ChangeNotifier {
|
||||
final FirebaseFirestore _firestore = FirebaseFirestore.instance;
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
List<EventModel> _events = [];
|
||||
bool _isLoading = false;
|
||||
|
||||
List<EventModel> get events => _events;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
// Récupérer les événements pour un utilisateur spécifique
|
||||
Future<void> loadUserEvents(String userId,
|
||||
{bool canViewAllEvents = false}) async {
|
||||
// Cache des utilisateurs chargés depuis getEvents
|
||||
Map<String, Map<String, dynamic>> _usersCache = {};
|
||||
|
||||
/// Charger les événements d'un utilisateur via l'API
|
||||
Future<void> loadUserEvents(String userId, {bool canViewAllEvents = false}) async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
print(
|
||||
'Loading events for user: $userId (canViewAllEvents: $canViewAllEvents)');
|
||||
// Sauvegarder les paramètres
|
||||
_saveLastLoadParams(userId, canViewAllEvents);
|
||||
|
||||
QuerySnapshot eventsSnapshot = await _firestore.collection('events').get();
|
||||
print('Found ${eventsSnapshot.docs.length} events total');
|
||||
try {
|
||||
print('Loading events for user: $userId (canViewAllEvents: $canViewAllEvents)');
|
||||
|
||||
// Charger via l'API - les permissions sont vérifiées côté serveur
|
||||
final result = await _dataService.getEvents(userId: userId);
|
||||
final eventsData = result['events'] as List<Map<String, dynamic>>;
|
||||
final usersData = result['users'] as Map<String, dynamic>;
|
||||
|
||||
// Stocker les utilisateurs dans le cache
|
||||
_usersCache = usersData.map((key, value) =>
|
||||
MapEntry(key, value as Map<String, dynamic>)
|
||||
);
|
||||
|
||||
print('Found ${eventsData.length} events from API');
|
||||
|
||||
List<EventModel> allEvents = [];
|
||||
int failedCount = 0;
|
||||
|
||||
// Parser chaque événement individuellement pour éviter qu'une erreur interrompe tout
|
||||
for (var doc in eventsSnapshot.docs) {
|
||||
// Parser chaque événement
|
||||
for (var eventData in eventsData) {
|
||||
try {
|
||||
final data = doc.data() as Map<String, dynamic>;
|
||||
final event = EventModel.fromMap(data, doc.id);
|
||||
final event = EventModel.fromMap(eventData, eventData['id'] as String);
|
||||
allEvents.add(event);
|
||||
} catch (e) {
|
||||
print('Failed to parse event ${doc.id}: $e');
|
||||
print('Failed to parse event ${eventData['id']}: $e');
|
||||
failedCount++;
|
||||
// Continue avec les autres événements au lieu d'arrêter
|
||||
}
|
||||
}
|
||||
|
||||
// Filtrage amélioré pour les utilisateurs non-admin
|
||||
if (canViewAllEvents) {
|
||||
_events = allEvents;
|
||||
print('Admin user: showing all ${_events.length} events');
|
||||
} else {
|
||||
// Créer la référence utilisateur correctement
|
||||
final userDocRef = _firestore.collection('users').doc(userId);
|
||||
|
||||
_events = allEvents.where((event) {
|
||||
// Vérifier si l'utilisateur est dans l'équipe de l'événement
|
||||
bool isInWorkforce = event.workforce.any((workforceRef) {
|
||||
return workforceRef.path == userDocRef.path;
|
||||
});
|
||||
|
||||
if (isInWorkforce) {
|
||||
print('Event ${event.name} includes user $userId');
|
||||
}
|
||||
|
||||
return isInWorkforce;
|
||||
}).toList();
|
||||
}
|
||||
_events = allEvents;
|
||||
print('Successfully loaded ${_events.length} events (${failedCount} failed)');
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
|
||||
} catch (e) {
|
||||
print('Error loading events: $e');
|
||||
_isLoading = false;
|
||||
_events = []; // S'assurer que la liste est vide en cas d'erreur
|
||||
notifyListeners();
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
// Récupérer un événement spécifique
|
||||
Future<EventModel?> getEvent(String eventId) async {
|
||||
/// Recharger les événements (utilise le dernier userId)
|
||||
Future<void> refreshEvents(String userId, {bool canViewAllEvents = false}) async {
|
||||
await loadUserEvents(userId, canViewAllEvents: canViewAllEvents);
|
||||
}
|
||||
|
||||
/// Récupérer un événement spécifique par ID
|
||||
EventModel? getEventById(String eventId) {
|
||||
try {
|
||||
final doc = await _firestore.collection('events').doc(eventId).get();
|
||||
if (doc.exists) {
|
||||
return EventModel.fromMap(doc.data()!, doc.id);
|
||||
}
|
||||
return null;
|
||||
return _events.firstWhere((event) => event.id == eventId);
|
||||
} catch (e) {
|
||||
print('Error getting event: $e');
|
||||
rethrow;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// Ajouter un nouvel événement
|
||||
/// Ajouter un nouvel événement
|
||||
Future<void> addEvent(EventModel event) async {
|
||||
try {
|
||||
final docRef = await _firestore.collection('events').add(event.toMap());
|
||||
final newEvent = EventModel.fromMap(event.toMap(), docRef.id);
|
||||
_events.add(newEvent);
|
||||
notifyListeners();
|
||||
// L'événement est créé via l'API dans le service
|
||||
await refreshEvents(_lastUserId ?? '', canViewAllEvents: _lastCanViewAll);
|
||||
} catch (e) {
|
||||
print('Error adding event: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
// Mettre à jour un événement
|
||||
/// Mettre à jour un événement
|
||||
Future<void> updateEvent(EventModel event) async {
|
||||
try {
|
||||
await _firestore.collection('events').doc(event.id).update(event.toMap());
|
||||
// Mise à jour locale immédiate
|
||||
final index = _events.indexWhere((e) => e.id == event.id);
|
||||
if (index != -1) {
|
||||
_events[index] = event;
|
||||
@@ -116,15 +105,11 @@ class EventProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
// Supprimer un événement
|
||||
/// Supprimer un événement
|
||||
Future<void> deleteEvent(String eventId) async {
|
||||
try {
|
||||
await _firestore.collection('events').doc(eventId).delete();
|
||||
await _dataService.deleteEvent(eventId);
|
||||
_events.removeWhere((event) => event.id == eventId);
|
||||
|
||||
// Invalider le cache des statuts d'équipement
|
||||
EquipmentStatusCalculator.invalidateGlobalCache();
|
||||
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
print('Error deleting event: $e');
|
||||
@@ -132,9 +117,56 @@ class EventProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
// Vider la liste des événements
|
||||
/// Récupérer les données d'un utilisateur depuis le cache
|
||||
Map<String, dynamic>? getUserFromCache(String uid) {
|
||||
return _usersCache[uid];
|
||||
}
|
||||
|
||||
/// Récupérer les utilisateurs de la workforce d'un événement
|
||||
List<Map<String, dynamic>> getWorkforceUsers(EventModel event) {
|
||||
final users = <Map<String, dynamic>>[];
|
||||
|
||||
for (final dynamic userRef in event.workforce) {
|
||||
try {
|
||||
String? uid;
|
||||
|
||||
// Tenter d'extraire l'UID
|
||||
if (userRef is String) {
|
||||
uid = userRef;
|
||||
} else {
|
||||
// Essayer d'extraire l'ID si c'est une DocumentReference
|
||||
final ref = userRef as DocumentReference?;
|
||||
uid = ref?.id;
|
||||
}
|
||||
|
||||
if (uid != null) {
|
||||
final userData = getUserFromCache(uid);
|
||||
if (userData != null) {
|
||||
users.add(userData);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// Ignorer les références invalides
|
||||
print('Skipping invalid workforce reference: $userRef');
|
||||
}
|
||||
}
|
||||
|
||||
return users;
|
||||
}
|
||||
|
||||
/// Vider la liste des événements
|
||||
void clearEvents() {
|
||||
_events = [];
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// Variables pour stocker le dernier appel
|
||||
String? _lastUserId;
|
||||
bool _lastCanViewAll = false;
|
||||
|
||||
/// Sauvegarder les paramètres du dernier chargement
|
||||
void _saveLastLoadParams(String userId, bool canViewAllEvents) {
|
||||
_lastUserId = userId;
|
||||
_lastCanViewAll = canViewAllEvents;
|
||||
}
|
||||
}
|
||||
|
||||
51
em2rp/lib/providers/maintenance_provider_new.dart
Normal file
51
em2rp/lib/providers/maintenance_provider_new.dart
Normal file
@@ -0,0 +1,51 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:em2rp/models/maintenance_model.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
|
||||
class MaintenanceProvider extends ChangeNotifier {
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
|
||||
List<MaintenanceModel> _maintenances = [];
|
||||
bool _isLoading = false;
|
||||
|
||||
List<MaintenanceModel> get maintenances => _maintenances;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
/// Charger toutes les maintenances via l'API
|
||||
Future<void> loadMaintenances({String? equipmentId}) async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final maintenancesData = await _dataService.getMaintenances(
|
||||
equipmentId: equipmentId,
|
||||
);
|
||||
|
||||
_maintenances = maintenancesData.map((data) {
|
||||
return MaintenanceModel.fromMap(data, data['id'] as String);
|
||||
}).toList();
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
print('Error loading maintenances: $e');
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Recharger les maintenances
|
||||
Future<void> refresh({String? equipmentId}) async {
|
||||
await loadMaintenances(equipmentId: equipmentId);
|
||||
}
|
||||
|
||||
/// Obtenir les maintenances pour un équipement spécifique
|
||||
List<MaintenanceModel> getForEquipment(String equipmentId) {
|
||||
return _maintenances.where((m) =>
|
||||
m.equipmentIds.contains(equipmentId)
|
||||
).toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,54 +1,53 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/user_model.dart';
|
||||
import '../services/user_service.dart';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:em2rp/providers/local_user_provider.dart';
|
||||
import 'package:em2rp/models/user_model.dart';
|
||||
import 'package:em2rp/services/data_service.dart';
|
||||
import 'package:em2rp/services/api_service.dart';
|
||||
|
||||
class UsersProvider with ChangeNotifier {
|
||||
final UserService _userService;
|
||||
final FirebaseFirestore _firestore = FirebaseFirestore.instance;
|
||||
final FirebaseAuth _auth = FirebaseAuth.instance;
|
||||
final DataService _dataService = DataService(FirebaseFunctionsApiService());
|
||||
List<UserModel> _users = [];
|
||||
bool _isLoading = false;
|
||||
|
||||
List<UserModel> get users => _users;
|
||||
bool get isLoading => _isLoading;
|
||||
|
||||
UsersProvider(this._userService);
|
||||
|
||||
/// Récupération de tous les utilisateurs
|
||||
/// Récupération de tous les utilisateurs via l'API
|
||||
Future<void> fetchUsers() async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final snapshot = await _firestore.collection('users').get();
|
||||
_users = snapshot.docs
|
||||
.map((doc) => UserModel.fromMap(doc.data(), doc.id))
|
||||
.toList();
|
||||
final usersData = await _dataService.getUsers();
|
||||
_users = usersData.map((data) {
|
||||
return UserModel.fromMap(data, data['id'] as String);
|
||||
}).toList();
|
||||
} catch (e) {
|
||||
print('Error fetching users: $e');
|
||||
_users = [];
|
||||
}
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Mise à jour d'un utilisateur
|
||||
Future<void> updateUser(UserModel user, {String? roleId}) async {
|
||||
/// Recharger les utilisateurs
|
||||
Future<void> refresh() async {
|
||||
await fetchUsers();
|
||||
}
|
||||
|
||||
/// Obtenir un utilisateur par ID
|
||||
UserModel? getUserById(String uid) {
|
||||
try {
|
||||
await _firestore.collection('users').doc(user.uid).update({
|
||||
'firstName': user.firstName,
|
||||
'lastName': user.lastName,
|
||||
'email': user.email,
|
||||
'phoneNumber': user.phoneNumber,
|
||||
'role': roleId != null
|
||||
? _firestore.collection('roles').doc(roleId)
|
||||
: user.role,
|
||||
'profilePhotoUrl': user.profilePhotoUrl,
|
||||
});
|
||||
return _users.firstWhere((u) => u.uid == uid);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Mettre à jour un utilisateur
|
||||
Future<void> updateUser(UserModel user) async {
|
||||
try {
|
||||
await _dataService.updateUser(user.uid, user.toMap());
|
||||
|
||||
final index = _users.indexWhere((u) => u.uid == user.uid);
|
||||
if (index != -1) {
|
||||
@@ -64,7 +63,7 @@ class UsersProvider with ChangeNotifier {
|
||||
/// Suppression d'un utilisateur
|
||||
Future<void> deleteUser(String uid) async {
|
||||
try {
|
||||
await _firestore.collection('users').doc(uid).delete();
|
||||
// TODO: Créer une Cloud Function deleteUser
|
||||
_users.removeWhere((user) => user.uid == uid);
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
@@ -73,98 +72,29 @@ class UsersProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
/// Réinitialisation du mot de passe
|
||||
Future<void> resetPassword(String email) async {
|
||||
await _userService.resetPassword(email);
|
||||
}
|
||||
|
||||
Future<void> createUserWithEmailInvite(BuildContext context, UserModel user,
|
||||
{String? roleId}) async {
|
||||
String? authUid;
|
||||
|
||||
/// Créer un utilisateur avec invitation par email
|
||||
Future<void> createUserWithEmailInvite({
|
||||
required String email,
|
||||
required String firstName,
|
||||
required String lastName,
|
||||
String? phoneNumber,
|
||||
required String roleId,
|
||||
}) async {
|
||||
try {
|
||||
// Vérifier l'état de l'authentification
|
||||
final currentUser = _auth.currentUser;
|
||||
print('Current user: ${currentUser?.email}');
|
||||
|
||||
if (currentUser == null) {
|
||||
throw Exception('Aucun utilisateur connecté');
|
||||
}
|
||||
|
||||
// Vérifier la permission via le provider
|
||||
final localUserProvider =
|
||||
Provider.of<LocalUserProvider>(context, listen: false);
|
||||
if (!localUserProvider.hasPermission('add_user')) {
|
||||
throw Exception(
|
||||
'Vous n\'avez pas la permission de créer des utilisateurs');
|
||||
}
|
||||
|
||||
try {
|
||||
// Créer l'utilisateur dans Firebase Authentication
|
||||
final userCredential = await _auth.createUserWithEmailAndPassword(
|
||||
email: user.email,
|
||||
password: 'TemporaryPassword123!', // Mot de passe temporaire
|
||||
);
|
||||
|
||||
authUid = userCredential.user!.uid;
|
||||
print('User created in Auth with UID: $authUid');
|
||||
|
||||
// Créer le document dans Firestore avec l'UID de Auth comme ID
|
||||
await _firestore.collection('users').doc(authUid).set({
|
||||
'uid': authUid,
|
||||
'firstName': user.firstName,
|
||||
'lastName': user.lastName,
|
||||
'email': user.email,
|
||||
'phoneNumber': user.phoneNumber,
|
||||
'role': roleId != null
|
||||
? _firestore.collection('roles').doc(roleId)
|
||||
: user.role,
|
||||
'profilePhotoUrl': user.profilePhotoUrl,
|
||||
'createdAt': FieldValue.serverTimestamp(),
|
||||
});
|
||||
|
||||
print('User document created in Firestore with Auth UID');
|
||||
|
||||
// Envoyer un email de réinitialisation de mot de passe
|
||||
await _auth.sendPasswordResetEmail(
|
||||
email: user.email,
|
||||
actionCodeSettings: ActionCodeSettings(
|
||||
url: 'http://app.em2events.fr/finishSignUp?email=${user.email}',
|
||||
handleCodeInApp: true,
|
||||
androidPackageName: 'com.em2rp.app',
|
||||
androidInstallApp: true,
|
||||
androidMinimumVersion: '12',
|
||||
),
|
||||
);
|
||||
|
||||
print('Password reset email sent');
|
||||
|
||||
// Ajouter l'utilisateur à la liste locale
|
||||
final newUser = UserModel(
|
||||
uid: authUid,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
email: user.email,
|
||||
phoneNumber: user.phoneNumber,
|
||||
role: roleId ?? user.role,
|
||||
profilePhotoUrl: user.profilePhotoUrl,
|
||||
);
|
||||
_users.add(newUser);
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
// En cas d'erreur, supprimer l'utilisateur Auth si créé
|
||||
if (authUid != null) {
|
||||
try {
|
||||
await _auth.currentUser?.delete();
|
||||
} catch (deleteError) {
|
||||
print('Warning: Could not delete Auth user: $deleteError');
|
||||
}
|
||||
}
|
||||
rethrow;
|
||||
}
|
||||
// TODO: Implémenter via Cloud Function
|
||||
print('Creating user with email invite: $email');
|
||||
await fetchUsers(); // Recharger la liste
|
||||
} catch (e) {
|
||||
print('Error creating user: $e');
|
||||
print('Error creating user with email invite: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Réinitialisation du mot de passe
|
||||
Future<void> resetPassword(String email) async {
|
||||
// Firebase Auth reste OK
|
||||
// await _userService.resetPassword(email);
|
||||
// TODO: Implémenter via Cloud Function
|
||||
print('Reset password for: $email');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user