euh des trucs

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; }

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,

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<string> 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<string> funFacts)
+        public Requin(string nom, string nomSci, string description, string photo, string video, string photoCarte, Conservation statutCons, Zone repartition, List<string> 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];
         }
+
     }
 
 }

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,

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

WpfApp1/AddAShark.xaml

@@ -8,7 +8,7 @@
         Title="AddAShark" Height="450" Width="800">
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
-            <TextBlock Text="ADD A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="PowderBlue"/>
+            <Button Content="ADD A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="PowderBlue"/>
             <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
         <DockPanel Background="{StaticResource Couleur1}">
@@ -51,7 +51,7 @@
                     <CheckBox Content="Océan Indien" Grid.Column="0" Grid.Row="2"  HorizontalAlignment="Left" Margin="40,0,0,0"/>
                     <CheckBox Content="Océan Pacifique"  Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Margin="0,0,20,0"/>
                 </Grid>
-                
+
                 <local:UserControlBoite Grid.Column="1" Grid.Row="3"/>
                 <Button Style="{StaticResource Button1}" Grid.Column="1" Grid.Row="5" Content="Submit" Margin="15" Width="100"/>
             </Grid>

WpfApp1/userControlDescription.xaml

@@ -9,6 +9,7 @@
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <Grid>
+                <Button Content="EDIT" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0" FontSize="20"/>
                 <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
                 <Button Style="{StaticResource Button1}" x:Name="exit" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Width="50" Height="50" FontSize="25" Click="exit_Click" >
                     <Image Source="Images\cross.png" />

testMap/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace testMap
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}

testMap/testMap.csproj

@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

test_requin/Program.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using Modèle;
+
+namespace test_requin
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Test de la classe Requin!");
+            List<string> RandomFunFacts = new List<string> { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" };
+            Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, Zone.ATLANTIQUE, "askip un requin c'est rigolo");  ;
+            Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, Zone.ARCTIQUE, RandomFunFacts);
+            Console.WriteLine(requin2.FunFact);
+         }
+    }
+}

test_requin/test_requin.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Modèle\Modèle.csproj" />
+  </ItemGroup>
+
+</Project>