diff --git a/notus/Biblioteque_de_Class/IManager.cs b/notus/Biblioteque_de_Class/IManager.cs index 74f98cc..8b3b056 100644 --- a/notus/Biblioteque_de_Class/IManager.cs +++ b/notus/Biblioteque_de_Class/IManager.cs @@ -14,6 +14,8 @@ namespace Biblioteque_de_Class public void SaveUserData(User user); - public User LoadUserData(); + public List LoadUserData(); + + //public List LoadNote(); } } diff --git a/notus/Biblioteque_de_Class/PersistenceManager.cs b/notus/Biblioteque_de_Class/PersistenceManager.cs index dbe388f..5adffaf 100644 --- a/notus/Biblioteque_de_Class/PersistenceManager.cs +++ b/notus/Biblioteque_de_Class/PersistenceManager.cs @@ -26,7 +26,7 @@ namespace Biblioteque_de_Class persistence.SaveUserData(user); } - public User LoadUserData() + public List LoadUserData() { return persistence.LoadUserData(); } diff --git a/notus/Notus_Console/Program.cs b/notus/Notus_Console/Program.cs index 706b9ad..1f099dc 100644 --- a/notus/Notus_Console/Program.cs +++ b/notus/Notus_Console/Program.cs @@ -2,6 +2,8 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Diagnostics; using System.Linq.Expressions; +using System.Runtime.InteropServices; +using Notus_Persistance; string Upseudo = "u"; string Umail = "u"; @@ -21,12 +23,7 @@ string choix; string color = "u"; string color2; string color3; -List NewColorList = new List { }; -List listCouleurs = new List { }; -List _searchedNotes; -List NoteListe; -List _searchedTags; -List UserListe; + User user = new User(Upseudo, Umail, Upassword); NoteImage image = new NoteImage(nomImage, linkimage, position); @@ -35,6 +32,20 @@ User u = new User(Upseudo, Umail, Upassword); Note n = new Note(nomNote, logoPath, u); Tags t = new Tags(NomTag, color); +List NewColorList = new List { }; +List listCouleurs = new List { }; +List _searchedNotes; +List NoteListe; +List _searchedTags; +List UserListe; // = IManager.LoadUserData(); /// Essai de load via Imanager + + + +foreach (User us in UserListe) /// Test du stub +{ + Console.WriteLine("Coucou"); +} +return; int boucle = 0; while (boucle == 0) { diff --git a/notus/Notus_Persistence/Stub.cs b/notus/Notus_Persistence/Stub.cs index d7c6135..02562d6 100644 --- a/notus/Notus_Persistence/Stub.cs +++ b/notus/Notus_Persistence/Stub.cs @@ -10,25 +10,46 @@ namespace Notus_Persistance { internal class Stub : IManager { - public void SaveDatabaseData(Database database) + void IManager.SaveDatabaseData(Database database) { throw new NotImplementedException(); } - public Database LoadDatabaseData() + Database IManager.LoadDatabaseData() { - throw new NotImplementedException(); + Database database = new Database(); + database.AddUser(new User("Nicolas", "leHeros@gmail.com", "Feur")); + database.AddUser(new User("Benjamin", "labsent@gmail.com", "Moto2005")); + database.AddUser(new User("Liam", "liammonchanin@gmail.com", "Baguette")); + database.AddUser(new User("Brigitte", "Macroutte@gmail.com", "49Trois")); + return database; } - public void SaveUserData(User user) + void IManager.SaveUserData(User user) { throw new NotImplementedException(); } - public User LoadUserData() + List IManager.LoadUserData() { - throw new NotImplementedException(); + List users = new List(); + users.Add(new User("Nicolas", "leHeros@gmail.com", "Feur")); + users.Add(new User("Benjamin", "labsent@gmail.com", "Moto2005")); + users.Add(new User("Liam", "liammonchanin@gmail.com", "Baguette")); + users.Add(new User("Brigitte", "Macroutte@gmail.com", "49Trois")); + return users; } + + /*List IManager.LoadNote() + { + List notes = new List(); + notes.Add(new Note("Note_1", "Logo_1",new User("Liam","Liam@gmail.com","Oui"))); + notes.Add(new Note("Note_2", "Logo_3", new User("Liam", "Liam@gmail.com", "Oui"))); + notes.Add(new Note("Note_3", "Logo_5", new User("Liam", "Liam@gmail.com", "Oui"))); + notes.Add(new Note("Note_4", "Logo_7", new User("Liam", "Liam@gmail.com", "Oui"))); + notes.Add(new Note("Note_5", "Logo_9", new User("Liam", "Liam@gmail.com", "Oui"))); + return notes; + }*/ } } diff --git a/notus/Notus_Persistence/ToJSON.cs b/notus/Notus_Persistence/ToJSON.cs index 23987ef..6233590 100644 --- a/notus/Notus_Persistence/ToJSON.cs +++ b/notus/Notus_Persistence/ToJSON.cs @@ -71,8 +71,9 @@ namespace Notus_Persistance } } - public User LoadUserData() + public List LoadUserData() { + List users = new List(); if (File.Exists(UserDataFilePath)) { User user1; @@ -85,7 +86,9 @@ namespace Notus_Persistance } else { - return user1 = user; + user1 = user; + users.Add(user1); + return users; } } } diff --git a/notus/Notus_Persistence/ToXML.cs b/notus/Notus_Persistence/ToXML.cs index 47332f0..4303a01 100644 --- a/notus/Notus_Persistence/ToXML.cs +++ b/notus/Notus_Persistence/ToXML.cs @@ -30,7 +30,7 @@ namespace Notus_Persistance throw new NotImplementedException(); } - public User LoadUserData() + public List LoadUserData() { throw new NotImplementedException(); } diff --git a/notus/notus_vue/App.xaml.cs b/notus/notus_vue/App.xaml.cs index 8f83c29..cb06065 100644 --- a/notus/notus_vue/App.xaml.cs +++ b/notus/notus_vue/App.xaml.cs @@ -1,4 +1,5 @@ -namespace notus; + +namespace notus; public partial class App : Application { @@ -8,4 +9,6 @@ public partial class App : Application MainPage = new AppShell(); } + + } diff --git a/notus/notus_vue/RecherPage.xaml b/notus/notus_vue/RecherPage.xaml index e03639d..89a4635 100644 --- a/notus/notus_vue/RecherPage.xaml +++ b/notus/notus_vue/RecherPage.xaml @@ -100,19 +100,20 @@ PlaceholderColor="#74fabd" /> - - - - \ No newline at end of file