feat(frontend): connect return flow to api

2026-07-07 14:10:12 +02:00
parent d83aa7dd75
commit 78a0c1305e
5 changed files with 301 additions and 67 deletions
@@ -3,6 +3,7 @@ import "package:google_fonts/google_fonts.dart";
 import "../theme/ensup_colors.dart";
 import "../models/emprunt_item.dart";
 import "../models/anomalie_retour.dart";
+import "../services/emprunt_service.dart";
 import "../widgets/ensup_top_bar.dart";
 import "../widgets/brand_corners.dart";
 import "../widgets/etat_checklist.dart";
@@ -20,27 +21,83 @@ class ChecklistRetourScreen extends StatefulWidget {
 }

 class _ChecklistRetourScreenState extends State<ChecklistRetourScreen> {
+  late final List<String> _elements = widget.emprunt.materiel.accessoires.isEmpty
+      ? <String>[widget.emprunt.materiel.nom]
+      : widget.emprunt.materiel.accessoires;
  late final List<EtatChecklist> _etats = List<EtatChecklist>.filled(
-    widget.emprunt.materiel.accessoires.length,
+    _elements.length,
    EtatChecklist.present,
  );
+  final TextEditingController _commentaireController = TextEditingController();
+  bool _envoiEnCours = false;
+
+  @override
+  void dispose() {
+    _commentaireController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _valider() async {
+    setState(() => _envoiEnCours = true);

-  void _valider() {
-    final accessoires = widget.emprunt.materiel.accessoires;
    final anomalies = <AnomalieRetour>[];
    for (var i = 0; i < _etats.length; i++) {
      if (_etats[i] == EtatChecklist.absent) {
-        anomalies.add(AnomalieRetour(element: accessoires[i], etatRetour: "Absent au retour"));
+        anomalies.add(AnomalieRetour(element: _elements[i], etatRetour: "Absent au retour"));
      } else if (_etats[i] == EtatChecklist.deteriore) {
-        anomalies.add(AnomalieRetour(element: accessoires[i], etatRetour: "Détérioré au retour"));
+        anomalies.add(AnomalieRetour(element: _elements[i], etatRetour: "Détérioré au retour"));
      }
    }

-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (_) => ResultatRetourScreen(emprunt: widget.emprunt, anomalies: anomalies),
-      ),
-    );
+    try {
+      final resultat = await EmpruntService.restituerEmprunt(
+        empruntId: widget.emprunt.id,
+        commentaireRetour: _commentaireController.text,
+        elements: _elements.asMap().entries.map((entry) {
+          return {
+            "nomElement": entry.value,
+            "etat": _etatApi(_etats[entry.key]),
+            "quantiteConstatee": _etats[entry.key] == EtatChecklist.absent ? 0 : 1,
+          };
+        }).toList(),
+      );
+
+      if (!mounted) {
+        return;
+      }
+
+      final anomaliesAffichees = resultat.statut == "CLOTURE" ? <AnomalieRetour>[] : anomalies;
+      Navigator.of(context).push(
+        MaterialPageRoute(
+          builder: (_) => ResultatRetourScreen(
+            emprunt: widget.emprunt.copyWith(statut: resultat.statut),
+            anomalies: anomaliesAffichees,
+          ),
+        ),
+      );
+    } catch (error) {
+      if (!mounted) {
+        return;
+      }
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(error.toString())),
+      );
+    } finally {
+      if (mounted) {
+        setState(() => _envoiEnCours = false);
+      }
+    }
+  }
+
+  String _etatApi(EtatChecklist etat) {
+    switch (etat) {
+      case EtatChecklist.present:
+        return "PRESENT";
+      case EtatChecklist.absent:
+        return "ABSENT";
+      case EtatChecklist.deteriore:
+        return "DETERIORE";
+    }
  }

  @override
@@ -144,7 +201,7 @@ class _ChecklistRetourScreenState extends State<ChecklistRetourScreen> {
        ),
        const SizedBox(height: 16),
        ChecklistTableau(
-          accessoires: materiel.accessoires,
+          accessoires: _elements,
          etats: _etats,
          onChanged: (index, etat) => setState(() => _etats[index] = etat),
        ),
@@ -163,15 +220,24 @@ class _ChecklistRetourScreenState extends State<ChecklistRetourScreen> {
              "Indiquez leur état au retour ; toute différence sera signalée.",
        ),
        const SizedBox(height: 14),
