diff --git a/Modèle/Carte.cs b/Modèle/Carte.cs index 197f7b4..5ad4959 100644 --- a/Modèle/Carte.cs +++ b/Modèle/Carte.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace WpfApp1 +namespace Modèle { - class Carte + public class Carte { public string Nom { get; private set; } public string Url { get; private set; } diff --git a/Modèle/Conservation.cs b/Modèle/Conservation.cs index 2ec65a1..4a63995 100644 --- a/Modèle/Conservation.cs +++ b/Modèle/Conservation.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace WpfApp1 +namespace Modèle { - enum Conservation + public enum Conservation { EX, EW, diff --git a/Modèle/Requin.cs b/Modèle/Requin.cs index fa43b01..903d1da 100644 --- a/Modèle/Requin.cs +++ b/Modèle/Requin.cs @@ -4,22 +4,31 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace WpfApp1 +namespace Modèle { - class Requin + public class Requin { + private string v1; + private string v2; + private string v3; + private string v4; + private string v5; + private Conservation cR; + private Zone aRCTIQUE; + private List randomFunFacts; + public string Nom { get; private set; } public string NomSci { get; private set; } public string Description { get; private set; } public string Photo { get; private set; } public string Video { get; private set; } - public Carte PhotoCarte { get; private set; } + public string PhotoCarte { get; private set; } public Conservation StatutCons { get; private set; } public string FunFact { get; private set; } public Zone Repartition { get; private set; } - public Requin(string nom, string nomSci, string description, string photo, string video, Carte photoCarte, Conservation statutCons, Zone repartition, string funFact) { + public Requin(string nom, string nomSci, string description, string photo, string video, string photoCarte, Conservation statutCons, Zone repartition, string funFact) { Nom = nom; NomSci = nomSci; Description = description; @@ -31,9 +40,10 @@ namespace WpfApp1 FunFact = funFact; } - public Requin(string nom, string nomSci, string description, string photo, string video, Carte photoCarte, Conservation statutCons, Zone repartition, List funFacts) + public Requin(string nom, string nomSci, string description, string photo, string video, string photoCarte, Conservation statutCons, Zone repartition, List funFacts) { Random rnd = new Random(); + int num = rnd.Next(funFacts.Count()); Nom = nom; NomSci = nomSci; Description = description; @@ -42,8 +52,9 @@ namespace WpfApp1 PhotoCarte = photoCarte; StatutCons = statutCons; Repartition = repartition; - + FunFact = funFacts[num]; } + } } diff --git a/Modèle/Zone.cs b/Modèle/Zone.cs index ea9f64c..a4ad8b2 100644 --- a/Modèle/Zone.cs +++ b/Modèle/Zone.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace WpfApp1 +namespace Modèle { - enum Zone + public enum Zone { ATLANTIQUE, ARCTIQUE, diff --git a/WpfApp1.sln b/WpfApp1.sln index 8163fcb..ed13dc6 100644 --- a/WpfApp1.sln +++ b/WpfApp1.sln @@ -14,7 +14,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ressources", "Ressources\Re EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testImage", "testImage\testImage.csproj", "{C85454C4-850B-4305-AFB6-789DDA8CD88A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modèle", "Modèle\Modèle.csproj", "{006E8327-215C-46B4-8816-24B996B82798}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modèle", "Modèle\Modèle.csproj", "{006E8327-215C-46B4-8816-24B996B82798}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{18E1E85C-1B90-47C9-BB80-53FAE0A79466}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test_requin", "test_requin\test_requin.csproj", "{D82F546C-3455-4857-A705-BDD3F61973CD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -38,10 +42,17 @@ Global {006E8327-215C-46B4-8816-24B996B82798}.Debug|Any CPU.Build.0 = Debug|Any CPU {006E8327-215C-46B4-8816-24B996B82798}.Release|Any CPU.ActiveCfg = Release|Any CPU {006E8327-215C-46B4-8816-24B996B82798}.Release|Any CPU.Build.0 = Release|Any CPU + {D82F546C-3455-4857-A705-BDD3F61973CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D82F546C-3455-4857-A705-BDD3F61973CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D82F546C-3455-4857-A705-BDD3F61973CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D82F546C-3455-4857-A705-BDD3F61973CD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {D82F546C-3455-4857-A705-BDD3F61973CD} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {169891F4-0C16-4020-9581-5AC90ADE6FD5} EndGlobalSection diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml index 524ca95..01392c1 100644 --- a/WpfApp1/AddAShark.xaml +++ b/WpfApp1/AddAShark.xaml @@ -8,7 +8,7 @@ Title="AddAShark" Height="450" Width="800"> - + @@ -51,7 +51,7 @@ - +