master
thchazot1 3 years ago
commit a5d8fc021f

File diff suppressed because it is too large Load Diff

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Modèle
{
class UserControlRequin
{
}
}

@ -15,13 +15,19 @@ namespace Persistance
{ {
// Serializers pour requins et utlisateurs/experts // Serializers pour requins et utlisateurs/experts
public DataContractSerializer SerializerReq { get; set; } DataContractSerializer SerializerReq { get; set; }
= new DataContractSerializer(typeof(DataToPersistReq)); = new DataContractSerializer(typeof(DataToPersistReq));
public DataContractSerializer SerializerUsers { get; set; } DataContractSerializer SerializerUsers { get; set; }
= new DataContractSerializer(typeof(DataToPersistUsers)); = new DataContractSerializer(typeof(DataToPersistUsers));
// DataToPersistReq et DataToPersistUsers
DataToPersistReq dataReq = new DataToPersistReq();
DataToPersistUsers data = new DataToPersistUsers();
// Chemin des fichiers // Chemin des fichiers
string FilePath { get; set; } = Path.Combine(Directory.GetCurrentDirectory(), "..//..//..//Persistance"); string FilePath { get; set; } = Path.Combine(Directory.GetCurrentDirectory(), "..//..//..//Persistance");
@ -55,8 +61,6 @@ namespace Persistance
throw new FileNotFoundException("The persistance file does not exist"); throw new FileNotFoundException("The persistance file does not exist");
} }
DataToPersistUsers data;
using (Stream stream = File.OpenRead(FileUsers)) using (Stream stream = File.OpenRead(FileUsers))
{ {
data = SerializerUsers.ReadObject(stream) as DataToPersistUsers; data = SerializerUsers.ReadObject(stream) as DataToPersistUsers;
@ -74,7 +78,6 @@ namespace Persistance
Directory.CreateDirectory(FileUsers); Directory.CreateDirectory(FileUsers);
} }
DataToPersistUsers data = new DataToPersistUsers();
data.Users.AddRange(users); data.Users.AddRange(users);
data.Experts.AddRange(experts); data.Experts.AddRange(experts);
@ -97,14 +100,12 @@ namespace Persistance
throw new FileNotFoundException("The persistance file does not exist"); throw new FileNotFoundException("The persistance file does not exist");
} }
DataToPersistReq data;
using (Stream stream = File.OpenRead(FileReq)) using (Stream stream = File.OpenRead(FileReq))
{ {
data = SerializerReq.ReadObject(stream) as DataToPersistReq; dataReq = SerializerReq.ReadObject(stream) as DataToPersistReq;
} }
return (data.Requins, data.RequinsAdd, data.RequinsEdit); return (dataReq.Requins, dataReq.RequinsAdd, dataReq.RequinsEdit);
} }
@ -116,16 +117,15 @@ namespace Persistance
Directory.CreateDirectory(FilePath); Directory.CreateDirectory(FilePath);
} }
DataToPersistReq data = new DataToPersistReq(); dataReq.Requins.AddRange(reqs);
data.Requins.AddRange(reqs); dataReq.RequinsAdd.AddRange(reqsAdd);
data.RequinsAdd.AddRange(reqsAdd); dataReq.RequinsEdit.AddRange(reqsEdit);
data.RequinsEdit.AddRange(reqsEdit);
using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileReq))) using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileReq)))
{ {
using (XmlWriter writer = XmlWriter.Create(tw, settings)) using (XmlWriter writer = XmlWriter.Create(tw, settings))
{ {
SerializerReq.WriteObject(writer, data); SerializerReq.WriteObject(writer, dataReq);
} }
} }
} }

