From 2886bb8f2ca873dcab5849d4661d3d490d484c94 Mon Sep 17 00:00:00 2001
From: lodufour1 <lodufour1@IUTCLINFA1807>
Date: Wed, 18 Oct 2023 17:35:10 +0200
Subject: [PATCH] Add(Back-End): mise en place de vm intermediaire

---
 .../BookApp/Composants/GroupCollection.xaml   | 10 ++++-----
 .../Composants/GroupCollection.xaml.cs        |  2 +-
 Sources/BookApp/MainPage.xaml                 |  2 +-
 Sources/BookApp/MauiProgram.cs                |  2 +-
 Sources/BookApp/Pages/DetailBook.xaml         |  1 +
 Sources/BookApp/Pages/DetailBook.xaml.cs      |  9 ++++----
 Sources/BookApp/Pages/EmpruntsPrets.xaml.cs   |  2 +-
 Sources/BookApp/Pages/Tous.xaml.cs            |  2 +-
 .../ViewModel/ViewModelDetailProvider.cs      | 19 +++++++++++++++++
 .../BookApp/ViewModel/ViewModelNavigation.cs  | 21 +++++++------------
 .../{BookViewModel.cs => BooksViewModel.cs}   |  4 ++--
 Sources/VMWrapper/DetailBookViewModel.cs      |  9 ++++++++
 12 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 Sources/BookApp/ViewModel/ViewModelDetailProvider.cs
 rename Sources/VMWrapper/{BookViewModel.cs => BooksViewModel.cs} (90%)

diff --git a/Sources/BookApp/Composants/GroupCollection.xaml b/Sources/BookApp/Composants/GroupCollection.xaml
index 3554393..d7244db 100644
--- a/Sources/BookApp/Composants/GroupCollection.xaml
+++ b/Sources/BookApp/Composants/GroupCollection.xaml
@@ -8,7 +8,7 @@
 
     <CollectionView ItemsSource="{Binding AuteurGroups}" IsGrouped="True" SelectionMode="Single">
         <CollectionView.GroupHeaderTemplate>
-            <DataTemplate>
+            <DataTemplate x:DataType="model:Author">
                 <Label Text="{Binding Name}"
                  FontFamily="SF-Compact-Display-Semibold"
                  BackgroundColor="LightGrey"
@@ -17,12 +17,12 @@
             </DataTemplate>
         </CollectionView.GroupHeaderTemplate>
         <CollectionView.ItemTemplate>
-            <DataTemplate>
+            <DataTemplate x:DataType="model:Book">
                 <StackLayout Style="{StaticResource StyleCollectionStack}">
                     <Grid>
                         <Grid.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding Source={x:Reference ThisPage}, Path=Nav.BookDetailCommand}"
-                                                  CommandParameter="{Binding .}"/>
+                                                  CommandParameter="{Binding Id}"/>
                         </Grid.GestureRecognizers>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
@@ -41,9 +41,7 @@
                             FontFamily="SF-Compact-Display-Bold"
                             FontSize="18"
                             TextColor="Black"/>
-                            <Label Text="{Binding Authors}"
-                            FontFamily="SF-Compact-Display-Semibold"
-                            TextColor="Black"/>
+                            <!-- <Label Text="{Binding Authors, Converter=}" FontFamily="SF-Compact-Display-Semibold" TextColor="Black"/> -->
                             <Label 
                             TextColor="SlateGray"
                             Text="{Binding Status}"/>
diff --git a/Sources/BookApp/Composants/GroupCollection.xaml.cs b/Sources/BookApp/Composants/GroupCollection.xaml.cs
index fbda61d..5a36db6 100644
--- a/Sources/BookApp/Composants/GroupCollection.xaml.cs
+++ b/Sources/BookApp/Composants/GroupCollection.xaml.cs
@@ -12,7 +12,7 @@ namespace BookApp.Composants
             InitializeComponent();
         }
 
-        public GroupCollection(BookViewModel data)
+        public GroupCollection(BooksViewModel data)
             : this()
         {
             BindingContext = data;
diff --git a/Sources/BookApp/MainPage.xaml b/Sources/BookApp/MainPage.xaml
index 5872acc..0e29e3d 100644
--- a/Sources/BookApp/MainPage.xaml
+++ b/Sources/BookApp/MainPage.xaml
@@ -44,7 +44,7 @@
         <Rectangle  HeightRequest="1" BackgroundColor="black" VerticalOptions="End" />
         <CollectionView ItemsSource="{Binding MenuItemsLivre}" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
             <CollectionView.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate x:DataType="vm:ViewModelMenuItem">
                     <Grid RowDefinitions="Auto" Style="{StaticResource StyleCollectionGrid}" Padding="2">
                         <Grid.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding Source={x:Reference ThisPage}, Path=Nav.MenuItemsCommand}"
