Livraison d ela gestion des opérations v0.4.0

app/lib/core/data/models/membre_model.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:geosector_app/core/data/models/user_model.dart';
 
@@ -60,58 +61,64 @@ class MembreModel extends HiveObject {
 
   // Factory pour convertir depuis JSON (API)
   factory MembreModel.fromJson(Map<String, dynamic> json) {
-    // Convertir l'ID en int, qu'il soit déjà int ou string
-    final dynamic rawId = json['id'];
-    final int id = rawId is String ? int.parse(rawId) : rawId as int;
+    try {
+      // Convertir l'ID en int, qu'il soit déjà int ou string
+      final dynamic rawId = json['id'];
+      final int id = rawId is String ? int.parse(rawId) : rawId as int;
 
-    // Convertir le rôle en int (ATTENTION: le champ JSON est 'fk_role' pas 'role')
-    final dynamic rawRole = json['fk_role']; // Correction ici !
-    final int role = rawRole is String ? int.parse(rawRole) : rawRole as int;
+      // Convertir le rôle en int (ATTENTION: le champ JSON est 'fk_role' pas 'role')
+      final dynamic rawRole = json['fk_role']; // Correction ici !
+      final int role = rawRole is String ? int.parse(rawRole) : rawRole as int;
 
-    // Convertir fkEntite en int si présent
-    int? fkEntite;
-    if (json['fk_entite'] != null) {
-      final dynamic rawEntite = json['fk_entite'];
-      fkEntite = rawEntite is String ? int.parse(rawEntite) : rawEntite as int;
-    }
-
-    // Convertir fkTitre en int si présent
-    int? fkTitre;
-    if (json['fk_titre'] != null) {
-      final dynamic rawTitre = json['fk_titre'];
-      fkTitre = rawTitre is String ? int.parse(rawTitre) : rawTitre as int;
-    }
-
-    // Gérer les dates nulles ou avec des valeurs invalides comme "0000-00-00"
-    DateTime? parseDate(String? dateStr) {
-      if (dateStr == null || dateStr.isEmpty || dateStr == "0000-00-00") {
-        return null;
+      // Convertir fkEntite en int si présent
+      int? fkEntite;
+      if (json['fk_entite'] != null) {
+        final dynamic rawEntite = json['fk_entite'];
+        fkEntite = rawEntite is String ? int.parse(rawEntite) : rawEntite as int;
       }
-      try {
-        return DateTime.parse(dateStr);
-      } catch (e) {
-        return null;
-      }
-    }
 
-    return MembreModel(
-      id: id,
-      fkEntite: fkEntite,
-      role: role,
-      fkTitre: fkTitre,
-      name: json['name'],
-      firstName: json['first_name'],
-      username: json['username'],
-      sectName: json['sect_name'],
-      email: json['email'] ?? '',
-      phone: json['phone'],
-      mobile: json['mobile'],
-      dateNaissance: parseDate(json['date_naissance']),
-      dateEmbauche: parseDate(json['date_embauche']),
-      createdAt: json['created_at'] != null ? DateTime.parse(json['created_at']) : DateTime.now(),
-      // Le champ JSON est 'chk_active' pas 'is_active'
-      isActive: json['chk_active'] == 1 || json['chk_active'] == true,
-    );
+      // Convertir fkTitre en int si présent
+      int? fkTitre;
+      if (json['fk_titre'] != null) {
+        final dynamic rawTitre = json['fk_titre'];
+        fkTitre = rawTitre is String ? int.parse(rawTitre) : rawTitre as int;
+      }
+
+      // Gérer les dates nulles ou avec des valeurs invalides comme "0000-00-00"
+      DateTime? parseDate(String? dateStr) {
+        if (dateStr == null || dateStr.isEmpty || dateStr == "0000-00-00") {
+          return null;
+        }
+        try {
+          return DateTime.parse(dateStr);
+        } catch (e) {
+          return null;
+        }
+      }
+
+      return MembreModel(
+        id: id,
+        fkEntite: fkEntite,
+        role: role,
+        fkTitre: fkTitre,
+        name: json['name'] ?? '', // ← Fallback pour champs manquants
+        firstName: json['first_name'] ?? '', // ← Fallback pour champs manquants
+        username: json['username'] ?? '', // ← Fallback pour champs manquants
+        sectName: json['sect_name'] ?? '',
+        email: json['email'] ?? '', // ← Déjà OK mais renforcé
+        phone: json['phone'],
+        mobile: json['mobile'],
+        dateNaissance: parseDate(json['date_naissance']),
+        dateEmbauche: parseDate(json['date_embauche']),
+        createdAt: DateTime.now(), // ← Simplifié car created_at n'existe pas dans l'API
+        // Le champ JSON est 'chk_active' pas 'is_active'
+        isActive: json['chk_active'] == 1 || json['chk_active'] == true,
+      );
+    } catch (e) {
+      debugPrint('❌ Erreur parsing MembreModel: $e');
+      debugPrint('❌ Données JSON: $json');
+      rethrow;
+    }
   }
 
   // Convertir en JSON pour l'API

app/lib/core/data/models/operation_model.dart

@@ -25,12 +25,16 @@ class OperationModel extends HiveObject {
   @HiveField(6)
   bool isSynced;
 
+  @HiveField(7)
+  final int fkEntite;
+
   OperationModel({
     required this.id,
     required this.name,
     required this.dateDebut,
     required this.dateFin,
     required this.lastSyncedAt,
+    required this.fkEntite,
     this.isActive = true,
     this.isSynced = false,
   });
@@ -40,15 +44,18 @@ class OperationModel extends HiveObject {
     // Convertir l'ID en int, qu'il soit déjà int ou string
     final dynamic rawId = json['id'];
     final int id = rawId is String ? int.parse(rawId) : rawId as int;
-    
+    final dynamic rawEntite = json['fk_entite'];
+    final int fkEntite = rawEntite is String ? int.parse(rawEntite) : rawEntite as int;
+
     return OperationModel(
       id: id,
-      name: json['name'],
+      name: json['libelle'], // ← Correction: utiliser 'libelle' au lieu de 'name'
       dateDebut: DateTime.parse(json['date_deb']),
       dateFin: DateTime.parse(json['date_fin']),
       lastSyncedAt: DateTime.now(),
-      isActive: true,
+      isActive: json['chk_active'] == true || json['chk_active'] == 1 || json['chk_active'] == "1",
       isSynced: true,
+      fkEntite: fkEntite,
     );
   }
 
@@ -60,6 +67,7 @@ class OperationModel extends HiveObject {
       'date_deb': dateDebut.toIso8601String().split('T')[0], // Format YYYY-MM-DD
       'date_fin': dateFin.toIso8601String().split('T')[0], // Format YYYY-MM-DD
       'is_active': isActive,
+      'fk_entite': fkEntite,
     };
   }
 
@@ -71,15 +79,17 @@ class OperationModel extends HiveObject {
     bool? isActive,
     bool? isSynced,
     DateTime? lastSyncedAt,
+    int? fkEntite,
   }) {
     return OperationModel(
-      id: this.id,
+      id: id,
       name: name ?? this.name,
       dateDebut: dateDebut ?? this.dateDebut,
       dateFin: dateFin ?? this.dateFin,
       lastSyncedAt: lastSyncedAt ?? this.lastSyncedAt,
       isActive: isActive ?? this.isActive,
       isSynced: isSynced ?? this.isSynced,
+      fkEntite: fkEntite ?? this.fkEntite,
     );
   }
 }

