From b8f18fdee5ec41c083b23c6497373d7f8a266757 Mon Sep 17 00:00:00 2001
From: hulivet1 <Hugo.LIVET@etu.uca.fr>
Date: Fri, 2 Dec 2022 16:04:17 +0100
Subject: [PATCH] Gestion Banques presque oke

---
 Sources/Data/PersLinqToPgSQL.cs               |  20 ++++++++-
 Sources/IHM/IHM.csproj                        |   4 ++
 Sources/IHM/Mobile/GestionBanques.xaml        |  24 +++++++++--
 Sources/IHM/Mobile/GestionBanques.xaml.cs     |   3 +-
 .../Images/GestionBanques/add_banks.png       | Bin 0 -> 629 bytes
 Sources/IHM/Resources/Styles/Colors.xaml      |   1 +
 Sources/Modele/IPersistanceManager.cs         |   3 +-
 Sources/Modele/Manager.cs                     |  38 ++++++++++++++++--
 8 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 Sources/IHM/Resources/Images/GestionBanques/add_banks.png

diff --git a/Sources/Data/PersLinqToPgSQL.cs b/Sources/Data/PersLinqToPgSQL.cs
index d6fa114..da4d022 100644
--- a/Sources/Data/PersLinqToPgSQL.cs
+++ b/Sources/Data/PersLinqToPgSQL.cs
@@ -360,9 +360,9 @@ namespace LinqToPgSQL
             // attente des autres supression
         }
 
-        public IList<Banque> ImportBanques()
+        public List<Banque> ImportBanques()
         {
-            IList<Banque> bquesDispo = new List<Banque>();
+            List<Banque> bquesDispo = new List<Banque>();
             dbAccess.Open();
 
             NpgsqlCommand cmd = new NpgsqlCommand($"SELECT * FROM Banque", dbAccess);
@@ -375,6 +375,22 @@ namespace LinqToPgSQL
             return bquesDispo;
         }
 
+        public List<Banque> ImportBanquesForUser(Inscrit i)
+        {
+            List<Banque> bquesDispo = new List<Banque>();
+            dbAccess.Open();
+
+            NpgsqlCommand cmd = new NpgsqlCommand($"SELECT b.nom, b.urllogo, b.urldl FROM Banque b, InscrBanque ib WHERE ib.nombanque = b.nom AND ib.idinscrit=(@id);", dbAccess);
+            cmd.Parameters.AddWithValue("p", i.Id);
+            NpgsqlDataReader dbReader = cmd.ExecuteReader();
+            while (dbReader.Read())
+            {
+                bquesDispo.Add(new Banque(dbReader.GetString(0), dbReader.GetString(1), dbReader.GetString(2)));
+            }
+            dbAccess.Close();
+            return bquesDispo;
+        }
+
 
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index ca89c1b..2f6e57e 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -38,6 +38,9 @@
 		<MauiImage Include="Resources\Images\DashBoard\account_banks.png">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</MauiImage>
+		<MauiImage Include="Resources\Images\GestionBanques\add_banks.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</MauiImage>
 		<MauiImage Include="Resources\Images\GestionBanques\reload_banks.png">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</MauiImage>
@@ -67,6 +70,7 @@
 
 	<ItemGroup>
 	  <None Remove="Resources\Images\DashBoard\account_banks.png" />
+	  <None Remove="Resources\Images\GestionBanques\add_banks.png" />
 	  <None Remove="Resources\Images\GestionBanques\reload_banks.png" />
 	</ItemGroup>
 
diff --git a/Sources/IHM/Mobile/GestionBanques.xaml b/Sources/IHM/Mobile/GestionBanques.xaml
index 78d9348..f0f694e 100644
--- a/Sources/IHM/Mobile/GestionBanques.xaml
+++ b/Sources/IHM/Mobile/GestionBanques.xaml
@@ -13,7 +13,7 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
+            <ColumnDefinition Width="1.95*"/>
             <ColumnDefinition/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
@@ -23,7 +23,7 @@
             <Label Text="Cons'Eco" FontSize="20" VerticalOptions="Center" FontAttributes="Bold"/>
         </HorizontalStackLayout>
 
-        <ImageButton Grid.Row="0" Grid.Column="1" Source="reload_banks.png" 
+        <ImageButton Grid.Row="0" Grid.Column="1" Source="add_banks.png" 
                      HorizontalOptions="End" Padding="10" Margin="10"
                      CornerRadius="10" HeightRequest="65" 
                      BackgroundColor="{StaticResource Primary}"/>
@@ -38,7 +38,25 @@
         <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" ItemsSource="{Binding BanquesDisponibleInApp}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
-                    <composant:BanqueVC NomBanque="{Binding Nom}" DateLastReload="12/12/2003" /><!-- il faut le namespace !!!! -->
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.75*"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Grid.Column="0" Text="{Binding Nom}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+                        <ImageButton Grid.Column="2" Source="reload_banks.png" 
+                             Padding="10" Margin="10"
+                             CornerRadius="10" HeightRequest="65" 
+                             BackgroundColor="{StaticResource Primary}"/>
+
+                    </Grid>
+                    
+                    
+                    
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
diff --git a/Sources/IHM/Mobile/GestionBanques.xaml.cs b/Sources/IHM/Mobile/GestionBanques.xaml.cs
index 3dc2a99..0252749 100644
--- a/Sources/IHM/Mobile/GestionBanques.xaml.cs
+++ b/Sources/IHM/Mobile/GestionBanques.xaml.cs
@@ -1,4 +1,5 @@
 using Model;
