From d9c8149aafb12ad6913c2004909cfd0a2489313d Mon Sep 17 00:00:00 2001
From: V J <Vianney.JOURDY@etu.uca.fr>
Date: Fri, 2 Jun 2023 09:57:52 +0200
Subject: [PATCH] =?UTF-8?q?modification=20page=20de=20cr=C3=A9ation=20d'oe?=
 =?UTF-8?q?uvre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MangaMap/Views/CreateOeuvre.xaml.cs |  7 +++----
 MangaMap/Views/FicheAnime.xaml.cs   | 11 +++--------
 MangaMap/Views/createOeuvre.xaml    | 11 +++++++----
 MangaMap/Views/ficheAnime.xaml      | 17 ++++++++---------
 MangaMap/Views/listPage.xaml        |  1 -
 MangaMap/Views/listPage.xaml.cs     | 12 ------------
 MangaMap/Views/settingsPage.xaml.cs |  8 ++++----
 7 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/MangaMap/Views/CreateOeuvre.xaml.cs b/MangaMap/Views/CreateOeuvre.xaml.cs
index ee61349..de64a2f 100644
--- a/MangaMap/Views/CreateOeuvre.xaml.cs
+++ b/MangaMap/Views/CreateOeuvre.xaml.cs
@@ -4,20 +4,19 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
 using System.Threading.Tasks;
 using Microsoft.Maui.Storage;
 
-
 namespace MangaMap.Views;
 
 public partial class createOeuvre : ContentPage
 {
     public Manager my_manager => (App.Current as App).MyManager;
+    private string imagePath;
 
     public createOeuvre()
 	{
 		InitializeComponent();
+        BindingContext = this;
 	}
 
-    private string imagePath;
-
     async void SelectImageClicked(object sender, EventArgs e)
     {
         var result = await FilePicker.PickAsync(new PickOptions
@@ -33,7 +32,7 @@ public partial class createOeuvre : ContentPage
             imagePath = result.FullPath;
 
             // Affichez l'image sélectionnée dans l'interface utilisateur, si nécessaire
-            
+
         }
     }
 
diff --git a/MangaMap/Views/FicheAnime.xaml.cs b/MangaMap/Views/FicheAnime.xaml.cs
index f2327b4..b83d928 100644
--- a/MangaMap/Views/FicheAnime.xaml.cs
+++ b/MangaMap/Views/FicheAnime.xaml.cs
@@ -12,11 +12,9 @@ public partial class ficheAnime : ContentPage, INotifyPropertyChanged
 
     public ficheAnime()
     {
-
-   
         InitializeComponent();
 
-        this.BindingContext = this;
+        BindingContext = this;
     }
 
     public ficheAnime(Oeuvre anime)
@@ -25,11 +23,9 @@ public partial class ficheAnime : ContentPage, INotifyPropertyChanged
 
         InitializeComponent();
 
-        this.BindingContext = this;
+        BindingContext = this;
     }
 
-
-
     public async void AjouterListe(object sender, EventArgs e)
     {
         if (my_manager.UtilisateurActuel.Email == null)
@@ -40,7 +36,7 @@ public partial class ficheAnime : ContentPage, INotifyPropertyChanged
 
         string selectedOption = await DisplayActionSheet("Ajouter à quelle liste ?", "Annuler", null, "En Visionnage", "Déjà Vu", "Pour Plus Tard", "Favoris");
 
-        if (selectedOption == "Annuler")
+        if (selectedOption == "Annuler" || selectedOption == null)
             return;
 
         Debug.WriteLine("Selected Option: " + selectedOption);
@@ -75,7 +71,6 @@ public partial class ficheAnime : ContentPage, INotifyPropertyChanged
         my_manager.sauvegarder();
 
         await Navigation.PushAsync(new listPage());
-        //await Shell.Current.GoToAsync("//page/secondaire/listPage");
     }
 
 
diff --git a/MangaMap/Views/createOeuvre.xaml b/MangaMap/Views/createOeuvre.xaml
index 1c4bdc3..03eb564 100644
--- a/MangaMap/Views/createOeuvre.xaml
+++ b/MangaMap/Views/createOeuvre.xaml
@@ -3,15 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="MangaMap.Views.createOeuvre"
              Background="{StaticResource Secondary}">
-    
+
     <VerticalStackLayout>
-        <Label Text="Création d'une nouvelle série" FontSize="Title" Margin="0,0,0,20" TextColor="#ffffff"/>
+
+        <Label Text="Création d'une nouvelle série" FontSize="Title" Margin="0,0,0,20" TextColor="#ffffff" HorizontalOptions="Center"/>
 
         <Button Text="Sélectionner une image" Clicked="SelectImageClicked" Margin="0,0,0,10"/>
 
-        <Entry x:Name="nameEntry" Placeholder="Nom" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
+        <Grid ColumnDefinitions="*,*" Margin="10" ColumnSpacing="10">
+            <Entry x:Name="nameEntry" Placeholder="Nom" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
 