app/lib/core/data/models/operation_model.g.dart

@@ -22,6 +22,7 @@ class OperationModelAdapter extends TypeAdapter<OperationModel> {
       dateDebut: fields[2] as DateTime,
       dateFin: fields[3] as DateTime,
       lastSyncedAt: fields[4] as DateTime,
+      fkEntite: fields[7] as int,
       isActive: fields[5] as bool,
       isSynced: fields[6] as bool,
     );
@@ -30,7 +31,7 @@ class OperationModelAdapter extends TypeAdapter<OperationModel> {
   @override
   void write(BinaryWriter writer, OperationModel obj) {
     writer
-      ..writeByte(7)
+      ..writeByte(8)
       ..writeByte(0)
       ..write(obj.id)
       ..writeByte(1)
@@ -44,7 +45,9 @@ class OperationModelAdapter extends TypeAdapter<OperationModel> {
       ..writeByte(5)
       ..write(obj.isActive)
       ..writeByte(6)
-      ..write(obj.isSynced);
+      ..write(obj.isSynced)
+      ..writeByte(7)
+      ..write(obj.fkEntite);
   }
 
   @override

app/lib/core/data/models/passage_model.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 
 part 'passage_model.g.dart';
@@ -125,66 +126,72 @@ class PassageModel extends HiveObject {
 
   // Factory pour convertir depuis JSON (API)
   factory PassageModel.fromJson(Map<String, dynamic> json) {
-    // Convertir l'ID en int, qu'il soit déjà int ou string
-    final dynamic rawId = json['id'];
-    final int id = rawId is String ? int.parse(rawId) : rawId as int;
-    
-    // Convertir les autres champs numériques
-    final dynamic rawFkOperation = json['fk_operation'];
-    final int fkOperation = rawFkOperation is String ? int.parse(rawFkOperation) : rawFkOperation as int;
-    
-    final dynamic rawFkSector = json['fk_sector'];
-    final int fkSector = rawFkSector is String ? int.parse(rawFkSector) : rawFkSector as int;
-    
-    final dynamic rawFkUser = json['fk_user'];
-    final int fkUser = rawFkUser is String ? int.parse(rawFkUser) : rawFkUser as int;
-    
-    final dynamic rawFkType = json['fk_type'];
-    final int fkType = rawFkType is String ? int.parse(rawFkType) : rawFkType as int;
-    
-    final dynamic rawFkHabitat = json['fk_habitat'];
-    final int fkHabitat = rawFkHabitat is String ? int.parse(rawFkHabitat) : rawFkHabitat as int;
-    
-    final dynamic rawFkTypeReglement = json['fk_type_reglement'];
-    final int fkTypeReglement = rawFkTypeReglement is String ? int.parse(rawFkTypeReglement) : rawFkTypeReglement as int;
-    
-    final dynamic rawNbPassages = json['nb_passages'];
-    final int nbPassages = rawNbPassages is String ? int.parse(rawNbPassages) : rawNbPassages as int;
-    
-    // Convertir la date
-    final DateTime passedAt = DateTime.parse(json['passed_at']);
-    
-    return PassageModel(
-      id: id,
-      fkOperation: fkOperation,
-      fkSector: fkSector,
-      fkUser: fkUser,
-      fkType: fkType,
-      fkAdresse: json['fk_adresse'] as String,
-      passedAt: passedAt,
-      numero: json['numero'] as String,
-      rue: json['rue'] as String,
-      rueBis: json['rue_bis'] as String? ?? '',
-      ville: json['ville'] as String,
-      residence: json['residence'] as String? ?? '',
-      fkHabitat: fkHabitat,
-      appt: json['appt'] as String? ?? '',
-      niveau: json['niveau'] as String? ?? '',
-      gpsLat: json['gps_lat'] as String,
-      gpsLng: json['gps_lng'] as String,
-      nomRecu: json['nom_recu'] as String? ?? '',
-      remarque: json['remarque'] as String? ?? '',
-      montant: json['montant'] as String,
-      fkTypeReglement: fkTypeReglement,
-      emailErreur: json['email_erreur'] as String? ?? '',
-      nbPassages: nbPassages,
-      name: json['name'] as String,
-      email: json['email'] as String? ?? '',
-      phone: json['phone'] as String? ?? '',
-      lastSyncedAt: DateTime.now(),
-      isActive: true,
-      isSynced: true,
-    );
+    try {
+      // Convertir l'ID en int, qu'il soit déjà int ou string
+      final dynamic rawId = json['id'];
+      final int id = rawId is String ? int.parse(rawId) : rawId as int;
+
+      // Convertir les autres champs numériques
+      final dynamic rawFkOperation = json['fk_operation'];
+      final int fkOperation = rawFkOperation is String ? int.parse(rawFkOperation) : rawFkOperation as int;
+
+      final dynamic rawFkSector = json['fk_sector'];
+      final int fkSector = rawFkSector is String ? int.parse(rawFkSector) : rawFkSector as int;
+
+      final dynamic rawFkUser = json['fk_user'];
+      final int fkUser = rawFkUser is String ? int.parse(rawFkUser) : rawFkUser as int;
+
+      final dynamic rawFkType = json['fk_type'];
+      final int fkType = rawFkType is String ? int.parse(rawFkType) : rawFkType as int;
+
+      final dynamic rawFkHabitat = json['fk_habitat'];
+      final int fkHabitat = rawFkHabitat is String ? int.parse(rawFkHabitat) : rawFkHabitat as int;
+
+      final dynamic rawFkTypeReglement = json['fk_type_reglement'];
+      final int fkTypeReglement = rawFkTypeReglement is String ? int.parse(rawFkTypeReglement) : rawFkTypeReglement as int;
+
+      final dynamic rawNbPassages = json['nb_passages'];
+      final int nbPassages = rawNbPassages is String ? int.parse(rawNbPassages) : rawNbPassages as int;
+
+      // Convertir la date
+      final DateTime passedAt = DateTime.parse(json['passed_at']);
+
+      return PassageModel(
+        id: id,
+        fkOperation: fkOperation,
+        fkSector: fkSector,
+        fkUser: fkUser,
+        fkType: fkType,
+        fkAdresse: json['fk_adresse']?.toString() ?? '', // ← Gestion null
+        passedAt: passedAt,
+        numero: json['numero']?.toString() ?? '', // ← Gestion null
+        rue: json['rue']?.toString() ?? '', // ← Gestion null
+        rueBis: json['rue_bis']?.toString() ?? '',
+        ville: json['ville']?.toString() ?? '', // ← Gestion null
+        residence: json['residence']?.toString() ?? '',
+        fkHabitat: fkHabitat,
+        appt: json['appt']?.toString() ?? '',
+        niveau: json['niveau']?.toString() ?? '',
+        gpsLat: json['gps_lat']?.toString() ?? '', // ← Gestion null
+        gpsLng: json['gps_lng']?.toString() ?? '', // ← Gestion null
+        nomRecu: json['nom_recu']?.toString() ?? '', // ← Gestion null explicite
+        remarque: json['remarque']?.toString() ?? '',
+        montant: json['montant']?.toString() ?? '0.00', // ← Gestion null avec fallback
+        fkTypeReglement: fkTypeReglement,
+        emailErreur: json['email_erreur']?.toString() ?? '',
+        nbPassages: nbPassages,
+        name: json['name']?.toString() ?? '', // ← Gestion null
+        email: json['email']?.toString() ?? '',
+        phone: json['phone']?.toString() ?? '',
+        lastSyncedAt: DateTime.now(),
+        isActive: true,
+        isSynced: true,
+      );
+    } catch (e) {
+      debugPrint('❌ Erreur parsing PassageModel: $e');
+      debugPrint('❌ Données JSON: $json');
+      rethrow;
+    }
   }
 
   // Convertir en JSON pour l'API