-        const ChecklistCommentaire(hint: "Commentaire optionnel..."),
+        ChecklistCommentaire(
+          controller: _commentaireController,
+          hint: "Commentaire optionnel...",
+        ),
        const SizedBox(height: 14),
        SizedBox(
          width: double.infinity,
          child: FilledButton.icon(
-            onPressed: _valider,
-            icon: const Icon(Icons.check, size: 18),
+            onPressed: _envoiEnCours ? null : _valider,
+            icon: _envoiEnCours
+                ? const SizedBox(
+                    width: 18,
+                    height: 18,
+                    child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
+                  )
+                : const Icon(Icons.check, size: 18),
            label: Text(
-              "Valider le retour",
+              _envoiEnCours ? "Enregistrement..." : "Valider le retour",
              style: GoogleFonts.darkerGrotesque(fontWeight: FontWeight.w700, fontSize: 16),
            ),
            style: FilledButton.styleFrom(
@@ -1,38 +1,59 @@
 import "package:flutter/material.dart";
 import "package:google_fonts/google_fonts.dart";
 import "../theme/ensup_colors.dart";
-import "../models/materiel_item.dart";
 import "../models/emprunt_item.dart";
+import "../services/emprunt_service.dart";
+import "../services/materiel_service.dart";
 import "../widgets/ensup_top_bar.dart";
 import "../widgets/brand_corners.dart";
 import "checklist_retour_screen.dart";

-const _pcDell = MaterielItem(
-  id: 0,
-  nom: "PC Dell Latitude 5420",
-  categorie: "Ordinateur",
-  marque: "Dell",
-  modele: "Latitude 5420",
-  reference: "ENS-PC-001",
-  campus: "Paris",
-  etatGeneral: "Bon état",
-  disponible: false,
-  accessoires: ["Chargeur 65W", "Souris sans fil", "Housse de protection", "Câble HDMI"],
-  icon: Icons.laptop_mac,
-);
-
-const _emprunts = <EmpruntItem>[
-  EmpruntItem(materiel: _pcDell, dateEmprunt: "28/05/2026 à 09:15", retourPrevu: "29/05"),
-];
-
 /// Sélection de l'emprunt en cours à restituer (RG15 : ses propres emprunts).
-class RestitutionSelectScreen extends StatelessWidget {
+class RestitutionSelectScreen extends StatefulWidget {
  const RestitutionSelectScreen({super.key});

-  void _restituer(BuildContext context, EmpruntItem emprunt) {
-    Navigator.of(context).push(
-      MaterialPageRoute(builder: (_) => ChecklistRetourScreen(emprunt: emprunt)),
-    );
+  @override
+  State<RestitutionSelectScreen> createState() => _RestitutionSelectScreenState();
+}
+
+class _RestitutionSelectScreenState extends State<RestitutionSelectScreen> {
+  late Future<List<EmpruntItem>> _future;
+  int? _chargementId;
+
+  @override
+  void initState() {
+    super.initState();
+    _future = EmpruntService.getMesEmprunts();
+  }
+
+  void _recharger() {
+    setState(() => _future = EmpruntService.getMesEmprunts());
+  }
+
+  Future<void> _restituer(EmpruntItem emprunt) async {
+    setState(() => _chargementId = emprunt.id);
+    try {
+      final detail = await MaterielService.getDetail(emprunt.materiel.id);
+      if (!mounted) {
+        return;
+      }
+      Navigator.of(context).push(
+        MaterialPageRoute(
+          builder: (_) => ChecklistRetourScreen(emprunt: emprunt.copyWith(materiel: detail)),
+        ),
+      );
+    } catch (error) {
+      if (!mounted) {
+        return;
+      }
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(error.toString())),
+      );
+    } finally {
+      if (mounted) {
+        setState(() => _chargementId = null);
+      }
+    }
  }

  @override
@@ -68,29 +89,23 @@ class RestitutionSelectScreen extends StatelessWidget {
                      onBack: () => Navigator.of(context).pop(),
                    ),
                    Expanded(
-                      child: SingleChildScrollView(
+                      child: Padding(
                        padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 28),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(
-                              "Sélectionner le matériel à restituer",
-                              style: GoogleFonts.darkerGrotesque(
-                                fontSize: 24,
-                                fontWeight: FontWeight.w900,
-                                color: EnsupColors.text,
-                              ),
-                            ),
-                            const SizedBox(height: 16),
-                            for (final emprunt in _emprunts)
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 10),
-                                child: _EmpruntCard(
-                                  emprunt: emprunt,
-                                  onRestituer: () => _restituer(context, emprunt),
-                                ),
-                              ),
-                          ],
+                        child: FutureBuilder<List<EmpruntItem>>(
+                          future: _future,
+                          builder: (context, snapshot) {
+                            if (snapshot.connectionState == ConnectionState.waiting) {
+                              return const Center(child: CircularProgressIndicator());
+                            }
+                            if (snapshot.hasError) {
+                              return _ErreurState(
+                                message: snapshot.error.toString(),
+                                onRetry: _recharger,
+                              );
+                            }
+
+                            return _contenu(snapshot.data ?? const []);
+                          },
                        ),
                      ),
                    ),
@@ -104,12 +119,50 @@ class RestitutionSelectScreen extends StatelessWidget {
      ),
    );
  }
