From ee4626269e55e4346f3d2fcfbda913d5c216f502 Mon Sep 17 00:00:00 2001
From: besbota <axelbesbot@gmail.com>
Date: Tue, 8 Apr 2025 11:46:40 +0200
Subject: [PATCH] Changement affichage

---
 MauiAppStock/App.xaml.cs                          |  2 +-
 MauiAppStock/AppShell.xaml                        | 15 ++++++++-------
 MauiAppStock/AppShell.xaml.cs                     | 15 ++++++++++++++-
 MauiAppStock/Views/AppareilPiecesPage.xaml        |  4 +++-
 MauiAppStock/Views/EditPiecePage.xaml.cs          |  2 +-
 MauiAppStock/Views/MainPage.xaml                  |  9 +++------
 .../Views/SelectAppareilForAssociationPage.xaml   |  1 +
 .../SelectAppareilForAssociationPage.xaml.cs      |  8 +++++++-
 8 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/MauiAppStock/App.xaml.cs b/MauiAppStock/App.xaml.cs
index 7bb788a..f709f05 100644
--- a/MauiAppStock/App.xaml.cs
+++ b/MauiAppStock/App.xaml.cs
@@ -9,7 +9,7 @@ public partial class App : Application
     {
         InitializeComponent();
         // On démarre sur MainPage dans une NavigationPage pour permettre la navigation
-        MainPage = new NavigationPage(new MainPage());
+        MainPage = new AppShell();
         InitializeDatabase();
     }
 
diff --git a/MauiAppStock/AppShell.xaml b/MauiAppStock/AppShell.xaml
index bc2c2d4..16d2bb4 100644
--- a/MauiAppStock/AppShell.xaml
+++ b/MauiAppStock/AppShell.xaml
@@ -3,14 +3,15 @@
     x:Class="MauiAppStock.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MauiAppStock"
     xmlns:views="clr-namespace:MauiAppStock.Views"
     Shell.FlyoutBehavior="Disabled"
     Title="MauiAppStock">
-
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate views:MainPage}"
-        Route="MainPage" />
-
+    
+    <Tab>
+        <ShellContent Title="Acceuil" ContentTemplate="{DataTemplate views:MainPage}" />
+        <ShellContent Title="Appareils" ContentTemplate="{DataTemplate views:AppareilsPage}"/>
+        <ShellContent Title="Pièces" ContentTemplate="{DataTemplate views:PiecesPage}"/>
+        <ShellContent Title="Association" ContentTemplate="{DataTemplate views:SelectAppareilForAssociationPage}"/>
+    </Tab>
+   
 </Shell>
diff --git a/MauiAppStock/AppShell.xaml.cs b/MauiAppStock/AppShell.xaml.cs
index 5a5c839..e0da968 100644
--- a/MauiAppStock/AppShell.xaml.cs
+++ b/MauiAppStock/AppShell.xaml.cs
@@ -1,9 +1,22 @@
-namespace MauiAppStock;
+using MauiAppStock.Views;
+
+namespace MauiAppStock;
 
 public partial class AppShell : Shell
 {
     public AppShell()
     {
         InitializeComponent();
+        Routing.RegisterRoute(nameof(MainPage), typeof(MainPage));
+        Routing.RegisterRoute(nameof(AppareilsPage), typeof(AppareilsPage));
+        Routing.RegisterRoute(nameof(PiecesPage), typeof(PiecesPage));
+        Routing.RegisterRoute(nameof(SelectAppareilForAssociationPage), typeof(SelectAppareilForAssociationPage));
+    }
+    protected override void OnNavigating(ShellNavigatingEventArgs args)
+    {
+        base.OnNavigating(args);
+
+        bool isMainPage = args.Target?.Location?.OriginalString == "//MainPage";
+        Shell.SetBackButtonBehavior(this, new BackButtonBehavior { IsVisible = !isMainPage });
     }
 }
\ No newline at end of file
diff --git a/MauiAppStock/Views/AppareilPiecesPage.xaml b/MauiAppStock/Views/AppareilPiecesPage.xaml
index 19bb339..d7e1899 100644
--- a/MauiAppStock/Views/AppareilPiecesPage.xaml
+++ b/MauiAppStock/Views/AppareilPiecesPage.xaml
@@ -15,7 +15,9 @@
         <ListView x:Name="AssociationsListView" ItemsSource="{Binding AppareilPieces}"
                   IsPullToRefreshEnabled="True"
                   RefreshCommand="{Binding LoadAssociationsCommand}"
-                  ItemTapped="OnAssociationTapped">
+                  ItemTapped="OnAssociationTapped"
+                  HasUnevenRows="True"
+                  HeightRequest="500">
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <ViewCell>
diff --git a/MauiAppStock/Views/EditPiecePage.xaml.cs b/MauiAppStock/Views/EditPiecePage.xaml.cs
index 9283357..ae81cbc 100644
--- a/MauiAppStock/Views/EditPiecePage.xaml.cs
+++ b/MauiAppStock/Views/EditPiecePage.xaml.cs
@@ -25,7 +25,7 @@ namespace MauiAppStock.Views
                 _piece.Description = DescriptionEditor.Text;
                 _piece.Prix = prix;
                 _piece.Stock = stock;
-                _piece.Fournisseur = FournisseurEntry.Text;
+//              _piece.Fournisseur = SelectedFournisseur;
                 await Database.UpdatePieceAsync(_piece);
                 await Navigation.PopAsync();
             }
diff --git a/MauiAppStock/Views/MainPage.xaml b/MauiAppStock/Views/MainPage.xaml
index b18f554..9f05040 100644
--- a/MauiAppStock/Views/MainPage.xaml
+++ b/MauiAppStock/Views/MainPage.xaml
@@ -2,10 +2,7 @@
 <ContentPage x:Class="MauiAppStock.Views.MainPage"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-    <StackLayout Padding="20" Spacing="20" VerticalOptions="Center">
-        <Label Text="Menu Principal" FontSize="30" HorizontalOptions="Center" />
-        <Button Text="Gestion des Appareils" Clicked="OnAppareilsClicked" />
-        <Button Text="Gestion des Pièces" Clicked="OnPiecesClicked" />
-        <Button Text="Associer une Pièce à un Appareil" Clicked="OnAssocierPieceClicked" />
-    </StackLayout>
+    <VerticalStackLayout Padding="10" Spacing="10" >
+        <Label Text="Bienvenue sur le site : AppStock" FontSize="20"/>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml b/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml
index 5609c28..7736312 100644
--- a/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml
+++ b/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml
@@ -3,6 +3,7 @@
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
     <StackLayout Padding="10">
+        
         <Label Text="Sélectionnez un Appareil" FontSize="24" HorizontalOptions="Center" />
         <ListView x:Name="AppareilsListView" ItemTapped="OnAppareilTapped">
             <ListView.ItemTemplate>
diff --git a/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml.cs b/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml.cs
index 0f5c41c..ee5d5ff 100644
--- a/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml.cs
+++ b/MauiAppStock/Views/SelectAppareilForAssociationPage.xaml.cs
@@ -10,7 +10,11 @@ namespace MauiAppStock.Views
             InitializeComponent();
             LoadAppareils();
         }
-
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+            LoadAppareils(); // Rafraîchit la liste à chaque affichage
+        }
         private async void LoadAppareils()
         {
             var appareils = await Database.GetAppareilsAsync();
@@ -25,5 +29,7 @@ namespace MauiAppStock.Views
                 await Navigation.PushAsync(new AppareilPiecesPage(selectedAppareil));
             }
         }
+
+
     }
 }
\ No newline at end of file