-        <Entry x:Name="typeEntry" Placeholder="Type" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
+            <Entry Grid.Column="1" x:Name="typeEntry" Placeholder="Type" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
+        </Grid>
 
         <Entry x:Name="descriptionEntry" Placeholder="Description" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
 
diff --git a/MangaMap/Views/ficheAnime.xaml b/MangaMap/Views/ficheAnime.xaml
index 476d220..664c521 100644
--- a/MangaMap/Views/ficheAnime.xaml
+++ b/MangaMap/Views/ficheAnime.xaml
@@ -12,7 +12,7 @@
         <VerticalStackLayout Grid.Row="1">
 
             <HorizontalStackLayout>
-                
+
                 <ImageButton
                     Style="{StaticResource ImageAnime}"
                     BackgroundColor="Orange"
@@ -21,20 +21,17 @@
                     />
 
                 <Label Text="{Binding AnimeModel.Nom}" FontSize="Header" VerticalOptions="Center" TextColor="White"/>
+
             </HorizontalStackLayout>
 
-            <Grid>
-                <Label Text="test"/>
-                <Label Text="test"/>
-                <Label Text="test" BackgroundColor="{StaticResource Primary}"/>
-            </Grid>
+            <Label Text="{Binding AnimeModel.Genre}" BackgroundColor="{StaticResource Primary}" TextColor="White" Margin="0,0,0,30"/>
 
-            <HorizontalStackLayout x:Name="star">
-                <Image Source="star_full.png" WidthRequest="50" HeightRequest="50" Margin="10"/>
+                            <HorizontalStackLayout x:Name="star">
                 <Image Source="star_full.png" WidthRequest="50" HeightRequest="50" Margin="10"/>
                 <Image Source="star_full.png" WidthRequest="50" HeightRequest="50" Margin="10"/>
                 <Image Source="star_full.png" WidthRequest="50" HeightRequest="50" Margin="10"/>
                 <Image Source="star_full.png" WidthRequest="50" HeightRequest="50" Margin="10"/>
+                <Image Source="star_empty.png" WidthRequest="50" HeightRequest="50" Margin="10"/>
             </HorizontalStackLayout>
 
             <Button Text="Ajouter à la liste"
@@ -44,9 +41,11 @@
                         BackgroundColor="{StaticResource Primary}"
                         Clicked="AjouterListe"/>
 
+            <Label Text="{Binding AnimeModel.Type}" FontSize="Large"  TextColor="White"/>
+            <Label Text="{Binding AnimeModel.Description}"/>
+
         </VerticalStackLayout>
 
-        
     </Grid>
 
 </ContentPage>
\ No newline at end of file
diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index 47833af..4c61c80 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -41,7 +41,6 @@
                                             <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
                                             <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
                                             <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
-                                            <ImageButton Grid.Column="4" Source="addepisodes.png" BackgroundColor="#333333" HorizontalOptions="End" MaximumHeightRequest="5" MaximumWidthRequest="5" Clicked="OnAddClicked"/>
                                         </Grid>
                                     </DataTemplate>
                                     
diff --git a/MangaMap/Views/listPage.xaml.cs b/MangaMap/Views/listPage.xaml.cs
index 9e3102b..9283e00 100644
--- a/MangaMap/Views/listPage.xaml.cs
+++ b/MangaMap/Views/listPage.xaml.cs
@@ -21,16 +21,4 @@ public partial class listPage : ContentPage
             await Navigation.PushAsync(new ficheAnime(selectedAnime));
         }
     }
-
-    private async void OnAddClicked(object sender, EventArgs e)
-    {
-        var button = (ImageButton)sender;
-        var oeuvre = (Oeuvre)button.BindingContext;
-
-        // Mettez à jour le nombre d'épisodes vus
-        oeuvre.AjouterEpisode(1);
-
-        // Sauvegardez les modifications
-        my_manager.sauvegarder();
-    }
 }
\ No newline at end of file
diff --git a/MangaMap/Views/settingsPage.xaml.cs b/MangaMap/Views/settingsPage.xaml.cs
index 6b96b08..89986c2 100644
--- a/MangaMap/Views/settingsPage.xaml.cs
+++ b/MangaMap/Views/settingsPage.xaml.cs
@@ -24,11 +24,11 @@ public partial class settingsPage : ContentPage
 
     private async void AddClicked(object sender, EventArgs e)
     {
-        if(my_manager.isAdmin)
+        if(!my_manager.isAdmin)
         {
-            await Shell.Current.Navigation.PushAsync(new createOeuvre());
+            await DisplayAlert("Erreur", "Vous n'êtes pas connecté en tant qu'Administrateur.", "OK");
+            return;
         }
-        await DisplayAlert("Erreur", "Vous n'êtes pas connecté en tant qu'Administrateur.", "OK");
-        return;
+        await Shell.Current.Navigation.PushAsync(new createOeuvre());
     }
 }
\ No newline at end of file