thomas.chazot2
/
CShark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haha

Browse Source
master
Mathilde JEAN 3 years ago
parent 3d0bf0fcf4 ed676b0a2b
commit 9ff79cc803
15 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File

0
Documents/Nouveau Document Microsoft Word.docx
Unescape View File

6
Documents/README.txt
Unescape View File

@ -0,0 +1,6 @@
Créer un nouveau diagramme de classe à partir du modèle existant en ajoutant les classes d'architecture
Modifier les classes existantes en supprimant les méthodes de modifications
Répercuter ça dans le code
Puis:
Faire des tests unitaires

6
Modèle/Expert.cs
Unescape View File

@ -23,12 +23,6 @@ namespace Modèle
DateD = date;
}
public override void changerInfo(string nvEmail, string nvMdp)
{
Email = nvEmail;
MotDePasse = nvMdp;
}
public override string ToString()
{
return Email + " " + MotDePasse + " " + Surnom + " " + DateD;

1
Modèle/Personne.cs
Unescape View File

@ -17,7 +17,6 @@ namespace Modèle
MotDePasse = mdp;
}
public abstract void changerInfo(string nvEmail, string nvMdp);
public abstract override string ToString();
}
}

41
Modèle/Utilisateur.cs
Unescape View File

@ -18,12 +18,6 @@ namespace Modèle
NbSubmit = nbSubmit;
}
public override void changerInfo(string nvEmail, string nvMdp)
{
Email = nvEmail;
MotDePasse = nvMdp;
}
public override string ToString()
{
return Email + " " + MotDePasse + " " + NbSubmit;
@ -37,8 +31,39 @@ namespace Modèle
}
public void FaireUnChangement(Requin req, string desc, string photo, string video, string photoCarte, Conservation cons, List<Zone> rep, string funFact, List<Requin> lBdPasFinie){
req.ModiferRequin(desc, photo, video, photoCarte, cons, rep, funFact);
lBdPasFinie.Add(req);
if (string.IsNullOrWhiteSpace(desc))
{
desc = req.Description;
}
if (string.IsNullOrWhiteSpace(photo))
{
photo = req.Photo;
}
if (string.IsNullOrWhiteSpace(video))
{
video = req.Video;
}
if (string.IsNullOrWhiteSpace(photoCarte))
{
photoCarte = req.PhotoCarte;
}
if (cons == Conservation.NE)
{
cons = req.StatutCons;
}
if (string.IsNullOrWhiteSpace(funFact))
{
funFact = req.FunFact;
}
if (rep.Count() == 0)
{
foreach (Zone z in req.Repartition)
{
rep.Add(z);
}
}
Requin requin = new Requin(req.Nom, req.NomSci, desc, photo, video, photoCarte, cons, rep, funFact);
lBdPasFinie.Add(requin);
NbSubmit++;
}

0
WpfApp1/Images/Heterodontus_francisci_catalina.jpg → WpfApp1/Images/Dormeur-Mexicain.jpg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 136 KiB

12
WpfApp1/MainWindow.xaml
Unescape View File

@ -19,20 +19,12 @@
</ComboBox>
<TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5" x:Name="Rechercher" VerticalContentAlignment="Center" IsKeyboardFocusedChanged="TextBox_IsKeyboardFocusedChanged"/>
<ListBox Background="White">
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin x:Name="uc1"/>
</ListBox>
</DockPanel>
<DockPanel>
<ContentControl x:Name="contentControl">
<local:userControlAcceuil/>
<local:userControlDescription x:Name="uc2"/>
</ContentControl>
</DockPanel>
</DockPanel>

11
WpfApp1/MainWindow.xaml.cs
Unescape View File

@ -24,10 +24,13 @@ namespace WpfApp1
public MainWindow()
{
InitializeComponent();
List<Zone> zones = new List<Zone> { Zone.ATLANTIQUE, Zone.ARCTIQUE };
uc1.requin = new Requin("Bob le bricoleur", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!");
uc2.requin = new Requin("Requin Dormeur Mexdzdqzdicain", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!");
}
Requin requin { get; set; }
// Requin requin { get; set; }
private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
@ -38,7 +41,7 @@ namespace WpfApp1
public void ContentControlSwapDes()
{
contentControl.Content = new userControlDescription(requin);
contentControl.Content = new userControlDescription();
}
@ -49,9 +52,9 @@ namespace WpfApp1
}
public void ContentControlSwapEdit(Requin requin)
public void ContentControlSwapEdit()
{
contentControl.Content = new UserControlEdit(requin);
contentControl.Content = new UserControlEdit();
}
private void TextBox_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)

6
WpfApp1/UserControlEdit.xaml
Unescape View File