+
+  Widget _contenu(List<EmpruntItem> emprunts) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Sélectionner le matériel à restituer",
+          style: GoogleFonts.darkerGrotesque(
+            fontSize: 24,
+            fontWeight: FontWeight.w900,
+            color: EnsupColors.text,
+          ),
+        ),
+        const SizedBox(height: 16),
+        Expanded(
+          child: emprunts.isEmpty
+              ? const _EmptyState()
+              : ListView.separated(
+                  itemCount: emprunts.length,
+                  separatorBuilder: (_, _) => const SizedBox(height: 10),
+                  itemBuilder: (context, index) {
+                    final emprunt = emprunts[index];
+                    return _EmpruntCard(
+                      emprunt: emprunt,
+                      loading: _chargementId == emprunt.id,
+                      onRestituer: () => _restituer(emprunt),
+                    );
+                  },
+                ),
+        ),
+      ],
+    );
+  }
 }

 class _EmpruntCard extends StatelessWidget {
-  const _EmpruntCard({required this.emprunt, required this.onRestituer});
+  const _EmpruntCard({
+    required this.emprunt,
+    required this.loading,
+    required this.onRestituer,
+  });

  final EmpruntItem emprunt;
+  final bool loading;
  final VoidCallback onRestituer;

  @override
@@ -161,7 +214,7 @@ class _EmpruntCard extends StatelessWidget {
              borderRadius: BorderRadius.circular(999),
            ),
            child: Text(
-              "En cours",
+              emprunt.statut == "EN_RETARD" ? "En retard" : "En cours",
              style: GoogleFonts.darkerGrotesque(
                fontSize: 13,
                fontWeight: FontWeight.w700,
@@ -171,14 +224,14 @@ class _EmpruntCard extends StatelessWidget {
          ),
          const SizedBox(width: 12),
          FilledButton(
-            onPressed: onRestituer,
+            onPressed: loading ? null : onRestituer,
            style: FilledButton.styleFrom(
              backgroundColor: EnsupColors.cyan,
              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
            ),
            child: Text(
-              "Restituer",
+              loading ? "Chargement..." : "Restituer",
              style: GoogleFonts.darkerGrotesque(fontWeight: FontWeight.w700, fontSize: 14),
            ),
          ),
@@ -187,3 +240,50 @@ class _EmpruntCard extends StatelessWidget {
    );
  }
 }
+
+class _EmptyState extends StatelessWidget {
+  const _EmptyState();
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Text(
+        "Aucun emprunt en cours à restituer",
+        style: GoogleFonts.titilliumWeb(fontSize: 14, color: EnsupColors.muted),
+      ),
+    );
+  }
+}
+
+class _ErreurState extends StatelessWidget {
+  const _ErreurState({required this.message, required this.onRetry});
+
+  final String message;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Icon(Icons.cloud_off_outlined, size: 40, color: EnsupColors.muted),
+          const SizedBox(height: 12),
+          Text(
+            message,
+            textAlign: TextAlign.center,
+            style: GoogleFonts.titilliumWeb(fontSize: 14, color: EnsupColors.text2),
+          ),
+          const SizedBox(height: 14),
+          OutlinedButton(
+            onPressed: onRetry,
+            child: Text(
+              "Réessayer",
+              style: GoogleFonts.darkerGrotesque(fontWeight: FontWeight.w700),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}