diff --git a/ParionsCuite/ParionsCuite/MainPage.xaml b/ParionsCuite/ParionsCuite/MainPage.xaml index 1caaac8..b30ce22 100644 --- a/ParionsCuite/ParionsCuite/MainPage.xaml +++ b/ParionsCuite/ParionsCuite/MainPage.xaml @@ -44,7 +44,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/ParionsCuite/ParionsCuite/Modeles/Autre.cs b/ParionsCuite/ParionsCuite/Modeles/Autre.cs index fa78adc..cd595c3 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Autre.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Autre.cs @@ -1,4 +1,5 @@ using System; + namespace ParionsCuite.Modeles { public class Autre @@ -6,8 +7,15 @@ namespace ParionsCuite.Modeles public string Nom { get; set; } public decimal Quantite { get; set; } - public Autre() + public Autre(string nom, decimal Quantite) + { + this.Nom = nom; + this.Quantite = Quantite; + } + + public override string ToString() { + return $"nom : {Nom}, quantité : {Quantite} \n"; } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Boissons.cs b/ParionsCuite/ParionsCuite/Modeles/Boissons.cs index 42912dc..e365d3e 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Boissons.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Boissons.cs @@ -2,15 +2,21 @@ namespace ParionsCuite.Modeles { - internal class Boissons + public class Boissons { public string Nom { get; set; } public decimal Quantite { get; set; } - public Boissons() + public Boissons(string nom, decimal Quantite) { + this.Nom = nom; + this.Quantite = Quantite; } + public override string ToString() + { + return $"nom : {Nom}, quantité : {Quantite} \n"; + } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Evenement.cs b/ParionsCuite/ParionsCuite/Modeles/Evenement.cs new file mode 100644 index 0000000..450fbb2 --- /dev/null +++ b/ParionsCuite/ParionsCuite/Modeles/Evenement.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ParionsCuite.Modeles +{ + public class Evenement + { + 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 Participation participation { get; private set; } + + Evenement(string nom, DateTime date, string lieu, int heure, int minute, Participation participation) + { + 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(); + } + + 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; + return; + } + } +} diff --git a/ParionsCuite/ParionsCuite/Modeles/Inviter.cs b/ParionsCuite/ParionsCuite/Modeles/Inviter.cs index 9f7f5e3..7de0d65 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Inviter.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Inviter.cs @@ -1,13 +1,20 @@ using System; namespace ParionsCuite.Modeles { - internal class Inviter + public class Inviter { public string Nom; public string Prenom; - public Inviter() + public Inviter(string nom, string prenom) { + this.Nom = nom; + this.Prenom = prenom; + } + + public override string ToString() + { + return $"nom : {Nom}, prenom : {Prenom} \n"; } diff --git a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs new file mode 100644 index 0000000..2b74a00 --- /dev/null +++ b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ParionsCuite.Modeles +{ + public class Manageur + { + public string nom { get; private set; } + + public string prenom { get; private set; } + + public List ev { get; private set; } + + Manageur(string nom, string prenom) + { + this.nom = nom; + this.prenom = prenom; + this.ev = new List(); + } + + } +} diff --git a/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs b/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs index 0fafc34..f4bd8eb 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs @@ -6,8 +6,15 @@ namespace ParionsCuite.Modeles public string Nom { get; set; } public decimal Quantite { get; set; } - public Nourriture() + public Nourriture(string nom, decimal quantite) { + this.Nom = nom; + Quantite = quantite; + } + + public override string ToString() + { + return $"nom : {Nom}, quantité : {Quantite} \n"; } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Parier.cs b/ParionsCuite/ParionsCuite/Modeles/Parier.cs new file mode 100644 index 0000000..a2c3c90 --- /dev/null +++ b/ParionsCuite/ParionsCuite/Modeles/Parier.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ParionsCuite.Modeles +{ + public class Parier + { + public Inviter i1; + public Inviter i2; + + public string but { get; private set; } + + public string enjeu { get; private set; } + + public override string ToString() + { + 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 new file mode 100644 index 0000000..b347f3e --- /dev/null +++ b/ParionsCuite/ParionsCuite/Modeles/Participation.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ParionsCuite.Modeles +{ + public class Participation + { + Participation() + { + List list_boisson = new List(); + List list_autre = new List(); + List list_nourriture = new List(); + } + + + } +} diff --git a/ParionsCuite/ParionsCuite/Views/Accueil.xaml b/ParionsCuite/ParionsCuite/Views/Accueil.xaml index dd82091..e1446f5 100644 --- a/ParionsCuite/ParionsCuite/Views/Accueil.xaml +++ b/ParionsCuite/ParionsCuite/Views/Accueil.xaml @@ -5,8 +5,8 @@ - - + + diff --git a/ParionsCuite/ParionsCuite/Views/Ajout_Paris/Ajouts_Pari.xaml b/ParionsCuite/ParionsCuite/Views/Ajout_Paris/Ajouts_Pari.xaml index 90b0470..1c820df 100644 --- a/ParionsCuite/ParionsCuite/Views/Ajout_Paris/Ajouts_Pari.xaml +++ b/ParionsCuite/ParionsCuite/Views/Ajout_Paris/Ajouts_Pari.xaml @@ -5,13 +5,7 @@ - - - - - - - +