diff --git a/Sources/BookApp/MauiProgram.cs b/Sources/BookApp/MauiProgram.cs
index 80b9a1c..61daa00 100644
--- a/Sources/BookApp/MauiProgram.cs
+++ b/Sources/BookApp/MauiProgram.cs
@@ -29,7 +29,7 @@ namespace BookApp
             builder.Logging.AddDebug();
 #endif
             builder.Services.AddSingleton<ILibraryManager, LibraryStub>();
-            builder.Services.AddSingleton<BookViewModel>();
+            builder.Services.AddSingleton<BooksViewModel>();
             builder.Services.AddSingleton<FilterViewModel>();
             builder.Services.AddSingleton<SearchBarViewModel>();
             builder.Services.AddSingleton<DetailBookViewModel>();
diff --git a/Sources/BookApp/Pages/DetailBook.xaml b/Sources/BookApp/Pages/DetailBook.xaml
index c520eb9..489d389 100644
--- a/Sources/BookApp/Pages/DetailBook.xaml
+++ b/Sources/BookApp/Pages/DetailBook.xaml
@@ -6,6 +6,7 @@
     xmlns:vm="clr-namespace:BookApp.ViewModel"
     x:Name="ThisPage"
     x:Class="BookApp.Pages.DetailBook">
+
     <Shell.BackButtonBehavior>
         <BackButtonBehavior IsVisible="False" IsEnabled="False"/>
     </Shell.BackButtonBehavior>
diff --git a/Sources/BookApp/Pages/DetailBook.xaml.cs b/Sources/BookApp/Pages/DetailBook.xaml.cs
index ae19698..1626dc1 100644
--- a/Sources/BookApp/Pages/DetailBook.xaml.cs
+++ b/Sources/BookApp/Pages/DetailBook.xaml.cs
@@ -3,15 +3,16 @@ using System.Diagnostics;
 using VMWrapper;
 
 namespace BookApp.Pages