@ -25,9 +25,9 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<local:UserControlBoite Grid.Column="0" Grid.Row="0" Message="Nom" x:Name="leNom" Contenu="" IsEnabledChanged="False"/>
<local:UserControlBoite Grid.Column="0" Grid.Row="1" Message="Nom scientifique" x:Name="nomSci" Contenu="" IsEnabledChanged="False"/>
<local:UserControlBoite Grid.Column="0" Grid.Row="2" Message="Description" x:Name="desc" Contenu="" IsEnabledChanged="" IsKeyboardFocusedChanged="desc_IsKeyboardFocusedChanged"/>
<local:UserControlBoite Grid.Column="0" Grid.Row="0" Message="Nom" x:Name="leNom" Contenu="" />
<local:UserControlBoite Grid.Column="0" Grid.Row="1" Message="Nom scientifique" x:Name="nomSci" Contenu="" />
<local:UserControlBoite Grid.Column="0" Grid.Row="2" Message="Description" x:Name="desc" Contenu="" IsKeyboardFocusedChanged="desc_IsKeyboardFocusedChanged"/>
<local:UserControlBoite Grid.Column="0" Grid.Row="3" Message="Lien de la photo" x:Name="LienPhoto" Contenu="" IsKeyboardFocusedChanged="LienPhoto_IsKeyboardFocusedChanged"/>
<local:UserControlBoite Grid.Column="0" Grid.Row="4" Message="Lien de la vidéo" x:Name="LienVid" Contenu="" IsKeyboardFocusedChanged="LienVid_IsKeyboardFocusedChanged"/>
<local:UserControlBoite Grid.Column="1" Grid.Row="0" Message="Lien de la map" x:Name="LienMap" Contenu="" IsKeyboardFocusedChanged="LienMap_IsKeyboardFocusedChanged"/>

5
WpfApp1/UserControlEdit.xaml.cs
Unescape View File

@ -21,13 +21,12 @@ namespace WpfApp1
/// </summary>
public partial class UserControlEdit : UserControl
{
public UserControlEdit(Requin requin)
public UserControlEdit()
{
InitializeComponent();
uptadeUi(requin);
}
public Requin requin { get; set; }
public Requin requin { get; set; } //updateUi(requin)
private void LienPhoto_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
{

2
WpfApp1/UserControlRequin.xaml
Unescape View File

@ -20,7 +20,7 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Image Source="Images/Heterodontus_francisci_catalina.jpg" Width="auto" Height="40" Grid.RowSpan="2" Margin="4" MouseDown="UserControlReq_MouseDown" x:Name="image"/>
<Image Source="Images/Dormeur-Mexicain.jpg" Width="auto" Height="40" Grid.RowSpan="2" Margin="4" MouseDown="UserControlReq_MouseDown" x:Name="image"/>
<TextBlock Grid.Column="1" Grid.Row="0" Text="Requin Dormeur Mexicain" FontFamily="{StaticResource Police2}" MouseDown="UserControlReq_MouseDown" Foreground="{StaticResource Couleur1}" x:Name="nameReq"/>
<TextBlock Grid.Column="1" Grid.Row="1" Text="Heterodontus mexicanus" FontWeight="Thin" MouseDown="UserControlReq_MouseDown" Foreground="{StaticResource Couleur2}" x:Name="sciName"/>
</Grid>

5
WpfApp1/UserControlRequin.xaml.cs
Unescape View File

@ -22,10 +22,9 @@ namespace WpfApp1
/// </summary>
public partial class UserControlRequin : UserControl
{
public UserControlRequin(Requin requin)
public UserControlRequin()
{
InitializeComponent();
uptadeUi(requin);
}
@ -35,7 +34,7 @@ namespace WpfApp1
((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapDes();
}
public Requin requin { get; set; }
public Requin requin { get; set; } //uptadeUi(requin);
public void uptadeUi(Requin requin)

7
WpfApp1/WpfApp1.csproj
Unescape View File

@ -13,11 +13,11 @@
<None Remove="Images\CR.png" />
<None Remove="Images\cross.png" />
<None Remove="Images\DD.png" />
<None Remove="Images\Dormeur-Mexicain.jpg" />
<None Remove="Images\En-danger.png" />
<None Remove="Images\EN.png" />
<None Remove="Images\EW.png" />
<None Remove="Images\EX.png" />
<None Remove="Images\Heterodontus_francisci_catalina.jpg" />
<None Remove="Images\LC.png" />
<None Remove="Images\logo.png" />
<None Remove="Images\Logo_entier.png" />
@ -46,9 +46,6 @@
<Content Include="Images\cross.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\En-danger.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\LC.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -78,7 +75,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Images\Heterodontus_francisci_catalina.jpg">
<Content Include="Images\Dormeur-Mexicain.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

2
WpfApp1/userControlDescription.xaml
Unescape View File

@ -30,7 +30,7 @@
</Grid.RowDefinitions>
<TextBlock Text="Nom requin" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReq"/>
<TextBlock Text="Nom scientifique" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciName"/>
<Image Source="Images\Heterodontus_francisci_catalina.jpg" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photo"/>
<Image Source="Images\Dormeur-Mexicain.jpg" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photo"/>
<ScrollViewer Grid.Row="2" Grid.ColumnSpan="2">
<TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center" x:Name="desc" Text="Le requin dormeur buffle (Heterodontus mexicanus) a été décrit par Leighton. R Taylor Jr. et José Luis Castro-Aguirre en 1972. Il fait partie de la famille des hétérodontidés. Il est connu sous les noms communs Mexican hornshark et buffalo hornshark en anglais1.

7
WpfApp1/userControlDescription.xaml.cs
Unescape View File

@ -21,10 +21,9 @@ namespace WpfApp1
/// </summary>
public partial class userControlDescription : UserControl
{
public userControlDescription(Requin requin)
public userControlDescription()
{
InitializeComponent();
UpdateUI(requin);
}
public Requin Requin { get; set; }
@ -36,11 +35,11 @@ namespace WpfApp1
private void edit_Click(object sender, RoutedEventArgs e)
{
((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapEdit(requin);
((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapEdit();
}
public Requin requin { get; set; }
public Requin requin { get; set; } //UpdateUI(requin);
public void UpdateUI(Requin requin)
{

Write Preview
Loading…
Cancel
Save