From 02993ba97b2276fda5d85561e1267762d48c03bb Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Wed, 10 May 2023 09:27:49 +0200 Subject: [PATCH 1/8] Update 'ParionsCuite/ParionsCuite/ParionsCuite.csproj' --- ParionsCuite/ParionsCuite/ParionsCuite.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/ParionsCuite/ParionsCuite/ParionsCuite.csproj b/ParionsCuite/ParionsCuite/ParionsCuite.csproj index 04eff98..16924fe 100644 --- a/ParionsCuite/ParionsCuite/ParionsCuite.csproj +++ b/ParionsCuite/ParionsCuite/ParionsCuite.csproj @@ -5,6 +5,7 @@ $(TargetFrameworks);net7.0-windows10.0.19041.0 + maccatalyst-arm64 Exe ParionsCuite true From f0383e284ca1c8de4ceca73c9845155a9f4a77e1 Mon Sep 17 00:00:00 2001 From: Fages Tony Date: Wed, 10 May 2023 09:29:08 +0200 Subject: [PATCH 2/8] stub --- .../Modeles/IPersistanceManager.cs | 10 ++++++ ParionsCuite/ParionsCuite/Modeles/Manageur.cs | 6 ---- ParionsCuite/ParionsCuite/ParionsCuite.csproj | 4 +++ ParionsCuite/ParionsCuite/ParionsCuite.sln | 25 +++++++++++++ ParionsCuite/ParionsCuite/Stub/Stub.cs | 35 +++++++++++++++++++ 5 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs create mode 100644 ParionsCuite/ParionsCuite/ParionsCuite.sln create mode 100644 ParionsCuite/ParionsCuite/Stub/Stub.cs diff --git a/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs b/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs new file mode 100644 index 0000000..af965ed --- /dev/null +++ b/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs @@ -0,0 +1,10 @@ +using System; +namespace ParionsCuite.Modeles +{ + public interface IPersistanceManager + { + public List chargeDonnees(); + public void sauvegardeDonnees(List evenements); + } +} + diff --git a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs index a30431e..3e02cea 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs @@ -54,11 +54,5 @@ namespace ParionsCuite.Modeles } - public void f(int entier) - { - int n = 0; - entier = entier + n; - } - } } diff --git a/ParionsCuite/ParionsCuite/ParionsCuite.csproj b/ParionsCuite/ParionsCuite/ParionsCuite.csproj index 04eff98..bc6e9c2 100644 --- a/ParionsCuite/ParionsCuite/ParionsCuite.csproj +++ b/ParionsCuite/ParionsCuite/ParionsCuite.csproj @@ -83,6 +83,8 @@ + + @@ -96,5 +98,7 @@ + + diff --git a/ParionsCuite/ParionsCuite/ParionsCuite.sln b/ParionsCuite/ParionsCuite/ParionsCuite.sln new file mode 100644 index 0000000..b38cbfd --- /dev/null +++ b/ParionsCuite/ParionsCuite/ParionsCuite.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 25.0.1706.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParionsCuite", "ParionsCuite.csproj", "{3C605C4F-A3EE-4E08-B43D-692792A3DFCD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3C605C4F-A3EE-4E08-B43D-692792A3DFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C605C4F-A3EE-4E08-B43D-692792A3DFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C605C4F-A3EE-4E08-B43D-692792A3DFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C605C4F-A3EE-4E08-B43D-692792A3DFCD}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6A064B44-E657-47A6-9D3E-2585AD56A945} + EndGlobalSection +EndGlobal diff --git a/ParionsCuite/ParionsCuite/Stub/Stub.cs b/ParionsCuite/ParionsCuite/Stub/Stub.cs new file mode 100644 index 0000000..543643f --- /dev/null +++ b/ParionsCuite/ParionsCuite/Stub/Stub.cs @@ -0,0 +1,35 @@ +using System; +using ParionsCuite.Modeles; +namespace ParionsCuite.Stub; + +public class Stub : IPersistanceManager +{ + public Stub() + { + } + + public List chargeDonnees() + { + List lisEvent = new List(); + Boissons b = new("lzn"); + var boissons = new Dictionary(); + boissons[b] = 3; + Nourriture n = new("slkdbv"); + var nourriture = new Dictionary(); + nourriture[n] = 3; + Autre a = new("skjdbv"); + var autre = new Dictionary(); + autre[a] = 3; + DateTime dt = new(2018, 7, 24); + Participation p = new(boissons, nourriture, autre); + Evenement e = new ("nom", dt, "lieu", 12, 23, p); + lisEvent.Add(e); + return lisEvent; + } + + public void sauvegardeDonnees(List evenements) + { + throw new NotImplementedException(); + } +} + From 531f5d2bfa542542d0f37a462e57b6b628326ba7 Mon Sep 17 00:00:00 2001 From: Fages Tony Date: Wed, 10 May 2023 09:55:27 +0200 Subject: [PATCH 3/8] stub + release + hash --- ParionsCuite/ParionsCuite/MainPage.xaml | 8 ++------ ParionsCuite/ParionsCuite/MainPage.xaml.cs | 6 ++++-- ParionsCuite/ParionsCuite/Modeles/Autre.cs | 5 +++++ ParionsCuite/ParionsCuite/Modeles/Boissons.cs | 4 ++++ ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs | 2 ++ ParionsCuite/ParionsCuite/Modeles/Nourriture.cs | 5 +++++ ParionsCuite/ParionsCuite/Stub/Stub.cs | 1 + 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ParionsCuite/ParionsCuite/MainPage.xaml b/ParionsCuite/ParionsCuite/MainPage.xaml index 467ff70..ee06068 100644 --- a/ParionsCuite/ParionsCuite/MainPage.xaml +++ b/ParionsCuite/ParionsCuite/MainPage.xaml @@ -11,7 +11,7 @@ xmlns:boisson="clr-namespace:ParionsCuite.Views.Participations.Boisson" xmlns:nourriture="clr-namespace:ParionsCuite.Views.Participations" xmlns:autre="clr-namespace:ParionsCuite.Views.Participations.Autre" - Title="ParionsCuite"> + > @@ -59,11 +59,7 @@ - - - - - + diff --git a/ParionsCuite/ParionsCuite/MainPage.xaml.cs b/ParionsCuite/ParionsCuite/MainPage.xaml.cs index 860dfd7..cab29ae 100644 --- a/ParionsCuite/ParionsCuite/MainPage.xaml.cs +++ b/ParionsCuite/ParionsCuite/MainPage.xaml.cs @@ -1,4 +1,6 @@ -using Microsoft.VisualBasic; +using System; +using Microsoft.Maui.Controls; +using Microsoft.VisualBasic; using ParionsCuite.Modeles; using ParionsCuite.Views.Information; using ParionsCuite.Views.Participations.Autre; @@ -7,13 +9,13 @@ namespace ParionsCuite; public partial class MainPage : ContentPage { - int count = 0; public MainPage() { InitializeComponent(); } + public void VueInfo(object sender, EventArgs e) { //changervue diff --git a/ParionsCuite/ParionsCuite/Modeles/Autre.cs b/ParionsCuite/ParionsCuite/Modeles/Autre.cs index ffd4c15..97b2af8 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Autre.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Autre.cs @@ -23,6 +23,11 @@ namespace ParionsCuite.Modeles { return $"nom : {Nom} \n"; } + + public override int GetHashCode() + { + return HashCode.Combine(Nom); + } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/Boissons.cs b/ParionsCuite/ParionsCuite/Modeles/Boissons.cs index b82896d..a561f9d 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Boissons.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Boissons.cs @@ -25,6 +25,10 @@ namespace ParionsCuite.Modeles return $"nom : {Nom} \n"; } + public override int GetHashCode() + { + return HashCode.Combine(Nom); + } } } diff --git a/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs b/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs index af965ed..e128054 100644 --- a/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs +++ b/ParionsCuite/ParionsCuite/Modeles/IPersistanceManager.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; + namespace ParionsCuite.Modeles { public interface IPersistanceManager diff --git a/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs b/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs index 65a5094..33cb853 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Nourriture.cs @@ -22,6 +22,11 @@ namespace ParionsCuite.Modeles { return $"nom : {Nom} \n"; } + + public override int GetHashCode() + { + return HashCode.Combine(Nom); + } } } diff --git a/ParionsCuite/ParionsCuite/Stub/Stub.cs b/ParionsCuite/ParionsCuite/Stub/Stub.cs index 543643f..a99f18a 100644 --- a/ParionsCuite/ParionsCuite/Stub/Stub.cs +++ b/ParionsCuite/ParionsCuite/Stub/Stub.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using ParionsCuite.Modeles; namespace ParionsCuite.Stub; From cb5522f73f1b6bb7227f72d65d33f884a667917e Mon Sep 17 00:00:00 2001 From: Fages Tony Date: Wed, 10 May 2023 13:27:39 +0200 Subject: [PATCH 4/8] add Windows target framework --- ParionsCuite/ParionsCuite/ParionsCuite.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParionsCuite/ParionsCuite/ParionsCuite.csproj b/ParionsCuite/ParionsCuite/ParionsCuite.csproj index fcbaa58..4d38e8a 100644 --- a/ParionsCuite/ParionsCuite/ParionsCuite.csproj +++ b/ParionsCuite/ParionsCuite/ParionsCuite.csproj @@ -1,7 +1,7 @@  - net7.0-android;net7.0-ios;net7.0-maccatalyst + net7.0-maccatalyst;net7.0-windows10.0.19041.0 $(TargetFrameworks);net7.0-windows10.0.19041.0 From 4edd7daff170f64dc7281511fed225d033ee1e82 Mon Sep 17 00:00:00 2001 From: Fages Tony Date: Wed, 10 May 2023 14:54:52 +0200 Subject: [PATCH 5/8] Persi --- ParionsCuite/ParionsCuite/Modeles/Manageur.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs index 3e02cea..376c3fe 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Security.Cryptography.X509Certificates; using System.Text; @@ -11,6 +12,12 @@ namespace ParionsCuite.Modeles { public List Evenement { get; private set; } + public IPersistanceManager Persistance { get; set; } + + public Manageur(IPersistanceManager Pers) { + Evenement = new ReadOnlyCollection(Evenement); + } + public Manageur() { Evenement = new List(); From e82e13e5e76e3233ee58d62c18a0c903ceac95f7 Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Wed, 10 May 2023 14:55:25 +0200 Subject: [PATCH 6/8] Update 'ParionsCuite/ParionsCuite/ParionsCuite.csproj' --- ParionsCuite/ParionsCuite/ParionsCuite.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParionsCuite/ParionsCuite/ParionsCuite.csproj b/ParionsCuite/ParionsCuite/ParionsCuite.csproj index 4d38e8a..a315c8f 100644 --- a/ParionsCuite/ParionsCuite/ParionsCuite.csproj +++ b/ParionsCuite/ParionsCuite/ParionsCuite.csproj @@ -1,7 +1,7 @@  - net7.0-maccatalyst;net7.0-windows10.0.19041.0 + net7.0-maccatalyst $(TargetFrameworks);net7.0-windows10.0.19041.0 From a901fc6720422d27d47e6073a78c14b7b2ae5a36 Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Wed, 10 May 2023 14:56:06 +0200 Subject: [PATCH 7/8] Update 'ParionsCuite/ParionsCuite/ParionsCuite.csproj' --- ParionsCuite/ParionsCuite/ParionsCuite.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParionsCuite/ParionsCuite/ParionsCuite.csproj b/ParionsCuite/ParionsCuite/ParionsCuite.csproj index a315c8f..ebc208d 100644 --- a/ParionsCuite/ParionsCuite/ParionsCuite.csproj +++ b/ParionsCuite/ParionsCuite/ParionsCuite.csproj @@ -2,7 +2,7 @@ net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + maccatalyst-arm64 From f83dc89d959911cc88e9f45d86c935ec6cfd8104 Mon Sep 17 00:00:00 2001 From: Fages Tony Date: Wed, 10 May 2023 15:32:13 +0200 Subject: [PATCH 8/8] Persi --- ParionsCuite/ParionsCuite/Modeles/Manageur.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs index 376c3fe..5c7a621 100644 --- a/ParionsCuite/ParionsCuite/Modeles/Manageur.cs +++ b/ParionsCuite/ParionsCuite/Modeles/Manageur.cs @@ -11,11 +11,11 @@ namespace ParionsCuite.Modeles public class Manageur { public List Evenement { get; private set; } - + public ReadOnlyCollection Event { get; set; } public IPersistanceManager Persistance { get; set; } public Manageur(IPersistanceManager Pers) { - Evenement = new ReadOnlyCollection(Evenement); + Evenement = new ReadOnlyCollection; } public Manageur()