-{
+{
+    [QueryProperty(nameof(BookId), "BookId")]
     public partial class DetailBook : ContentPage
     {
-        public ViewModelNavigation Nav { get; } = new ViewModelNavigation();
+        public ViewModelDetailProvider VMProvider { get; }
 
-        public DetailBook(DetailBookViewModel viewModel)
+        public DetailBook()
         {
             InitializeComponent();
-            BindingContext = viewModel;
+            BindingContext = this;
         }
     }
 }
diff --git a/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs b/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs
index 26dd3d4..8219497 100644
--- a/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs
+++ b/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs
@@ -22,7 +22,7 @@ namespace BookApp.Pages
 
         public ViewModelNavigation Nav { get; } = new ViewModelNavigation();
 
-        public EmpruntsPrets(BookViewModel data)
+        public EmpruntsPrets(BooksViewModel data)
         {
             InitializeComponent();
             BindingContext = data;
diff --git a/Sources/BookApp/Pages/Tous.xaml.cs b/Sources/BookApp/Pages/Tous.xaml.cs
index ee860df..b4fa6aa 100644
--- a/Sources/BookApp/Pages/Tous.xaml.cs
+++ b/Sources/BookApp/Pages/Tous.xaml.cs
@@ -9,7 +9,7 @@ namespace BookApp.Pages
     {
         public ViewModelNavigation Nav { get; } = new ViewModelNavigation();
 
-        public Tous(BookViewModel data)
+        public Tous(BooksViewModel data)
         {
             InitializeComponent();
             BindingContext = data;
diff --git a/Sources/BookApp/ViewModel/ViewModelDetailProvider.cs b/Sources/BookApp/ViewModel/ViewModelDetailProvider.cs
new file mode 100644
index 0000000..4edcc0a
--- /dev/null
+++ b/Sources/BookApp/ViewModel/ViewModelDetailProvider.cs
@@ -0,0 +1,19 @@
+using Model;
+using System.Windows.Input;
+using ToolKit;
+using VMWrapper;
+
+namespace BookApp.ViewModel
+{
+    class ViewModelDetailProvider
+    {
+        public ICommand _idDetailCommand;
+        public ICommand IdDetailCommand =>
+            _idDetailCommand ??= new CommandPersonnal<Book>(
+                async (bookId) => await OnToItemDetail(bookId)
+            );
+        public ViewModelDetailProvider(DetailBookViewModel bookProvider, ViewModelNavigation navProvider)
+        {
+        }
+    }
+}
diff --git a/Sources/BookApp/ViewModel/ViewModelNavigation.cs b/Sources/BookApp/ViewModel/ViewModelNavigation.cs
index e8b4ec4..2b70a68 100644
--- a/Sources/BookApp/ViewModel/ViewModelNavigation.cs
+++ b/Sources/BookApp/ViewModel/ViewModelNavigation.cs
@@ -19,17 +19,10 @@ namespace BookApp.ViewModel
         // Command Collection livre
         public ICommand _bookDetailCommand;
         public ICommand BookDetailCommand =>
-            _bookDetailCommand ??= new CommandPersonnal<Book>(
-                async (book) => await OnBookSelected(book)
+            _bookDetailCommand ??= new CommandPersonnal<string>(
+                async (book) => await OnToItemDetail(book)
             );
 
-        private Book _selectedBook;
-        public Book SelectedBook
-        {
-            get { return _selectedBook; }
-            set { SetProperty(ref _selectedBook, value); }
-        }
-
         // Command Collection menu
         private ICommand _menuItemsCommand;
         public ICommand MenuItemsCommand =>
@@ -61,16 +54,17 @@ namespace BookApp.ViewModel
             }
         }
 
-        private async Task OnBookSelected(Book book)
+        private async Task OnToItemDetail(string bookId)
         {
-            if (book == null)
+            if (bookId == null)
             {
+                Debug.WriteLine("Book is null, cannot navigate to details page.");
                 return;
             }
+
             try
             {
-                SelectedBook = book;
-                await Shell.Current.GoToAsync("DetailBookPage");
+                await Shell.Current.GoToAsync($"DetailBookPage?BookId={bookId}");
             }
             catch (Exception ex)
             {
@@ -78,6 +72,7 @@ namespace BookApp.ViewModel
             }
         }
 
+
         async Task BackButton(object sender, EventArgs args)
         {
             if (Shell.Current.Navigation.NavigationStack.Count > 1)
diff --git a/Sources/VMWrapper/BookViewModel.cs b/Sources/VMWrapper/BooksViewModel.cs
similarity index 90%
rename from Sources/VMWrapper/BookViewModel.cs
rename to Sources/VMWrapper/BooksViewModel.cs
index e3dfaab..ded476a 100644
--- a/Sources/VMWrapper/BookViewModel.cs
+++ b/Sources/VMWrapper/BooksViewModel.cs
@@ -3,14 +3,14 @@ using System.Collections.ObjectModel;
 
 namespace VMWrapper
 {
-    public class BookViewModel
+    public class BooksViewModel
     {
         private readonly ILibraryManager data;
 
         public ObservableCollection<AuteurGroup> AuteurGroups { get; private set; } =
             new ObservableCollection<AuteurGroup>();
 
-        public BookViewModel(ILibraryManager data)
+        public BooksViewModel(ILibraryManager data)
         {
             this.data = data;
             LoadBooksAsync();
diff --git a/Sources/VMWrapper/DetailBookViewModel.cs b/Sources/VMWrapper/DetailBookViewModel.cs
index 1f011aa..3ce87c0 100644
--- a/Sources/VMWrapper/DetailBookViewModel.cs
+++ b/Sources/VMWrapper/DetailBookViewModel.cs
@@ -4,15 +4,24 @@ using ToolKit;
 
 namespace VMWrapper
 {
+    [QueryProperty(nameof(BookId), "BookId")]
     public class DetailBookViewModel : BaseViewModel
     {
         private readonly ILibraryManager data;
 
+        private string _bookId;
+        public string BookId
+        {
+            get { return _bookId; }
+            set { SetProperty(ref _bookId, value); }
+        }
+
         public Book BookDetail { get; private set; } = new Book();
 
         public DetailBookViewModel(ILibraryManager data)
         {
             this.data = data;
+            LoadBookDetail(BookId);
         }
 
         private async void LoadBookDetail(string idBook)