+using System.Collections.ObjectModel;
 
 namespace IHM.Mobile;
 
@@ -10,7 +11,7 @@ public partial class GestionBanques : ContentPage
 	{
 		InitializeComponent();
 		BindingContext= Mgr;
-        //Mgr.BanquesDisponibleInApp=Mgr.importBanques();
+        //Mgr.importBanquesForUser(Mgr.SelectedInscrit);
 
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Resources/Images/GestionBanques/add_banks.png b/Sources/IHM/Resources/Images/GestionBanques/add_banks.png
new file mode 100644
index 0000000000000000000000000000000000000000..f648a2723378118b0e193bd2c39c31c24ab12d51
GIT binary patch
literal 629
zcmV-*0*d{KP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0xC&FK~!jg?U~C;96=O@KZmR`h!2n(-Xl)(0?7jiuFOtEkUWGi;KF4>
z$TNgsbd_XAgsfc2%oAi*-WHNPfDwr<rsJZz>83DsYHF%#Hub@Qrt8xGsjAa;sv8oC
zL?ST+V*&bn1~h<4pq}5m2F`&Va1r2{L$e5cM2Y+-*ctEvSQv>?jpx8VkRc1#EdyG>
ze00@74cG#1EybGb259DeMxhS;@E}~b1Im~QD!v;)d|{oCPSgl9^7qX|kma-$L409N
z-{R*`!4}JbTRgv=_8mm@ft}o3UbEkPiC=USuv6*di{k)@o1IOtyu~f$IICQrI<&6=
z8#a|BRvaGgi#JjQ$$_V+q-<2o0FO--BnMvj)8b6SRQNz>Y%}^9um}9s?sv57_geWQ
zU=2CGrc8yB1LHzDDDmq;ox|L8#!ya}m@pMa%K$?m&A=avK8j`VQ@h`#Tt=^fS6cZ?
zVAZ1kON%=HWf}K$V7t=K_7MFnnFLBpNFUWv&@&ZE4qTwlxufC)_+_eK6U5*BXmLVJ
z=xiMLgj$P(GF`czacG|bpB>uWON+sSFGFRaySQbuUww%Om?iFk=7s>DTbdCa*z_$P
zRJ<HS5Z@-uCr<z#qITC%;*auY1f@=xnP|rlUr<BEgpa`fi(2!+mW_!y)JE606kD}E
z>Q(8oM|fuebznI`7Jdx8Lw(sEnh?|Wgz^VRaUi;){J~+&Z4!w@A`z84Tutkdc`^+o
P00000NkvXXu0mjfY~UPA

literal 0
HcmV?d00001

diff --git a/Sources/IHM/Resources/Styles/Colors.xaml b/Sources/IHM/Resources/Styles/Colors.xaml
index 84a16e9..83bee11 100644
--- a/Sources/IHM/Resources/Styles/Colors.xaml
+++ b/Sources/IHM/Resources/Styles/Colors.xaml
@@ -41,4 +41,5 @@
     <Color x:Key="Blue200Accent">#72ACF1</Color>
     <Color x:Key="Blue300Accent">#A7CBF6</Color>
 
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Sources/Modele/IPersistanceManager.cs b/Sources/Modele/IPersistanceManager.cs
index 8a6b3c1..78a90bd 100644
--- a/Sources/Modele/IPersistanceManager.cs
+++ b/Sources/Modele/IPersistanceManager.cs
@@ -18,6 +18,7 @@ namespace Model
         void ChangePasswordBdd(string mail, string newMdp);
         string RecupMdpBdd(string mail);
         bool TestConnexionAsDatabase();
-        public IList<Banque> ImportBanques();
+        public List<Banque> ImportBanques();
+        public List<Banque> ImportBanquesForUser(Inscrit i);
     }
 }
diff --git a/Sources/Modele/Manager.cs b/Sources/Modele/Manager.cs
index 66d61c9..97c23b1 100644
--- a/Sources/Modele/Manager.cs
+++ b/Sources/Modele/Manager.cs
@@ -26,7 +26,33 @@ namespace Model
         }
         private Banque selectedBanque;
 
-        public ObservableCollection<Banque> BanquesDisponibleInApp { get; set; } = new ObservableCollection<Banque>();
+        public List<Banque> BanquesDisponibleInApp 
+        { 
+            get => banquesDisponibleInApp;
+            set
+            {
+                if (banquesDisponibleInApp != value)
+                {
+                    banquesDisponibleInApp = value;
+                    OnPropertyChanged(nameof(BanquesDisponibleInApp));
+                }
+            } 
+        }
+        private List<Banque> banquesDisponibleInApp;
+
+        public List<Banque> BanquesUser
+        {
+            get => banquesUser;
+            set
+            {
+                if (banquesUser != value)
+                {
+                    banquesUser = value;
+                    OnPropertyChanged(nameof(BanquesUser));
+                }
+            }
+        }
+        private List<Banque> banquesUser;
 
         void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
@@ -85,10 +111,16 @@ namespace Model
             return Pers.TestConnexionAsDatabase();
         }
 
-        public IList<Banque> importBanques()
+        public void importBanques()
         {
-            return Pers.ImportBanques();
+            BanquesDisponibleInApp = Pers.ImportBanques();
         }
+
+        public void importBanquesForUser(Inscrit i)
+        {
+            BanquesUser = Pers.ImportBanquesForUser(i);
+        }
+
     }
 
 }