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">
-
-
-
+
+
+
+
+
+
+
+
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 @@
+ ItemTapped="OnAssociationTapped"
+ HasUnevenRows="True"
+ HeightRequest="500">
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 @@
-
-
-
-
-
-
+
+
+
\ 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">
+
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