diff --git a/ParionsCuite/ParionsCuite/Modeles/Autre.cs b/ParionsCuite/ParionsCuite/Modeles/Autre.cs index cd595c3..ffd4c15 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Autre.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Autre.cs @@ -5,17 +5,23 @@ namespace ParionsCuite.Modeles public class Autre { public string Nom { get; set; } - public decimal Quantite { get; set; } - public Autre(string nom, decimal Quantite) + public Autre(string nom) { - this.Nom = nom; - this.Quantite = Quantite; + Nom = nom; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(obj, null)) return false; + if (ReferenceEquals(obj, this)) return true; + if (obj.GetType() != this.GetType()) return false; + return Equals(obj as Autre); } public override string ToString() { - return $"nom : {Nom}, quantité : {Quantite} \n"; + return $"nom : {Nom} \n"; } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Boissons.cs b/ParionsCuite/ParionsCuite/Modeles/Boissons.cs index e365d3e..b82896d 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Boissons.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Boissons.cs @@ -1,21 +1,28 @@ using System; +using System.Security.Principal; namespace ParionsCuite.Modeles { public class Boissons { public string Nom { get; set; } - public decimal Quantite { get; set; } - public Boissons(string nom, decimal Quantite) + public Boissons(string nom) { - this.Nom = nom; - this.Quantite = Quantite; + Nom = nom; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(obj, null)) return false; + if (ReferenceEquals(obj, this)) return true; + if (obj.GetType() != this.GetType()) return false; + return Equals(obj as Boissons); } public override string ToString() { - return $"nom : {Nom}, quantité : {Quantite} \n"; + return $"nom : {Nom} \n"; } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Evenement.cs b/ParionsCuite/ParionsCuite/Modeles/Evenement.cs index 64f19bc..62fe38e 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Evenement.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Evenement.cs @@ -1,4 +1,5 @@ -using System; +using ParionsCuite.Views.Invite; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,37 +9,72 @@ namespace ParionsCuite.Modeles { public class Evenement { - public string nom { get; private set; } + /* Déclaration */ + public string Nom { get; private set; } + public DateTime Date { get; private set; } + public string Lieu { get; private set; } + public int Heure { get; private set; } + public int Minute { get; private set; } - public DateTime date { get; private set; } + public Participation Participation { get; private set; } + public List ListInviter { get; private set; } + public List ListParier { get; private set; } - public string lieu { get; private set; } + /* Constructeur */ + public Evenement(string nom, DateTime date, string lieu, int heure, int minute, Participation participation) + { + Nom = nom; + Date = date; + Lieu = lieu; + Heure = heure; + Minute = minute; + Participation = participation; + ListInviter = new List(); + ListParier = new List(); + } - public int heure { get; private set; } + /* Méthode Inviter */ + public bool Ajouter_inviter(Inviter I) + { + ListInviter.Add(I); + foreach (Inviter i in ListInviter) + { + if (i == I) + return true; + } + return false; + } - public int minute { get; private set; } + public bool Supprimer_inviter(Inviter inviter) + { + return ListInviter.Remove(inviter); + } - public Participation participation { get; private set; } + /* Méthode Parie */ + public bool Ajouter_parie(Parier parier) + { + ListParier.Add(parier); + foreach (Parier p in ListParier) + { + if (p == parier) + return true; + } + return false; + } - public Evenement(string nom, DateTime date, string lieu, int heure, int minute, Participation participation) + public bool Supprimer_parie(Parier p) { - this.nom = nom; - this.date = date; - this.lieu = lieu; - this.heure = heure; - this.minute = minute; - this.participation = participation; - List list_inviter = new List(); - List list_parie = new List(); + return ListParier.Remove(p); } - public void setEvenement(string nom, DateTime date, string lieu, int heure, int minute) + /* Setter */ + public void SetEvenement(string nom, DateTime date, string lieu, int heure, int minute) { - this.nom = nom; - this.date = date; - this.lieu = lieu; - this.heure = heure; - this.minute = minute; + Nom = nom; + Date = date; + Lieu = lieu; + Heure = heure; + Minute = minute; return; } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Inviter.cs b/ParionsCuite/ParionsCuite/Modeles/Inviter.cs index 7de0d65..ac6e86b 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Inviter.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Inviter.cs @@ -8,8 +8,8 @@ namespace ParionsCuite.Modeles public Inviter(string nom, string prenom) { - this.Nom = nom; - this.Prenom = prenom; + Nom = nom; + Prenom = prenom; } public override string ToString() diff --git a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs index a861866..9a25ac8 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs @@ -8,22 +8,22 @@ namespace ParionsCuite.Modeles { public class Manageur { - public List evenement { get; private set; } + public List Evenement { get; private set; } public Manageur() { - evenement = new List(); + Evenement = new List(); } public Manageur(List evenements) { - evenement = evenements.ToList(); + Evenement = evenements.ToList(); } public bool Ajout_evenement(Evenement ev) { - evenement.Add(ev); - foreach (Evenement e in evenement) + Evenement.Add(ev); + foreach (Evenement e in Evenement) { if (e == ev) return true; @@ -33,7 +33,7 @@ namespace ParionsCuite.Modeles public bool Supprimer_evenement(Evenement ev) { - return evenement.Remove(ev); + return Evenement.Remove(ev); } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs b/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs index f4bd8eb..65a5094 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs @@ -4,17 +4,23 @@ namespace ParionsCuite.Modeles public class Nourriture { public string Nom { get; set; } - public decimal Quantite { get; set; } - public Nourriture(string nom, decimal quantite) + public Nourriture(string nom) { - this.Nom = nom; - Quantite = quantite; + Nom = nom; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(obj, null)) return false; + if (ReferenceEquals(obj, this)) return true; + if (obj.GetType() != this.GetType()) return false; + return Equals(obj as Nourriture); } public override string ToString() { - return $"nom : {Nom}, quantité : {Quantite} \n"; + return $"nom : {Nom} \n"; } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Parier.cs b/ParionsCuite/ParionsCuite/Modeles/Parier.cs index a2c3c90..863d485 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Parier.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Parier.cs @@ -11,13 +11,21 @@ namespace ParionsCuite.Modeles public Inviter i1; public Inviter i2; - public string but { get; private set; } + public string But { get; private set; } - public string enjeu { get; private set; } + public string Enjeu { get; private set; } + + public Parier(Inviter i1, Inviter i2, string but, string enjeu) + { + this.i1 = i1; + this.i2 = i2; + But = but; + Enjeu = enjeu; + } public override string ToString() { - return $"joueur n°1 : {i1}, \njoueur n°2 : {i2}, \nbut : {but}, enjeux : {enjeu}"; + return $"joueur n°1 : {i1}, \njoueur n°2 : {i2}, \nbut : {But}, enjeux : {Enjeu}"; } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Participation.cs b/ParionsCuite/ParionsCuite/Modeles/Participation.cs index e58788c..4eca9f5 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Participation.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Participation.cs @@ -1,4 +1,7 @@ -using System; +using Microsoft.Maui.ApplicationModel; +using ParionsCuite.Views.Participations.Autre; +using ParionsCuite.Views.Participations.Boisson; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,11 +11,36 @@ namespace ParionsCuite.Modeles { public class Participation { - public Participation() + + public Dictionary Map_Boissons { get; private set; } + public Dictionary Map_Nourriture { get; private set; } + public Dictionary Map_Autre { get; private set; } + + public Participation(Dictionary map_boisson, Dictionary map_nourriture, Dictionary map_autre) + { + Map_Boissons = map_boisson; + Map_Nourriture = map_nourriture; + Map_Autre = map_autre; + } + + public bool Ajout_Boissons(Boissons boissons, int quantite) { - List list_boisson = new List(); - List list_autre = new List(); - List list_nourriture = new List(); + foreach (var pair in Map_Boissons) + { + if (pair.Key.Equals(boissons)) + { + if (quantite > 0) + { + int temp = pair.Value + quantite; + Map_Boissons.Remove(boissons); + Map_Boissons.Add(boissons, temp); + return true; + } + return false; + } + } + Map_Boissons.Add(boissons, quantite); + return true; } diff --git a/ParionsCuite/ParionsCuite/Views/Invite/Inviter.xaml b/ParionsCuite/ParionsCuite/Views/Invite/Inviter.xaml index b21c0b4..fd8f528 100644 --- a/ParionsCuite/ParionsCuite/Views/Invite/Inviter.xaml +++ b/ParionsCuite/ParionsCuite/Views/Invite/Inviter.xaml @@ -17,9 +17,9 @@ - - -