@ -9,27 +9,7 @@ using System.Threading.Tasks;
namespace Persistance namespace Persistance
{ {
public interface IPersistanceManager public interface IPersistanceManager
{ {
/*
List<Requin> LoadRequins();
void SaveRequins(List<Requin> reqs);
List<Requin> LoadRequinsEdit();
void SaveRequinsEdit(List<Requin> reqs);
List<Requin> LoadRequinsAdd();
void SaveRequinsAdd(List<Requin> reqs);
List<Utilisateur> LoadUsers();
List<Expert> LoadExperts();
void SaveUsers(List<Utilisateur> users);
void SaveExperts(List<Expert> experts);
(List<Requin> reqs, List<Requin> reqsAdd, List<Requin> reqsEdit, List<Utilisateur> users, List<Expert> experts) Load();
void Save(List<Requin> reqs, List<Requin> reqsAdd, List<Requin> reqsEdit, List<Utilisateur> users, List<Expert> experts);
*/
(List<Requin> reqs, List<Requin> reqsAdd, List<Requin> reqsEdit) LoadRequins(); (List<Requin> reqs, List<Requin> reqsAdd, List<Requin> reqsEdit) LoadRequins();
void SaveRequins(List<Requin> reqs, List<Requin> reqsAdd, List<Requin> reqsEdit); void SaveRequins(List<Requin> reqs, List<Requin> reqsAdd, List<Requin> reqsEdit);

@ -20,21 +20,15 @@ namespace WpfApp1
public Manager LeManager { get; private set; } = new Manager(strat); public Manager LeManager { get; private set; } = new Manager(strat);
public ManagerUsers LeManagerUsers { get; private set; } = new ManagerUsers(strat); public ManagerUsers LeManagerUsers { get; private set; } = new ManagerUsers(strat);
public void Temp()
{
var mw = MainWindow as MainWindow;
}
private void Application_Activated(object sender, EventArgs e) private void Application_Activated(object sender, EventArgs e)
{ {
LeManager.LoadRequins(); LeManager.LoadRequins();
LeManagerUsers.LoadUsers(); LeManagerUsers.LoadUsers();
} }
private void Application_Deactivated(object sender, EventArgs e) private void Application_Deactivated(object sender, EventArgs e)
{ {
LeManager.SaveRequins(); LeManager.SaveRequins();
LeManagerUsers.SaveUsers(); LeManagerUsers.SaveUsers();
} }

@ -53,6 +53,58 @@
<d2p1:StatutCons>EW</d2p1:StatutCons> <d2p1:StatutCons>EW</d2p1:StatutCons>
<d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video> <d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
</d2p1:Requin> </d2p1:Requin>
<d2p1:Requin>
<d2p1:Description>wow il est trop bo</d2p1:Description>
<d2p1:FunFact>(C'est pas un vrai requin)</d2p1:FunFact>
<d2p1:Nom>mon requin adoré</d2p1:Nom>
<d2p1:NomSci>trop cool ce requin</d2p1:NomSci>
<d2p1:Photo>Images/Dormeur-Mexicain.png</d2p1:Photo>
<d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
<d2p1:Repartition>
<d2p1:Zone>ATLANTIQUE</d2p1:Zone>
</d2p1:Repartition>
<d2p1:StatutCons>EW</d2p1:StatutCons>
<d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
</d2p1:Requin>
<d2p1:Requin>
<d2p1:Description>C'est un requin pas ultra banal</d2p1:Description>
<d2p1:FunFact>Il est vraiment pas banal</d2p1:FunFact>
<d2p1:Nom>Req1</d2p1:Nom>
<d2p1:NomSci>Le requin pas banal</d2p1:NomSci>
<d2p1:Photo>Images/White_shark.png</d2p1:Photo>
<d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
<d2p1:Repartition>
<d2p1:Zone>PACIFIQUE</d2p1:Zone>
</d2p1:Repartition>
<d2p1:StatutCons>EX</d2p1:StatutCons>
<d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
</d2p1:Requin>
<d2p1:Requin>
<d2p1:Description>C'est un requin pas ultra banal</d2p1:Description>
<d2p1:FunFact>Il est vraiment pas banal</d2p1:FunFact>
<d2p1:Nom>leRequinAjouté</d2p1:Nom>
<d2p1:NomSci>Le requin pas banal</d2p1:NomSci>
<d2p1:Photo>Images/White_shark.png</d2p1:Photo>
<d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
<d2p1:Repartition>
<d2p1:Zone>PACIFIQUE</d2p1:Zone>
</d2p1:Repartition>
<d2p1:StatutCons>EX</d2p1:StatutCons>
<d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
</d2p1:Requin>
<d2p1:Requin>
<d2p1:Description>C'est un requin ultra banal</d2p1:Description>
<d2p1:FunFact>En fait il est giga banal</d2p1:FunFact>
<d2p1:Nom>Banane</d2p1:Nom>
<d2p1:NomSci>Le requin banal</d2p1:NomSci>
<d2p1:Photo>Images/White_shark.png</d2p1:Photo>
<d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
<d2p1:Repartition>
<d2p1:Zone>ATLANTIQUE</d2p1:Zone>
</d2p1:Repartition>
<d2p1:StatutCons>EW</d2p1:StatutCons>
<d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
</d2p1:Requin>
</Requins> </Requins>
<RequinsAdd xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le" /> <RequinsAdd xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le" />
<RequinsEdit xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le"> <RequinsEdit xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le">

@ -7,6 +7,12 @@
<d2p1:DateD>2022-06-09T14:59:29.3884138+02:00</d2p1:DateD> <d2p1:DateD>2022-06-09T14:59:29.3884138+02:00</d2p1:DateD>
<d2p1:Surnom>bob</d2p1:Surnom> <d2p1:Surnom>bob</d2p1:Surnom>
</d2p1:Expert> </d2p1:Expert>
<d2p1:Expert>
<d2p1:Email>salut</d2p1:Email>
<d2p1:MotDePasse>hey</d2p1:MotDePasse>
<d2p1:DateD>2022-06-09T14:59:29.3884138+02:00</d2p1:DateD>
<d2p1:Surnom>bob</d2p1:Surnom>
</d2p1:Expert>
</Experts> </Experts>
<Users xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le"> <Users xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le">
<d2p1:Utilisateur> <d2p1:Utilisateur>
@ -14,5 +20,10 @@
<d2p1:MotDePasse>salut</d2p1:MotDePasse> <d2p1:MotDePasse>salut</d2p1:MotDePasse>
<d2p1:NbSubmit>3</d2p1:NbSubmit> <d2p1:NbSubmit>3</d2p1:NbSubmit>
</d2p1:Utilisateur> </d2p1:Utilisateur>
<d2p1:Utilisateur>
<d2p1:Email>a</d2p1:Email>
<d2p1:MotDePasse>salut</d2p1:MotDePasse>
<d2p1:NbSubmit>0</d2p1:NbSubmit>
</d2p1:Utilisateur>
</Users> </Users>
</DataToPersistUsers> </DataToPersistUsers>
Loading…
Cancel
Save