diff --git a/CanYouBuildIt/Data/UserData.xml b/CanYouBuildIt/Data/UserData.xml index f44f7e9..54528a5 100644 --- a/CanYouBuildIt/Data/UserData.xml +++ b/CanYouBuildIt/Data/UserData.xml @@ -1,5 +1,6 @@ + Zalman Z10 Plus @@ -58,18 +59,21 @@ + 1234 Clément + vivien Vivien + 0000 diff --git a/CanYouBuildIt/Model/Build.cs b/CanYouBuildIt/Model/Build.cs index 12bea86..23fd076 100644 --- a/CanYouBuildIt/Model/Build.cs +++ b/CanYouBuildIt/Model/Build.cs @@ -9,8 +9,10 @@ namespace CanYouBuildIt.Model { public class Build { + public static int nbId = 0; public int id { get; private set; } public float prix { get; private set; } + public string image { get; private set; } public Composant boitier { get; private set; } public Composant processeur { get; private set; } public Composant ventirad { get; private set; } @@ -26,25 +28,45 @@ namespace CanYouBuildIt.Model - public Build(int idBuild, float prixBuild, Composant boitier, Composant processeur, Composant ventirad, Composant cartemere, Composant memoirevive, Composant cartegraphique, Composant alimentation, Composant ventilateur = null, Composant ssd = null, Composant hdd = null) + public Build(string image,Composant boitier, Composant processeur, Composant ventirad, Composant cartemere, Composant memoirevive, Composant cartegraphique, Composant alimentation, Composant ventilateur = null, Composant ssd = null, Composant hdd = null) { - id = idBuild; - prix = prixBuild; + id = nbId; + nbId = nbId +1; + + this.image = image; + //-- ajoue de chaque élément + calcule du prix total this.boitier = boitier; + prix = boitier.prix; this.processeur = processeur; + prix = prix + processeur.prix; this.ventirad = ventirad; + prix = prix + ventirad.prix; this.cartemere = cartemere; + prix = prix + cartemere.prix; this.memoirevive = memoirevive; + prix = prix + memoirevive.prix; this.cartegraphique = cartegraphique; + prix = prix + cartegraphique.prix; this.alimentation = alimentation; - if (ventilateur != null) + prix = prix + alimentation.prix; + + //-- element non obligatoire d'un build --// + if (ventilateur != null) + { this.ventilateur = ventilateur; + prix = prix + ventilateur.prix; + } if (ssd != null) + { this.SSD = ssd; + prix = prix + ssd.prix; + } if (hdd != null) + { this.HDD = hdd; + prix = prix + hdd.prix; + } - } } diff --git a/CanYouBuildIt/Model/Manager.cs b/CanYouBuildIt/Model/Manager.cs index 64bf564..cf8c60b 100644 --- a/CanYouBuildIt/Model/Manager.cs +++ b/CanYouBuildIt/Model/Manager.cs @@ -57,6 +57,11 @@ namespace CanYouBuildIt.Model listComp.Add(composant); } + public void ajouterBuild(Build build) + { + listBuild.Add(build); + } + public int rechercheUsername(string usern) { for (int i = 0; i < listUtil.Count; i++ ) diff --git a/CanYouBuildIt/Model/Stub.cs b/CanYouBuildIt/Model/Stub.cs index fc1ad0b..d1c0a3e 100644 --- a/CanYouBuildIt/Model/Stub.cs +++ b/CanYouBuildIt/Model/Stub.cs @@ -42,6 +42,8 @@ namespace CanYouBuildIt.Model data.lu.AddRange(lu); data.lc.AddRange(lc); + data.lb.Add(new Build("pc1.png",lc[0], lc[1], lc[2], lc[3], lc[6], lc[5], lc[4], null, lc[7], lc[8])); + return data; } diff --git a/CanYouBuildIt/Model/Utilisateur.cs b/CanYouBuildIt/Model/Utilisateur.cs index 2d0ee82..a022462 100644 --- a/CanYouBuildIt/Model/Utilisateur.cs +++ b/CanYouBuildIt/Model/Utilisateur.cs @@ -18,14 +18,17 @@ namespace CanYouBuildIt.Model public List listBuild; [DataMember] public List listFav; + [DataMember] + public List Builds; - public Utilisateur(string name, string pass, List listbuild = null, List listfav = null) + public Utilisateur(string name, string pass, List listbuild = null, List listfav = null, List builds = null) { username = name; password = pass; listBuild = listbuild; listFav = listfav; + Builds = builds; } } } diff --git a/CanYouBuildIt/Views/Acceuil.xaml b/CanYouBuildIt/Views/Acceuil.xaml index 555e17d..cf27b83 100644 --- a/CanYouBuildIt/Views/Acceuil.xaml +++ b/CanYouBuildIt/Views/Acceuil.xaml @@ -49,11 +49,16 @@ - - + + + + + + + + Clicked="BackHome" + MaximumHeightRequest="150"/> diff --git a/CanYouBuildIt/Views/Login.xaml b/CanYouBuildIt/Views/Login.xaml index d3a5008..eeeb410 100644 --- a/CanYouBuildIt/Views/Login.xaml +++ b/CanYouBuildIt/Views/Login.xaml @@ -11,7 +11,7 @@ BackgroundColor="#408097" AbsoluteLayout.LayoutBounds="0.5,0.5,500,700" AbsoluteLayout.LayoutFlags="PositionProportional"> -