From 0a7ee831209150d57559f3fd788a747cf8001bf5 Mon Sep 17 00:00:00 2001 From: Loris OBRY Date: Wed, 31 May 2023 16:53:07 +0200 Subject: [PATCH] Ajout dossier Classes --- Sources/ConsoleApp/FileName.cs | 8 +++++--- Sources/MauiApp1/MainPage.xaml.cs | 2 +- Sources/Model/{ => Classes}/Camp.cs | 4 ++-- Sources/Model/{ => Classes}/Carte.cs | 19 +++++++++++-------- Sources/Model/{ => Classes}/Commentaire.cs | 4 ++-- Sources/Model/{ => Classes}/IContenu.cs | 2 +- Sources/Model/{ => Classes}/IDataManager.cs | 2 +- Sources/Model/{ => Classes}/Manager.cs | 6 +++--- Sources/Model/{ => Classes}/Pack.cs | 9 +++++---- Sources/Model/{ => Classes}/Utilisateur.cs | 2 +- 10 files changed, 32 insertions(+), 26 deletions(-) rename Sources/Model/{ => Classes}/Camp.cs (86%) rename Sources/Model/{ => Classes}/Carte.cs (86%) rename Sources/Model/{ => Classes}/Commentaire.cs (84%) rename Sources/Model/{ => Classes}/IContenu.cs (88%) rename Sources/Model/{ => Classes}/IDataManager.cs (90%) rename Sources/Model/{ => Classes}/Manager.cs (90%) rename Sources/Model/{ => Classes}/Pack.cs (90%) rename Sources/Model/{ => Classes}/Utilisateur.cs (94%) diff --git a/Sources/ConsoleApp/FileName.cs b/Sources/ConsoleApp/FileName.cs index 7f1c623..17748ae 100644 --- a/Sources/ConsoleApp/FileName.cs +++ b/Sources/ConsoleApp/FileName.cs @@ -1,4 +1,4 @@ -using Model; +using Model.Classes; using System; using System.Collections.Generic; using System.Linq; @@ -25,10 +25,12 @@ namespace ConsoleApp DisplayTab("Tableau 2 :", tab2); */ - Carte C = new Carte("Villageois", "Aucuns", "Doit voter inteligemment", null, "lien", "une carte peu apprécié mais necesaire"); + Utilisateur Kylian = new("Kyky", "12345", null); + Carte C = new("Villageois", "Aucuns", "Doit voter inteligemment", null, "lien", "une carte peu apprécié mais necesaire"); + C.commentaires.Add(new Commentaire("Cette carte est la base du jeu, cool pour les debutants", Kylian )); Pack P = new Pack("Jeu de base", "C'est la premiere version du jeu", 5); - Console.WriteLine(C.Nom); Console.WriteLine(P.Nom); + Console.WriteLine(C.commentaires[0]); } static void DisplayTab(string name, int[] tab) diff --git a/Sources/MauiApp1/MainPage.xaml.cs b/Sources/MauiApp1/MainPage.xaml.cs index f1a8dc4..b732139 100644 --- a/Sources/MauiApp1/MainPage.xaml.cs +++ b/Sources/MauiApp1/MainPage.xaml.cs @@ -1,4 +1,4 @@ -using Model; +using Model.Classes; using System.Diagnostics; namespace MauiApp1; diff --git a/Sources/Model/Camp.cs b/Sources/Model/Classes/Camp.cs similarity index 86% rename from Sources/Model/Camp.cs rename to Sources/Model/Classes/Camp.cs index b84ea25..246f4c8 100644 --- a/Sources/Model/Camp.cs +++ b/Sources/Model/Classes/Camp.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Model +namespace Model.Classes { public class Camp { @@ -17,7 +17,7 @@ namespace Model this.Nom = Nom; this.Description = Description; this.LienImage = LienImage; - this.Cartes = new List(); + Cartes = new List(); } } } diff --git a/Sources/Model/Carte.cs b/Sources/Model/Classes/Carte.cs similarity index 86% rename from Sources/Model/Carte.cs rename to Sources/Model/Classes/Carte.cs index 9264597..2699ba2 100644 --- a/Sources/Model/Carte.cs +++ b/Sources/Model/Classes/Carte.cs @@ -7,26 +7,29 @@ using System.Threading.Tasks; using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Model +namespace Model.Classes { public class Carte : IContenu, INotifyPropertyChanged { public event PropertyChangedEventHandler? PropertyChanged; - void OnPropertyChanged([CallerMemberName] string ?propertyName = null) + void OnPropertyChanged([CallerMemberName] string? propertyName = null) { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } public string Nom { get; set; } - public string Description { + public string Description + { get => description; - set { + set + { description = value; OnPropertyChanged(nameof(Description)); - } + } } private string description; - public string Pouvoir { + public string Pouvoir + { get => pouvoir; set { @@ -85,13 +88,13 @@ namespace Model private string lienImage; public Carte(string nom, string pouvoir, string strategie, int? note, string lienImage, string description) { - this.Nom = nom; + Nom = nom; this.description = description; this.pouvoir = pouvoir; this.strategie = strategie; this.note = note; this.lienImage = lienImage; - this.commentaires = new List(); + commentaires = new List(); } } } diff --git a/Sources/Model/Commentaire.cs b/Sources/Model/Classes/Commentaire.cs similarity index 84% rename from Sources/Model/Commentaire.cs rename to Sources/Model/Classes/Commentaire.cs index fb4e7af..6ae2d3a 100644 --- a/Sources/Model/Commentaire.cs +++ b/Sources/Model/Classes/Commentaire.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Model +namespace Model.Classes { - internal class Commentaire + public class Commentaire { public string Texte { get; set; } public Utilisateur Proprietaire { get; set; } diff --git a/Sources/Model/IContenu.cs b/Sources/Model/Classes/IContenu.cs similarity index 88% rename from Sources/Model/IContenu.cs rename to Sources/Model/Classes/IContenu.cs index ea577fd..02ae49a 100644 --- a/Sources/Model/IContenu.cs +++ b/Sources/Model/Classes/IContenu.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Model +namespace Model.Classes { public interface IContenu { diff --git a/Sources/Model/IDataManager.cs b/Sources/Model/Classes/IDataManager.cs similarity index 90% rename from Sources/Model/IDataManager.cs rename to Sources/Model/Classes/IDataManager.cs index 36847a2..77cd68b 100644 --- a/Sources/Model/IDataManager.cs +++ b/Sources/Model/Classes/IDataManager.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Model +namespace Model.Classes { public interface IDataManager { diff --git a/Sources/Model/Manager.cs b/Sources/Model/Classes/Manager.cs similarity index 90% rename from Sources/Model/Manager.cs rename to Sources/Model/Classes/Manager.cs index b5b8311..104634e 100644 --- a/Sources/Model/Manager.cs +++ b/Sources/Model/Classes/Manager.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using System.Collections.ObjectModel; using System.Data; -namespace Model +namespace Model.Classes { public class Manager : IDataManager { @@ -16,7 +16,7 @@ namespace Model private IDataManager DataMgr { get; set; } public Manager(IDataManager dataManager) { - DataMgr = dataManager; + DataMgr = dataManager; Cartes = new(cartes); } public bool AddCarte(Carte carte) @@ -26,7 +26,7 @@ namespace Model if (cartes.Contains(carte)) return false; cartes.Add(carte); - DataMgr.AddCarte(carte); + DataMgr.AddCarte(carte); return true; } diff --git a/Sources/Model/Pack.cs b/Sources/Model/Classes/Pack.cs similarity index 90% rename from Sources/Model/Pack.cs rename to Sources/Model/Classes/Pack.cs index 06bc9ca..d6da655 100644 --- a/Sources/Model/Pack.cs +++ b/Sources/Model/Classes/Pack.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Model +namespace Model.Classes { public class Pack : IContenu, INotifyPropertyChanged { @@ -27,14 +27,15 @@ namespace Model } } public string description; - public string Description { + public string Description + { get => description; set { nom = value; OnPropertyChanged(nameof(Description)); } - } + } private int? note; public int? Note { @@ -67,7 +68,7 @@ namespace Model this.nom = nom; this.description = description; this.note = note; - this.commentaires = new List(); + commentaires = new List(); } } } diff --git a/Sources/Model/Utilisateur.cs b/Sources/Model/Classes/Utilisateur.cs similarity index 94% rename from Sources/Model/Utilisateur.cs rename to Sources/Model/Classes/Utilisateur.cs index b9d602e..7947e38 100644 --- a/Sources/Model/Utilisateur.cs +++ b/Sources/Model/Classes/Utilisateur.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Model +namespace Model.Classes { public class Utilisateur : INotifyPropertyChanged {