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

Changement dans les managers des list en observableCollection

Browse Source
master
thchazot1 3 years ago
parent 3c5f55c810
commit 80915eda5a
14 changed files with 185 additions and 200 deletions
Show Stats Download Patch File Download Diff File

106
Business/Manager.cs
Unescape View File

@ -11,8 +11,10 @@ namespace Business
{
public class Manager
{
public ReadOnlyCollection<Requin> Requins { get; private set; }
private List<Requin> requins = new List<Requin>();
public ObservableCollection<Requin> Requins { get; private set; }
public ObservableCollection<Requin> RequinsEdit { get; private set; }
public ObservableCollection<Requin> RequinsAdd { get; private set; }
public Requin SelectedRequin { get; set; }
/// <summary>
@ -27,44 +29,63 @@ namespace Business
public Manager(IPersistanceManager pers)
{
Requins = new ReadOnlyCollection<Requin>(requins);
Requins = new ObservableCollection<Requin>();
RequinsEdit = new ObservableCollection<Requin>();
RequinsAdd = new ObservableCollection<Requin>();
Pers = pers;
}
public void LoadRequins()
{
requins.Clear();
requins.AddRange(Pers.LoadRequins());
Requins.Clear();
foreach (Requin req in Pers.LoadRequins())
{
Requins.Add(req);
}
RequinsEdit.Clear();
foreach (Requin req in Pers.LoadRequinsEdit())
{
RequinsEdit.Add(req);
}
RequinsAdd.Clear();
foreach (Requin req in Pers.LoadRequinsAdd())
{
RequinsAdd.Add(req);
}
SelectedRequin = null;
}
public void SaveRequins()
{
Pers.SaveRequins(requins);
Pers.SaveRequins(Requins);
Pers.SaveRequinsEdit(RequinsEdit);
Pers.SaveRequinsAdd(RequinsAdd);
}
public bool AjouterRequin(Requin req)
{
if (requins.Contains(req)){
Requin test = Requins.SingleOrDefault(r => r.Equals(req));
if (Requins.Contains(req) && test!=null){
return false;
}
requins.Add(req);
Requins.Add(req);
return true;
}
public bool SupprimerRequin(Requin req)
{
if (!requins.Contains(req))
Requin test = Requins.SingleOrDefault(r => r.Equals(req));
if (!Requins.Contains(req) || test == null)
{
return false;
}
requins.Remove(req);
Requins.Remove(req);
return true;
}
public Requin GetRequin(Requin req)
{
return requins.SingleOrDefault(r => r.Equals(req));
return Requins.SingleOrDefault(r => r.Equals(req));
}
public bool ModifieRequin(Requin oldR, Requin newR)
@ -73,12 +94,69 @@ namespace Business
{
return false;
}
requins.Remove(oldR);
requins.Add(newR);
Requins.Remove(oldR);
Requins.Add(newR);
return true;
}
public bool AjouterRequinEdit(Requin req)
{
Requin test = RequinsEdit.SingleOrDefault(r => r.Equals(req));
if (RequinsEdit.Contains(req) && test != null)
{
return false;
}
RequinsEdit.Add(req);
return true;
}
public bool SupprimerRequinEdit(Requin req)
{
Requin test = RequinsEdit.SingleOrDefault(r => r.Equals(req));
if (!RequinsEdit.Contains(req) || test == null)
{
return false;
}
RequinsEdit.Remove(req);
return true;
}
public List<Requin> rechercherRequins(ReadOnlyCollection<Requin> lRech, Nullable<Zone> zone, string motif)
public bool AjouterRequinAdd(Requin req)
{
Requin test = RequinsAdd.SingleOrDefault(r => r.Equals(req));
if (RequinsAdd.Contains(req) && test != null)
{
return false;
}
RequinsAdd.Add(req);
return true;
}
public bool SupprimerRequinAdd(Requin req)
{
Requin test = RequinsAdd.SingleOrDefault(r => r.Equals(req));
if (!RequinsAdd.Contains(req) || test == null)
{
return false;
}
RequinsAdd.Remove(req);
return true;
}
public Requin GetRequinEdit(Requin req)
{
return RequinsEdit.SingleOrDefault(r => r.Equals(req));
}
public Requin GetRequinAdd(Requin req)
{
return RequinsAdd.SingleOrDefault(r => r.Equals(req));
}
public List<Requin> rechercherRequins(ObservableCollection<Requin> lRech, Nullable<Zone> zone, string motif)
{
List<Requin> nvReq = new List<Requin>();
int test = 0;

103
Business/ManagerAddEdit.cs
Unescape View File

@ -1,103 +0,0 @@
using Modèle;
using Persistance;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Business
{
public class ManagerAddEdit
{
public ReadOnlyCollection<Requin> RequinsEdit { get; private set; }
public ReadOnlyCollection<Requin> RequinsAdd { get; private set; }
private List<Requin> requinsAdd = new List<Requin>();
private List<Requin> requinsEdit = new List<Requin>();
public Requin SelectedRequin { get; set; }
public IPersistanceManager Pers { get; private set; }
public ManagerAddEdit(IPersistanceManager pers)
{
RequinsEdit = new ReadOnlyCollection<Requin>(requinsEdit);
RequinsAdd = new ReadOnlyCollection<Requin>(requinsAdd);
Pers = pers;
}
public void LoadRequins()
{
requinsEdit.Clear();
requinsEdit.AddRange(Pers.LoadRequinsEdit());
requinsAdd.Clear();
requinsAdd.AddRange(Pers.LoadRequinsAdd());
SelectedRequin = null;
}
public void SaveRequins()
{
Pers.SaveRequinsEdit(requinsEdit);
Pers.SaveRequinsAdd(requinsAdd);
}
public bool AjouterRequinEdit(Requin req)
{
if (requinsEdit.Contains(req))
{
return false;
}
requinsEdit.Add(req);
return true;
}
public bool SupprimerRequinEdit(Requin req)
{
if (!requinsEdit.Contains(req))
{
return false;
}
requinsEdit.Remove(req);
return true;
}
public bool AjouterRequinAdd(Requin req)
{
if (requinsAdd.Contains(req))
{
return false;
}
requinsAdd.Add(req);
return true;
}
public bool SupprimerRequinAdd(Requin req)
{
if (!requinsAdd.Contains(req))
{
return false;
}
requinsAdd.Remove(req);
return true;
}
public Requin GetRequinEdit(Requin req)
{
return requinsEdit.SingleOrDefault(r => r.Equals(req));
}
public Requin GetRequinAdd(Requin req)
{
return requinsAdd.SingleOrDefault(r => r.Equals(req));
}
}
}

25
Business/ManagerUsers.cs
Unescape View File

@ -11,8 +11,7 @@ namespace Business
{
public class ManagerUsers
{
public ReadOnlyCollection<Personne> Utilisateurs { get; private set; }
private List<Personne> utilisateurs = new List<Personne>();
public List<Personne> Utilisateurs { get; private set; }
public Personne SelectedUser { get; set; }
/// <summary>
@ -27,45 +26,45 @@ namespace Business
public ManagerUsers(IPersistanceManager pers)
{
Utilisateurs = new ReadOnlyCollection<Personne>(utilisateurs);
Utilisateurs = new List<Personne>();
Pers = pers;
}
public void LoadUsers()
{
utilisateurs.Clear();
utilisateurs.AddRange(Pers.LoadUsers());
Utilisateurs.Clear();
Utilisateurs.AddRange(Pers.LoadUsers());
SelectedUser = null;
}
public void SaveUsers()
{
Pers.SaveUsers(utilisateurs);
Pers.SaveUsers(Utilisateurs);
}
public bool AjouterUtilisateur(Personne user)
{
if (utilisateurs.Contains(user))
if (Utilisateurs.Contains(user))
{
return false;
}
utilisateurs.Add(user);
Utilisateurs.Add(user);
return true;
}
public bool SupprimerUtilisateur(Personne user)
{
if (!utilisateurs.Contains(user))
if (!Utilisateurs.Contains(user))
{
return false;
}
utilisateurs.Remove(user);
Utilisateurs.Remove(user);
return true;
}
public Personne GetUtilisateur(Personne user)
{
return utilisateurs.SingleOrDefault(r => r.Equals(user));
return Utilisateurs.SingleOrDefault(r => r.Equals(user));
}
public bool ModifieUtilisateur(Personne oldU, Personne newU)
@ -74,8 +73,8 @@ namespace Business
{
return false;
}
utilisateurs.Remove(oldU);
utilisateurs.Add(newU);
Utilisateurs.Remove(oldU);
Utilisateurs.Add(newU);
return true;
}

7
Persistance/DataContractPersistance.cs
Unescape View File

@ -1,6 +1,7 @@
using Modèle;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
@ -46,9 +47,9 @@ namespace Persistance
// Listes des requins et utilisateurs
List<Requin> requins = new List<Requin>();
List<Requin> requinsAdd = new List<Requin>();
List<Requin> requinEdit = new List<Requin>();
ObservableCollection<Requin> requins = new ObservableCollection<Requin>();
ObservableCollection<Requin> requinsAdd = new ObservableCollection<Requin>();
ObservableCollection<Requin> requinEdit = new ObservableCollection<Requin>();
List<Personne> users = new List<Personne>();

13
Persistance/IPersistanceManager.cs
Unescape View File

@ -1,6 +1,7 @@
using Modèle;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,14 +10,14 @@ namespace Persistance
{
public interface IPersistanceManager
{
List<Requin> LoadRequins();
void SaveRequins(List<Requin> reqs);
ObservableCollection<Requin> LoadRequins();
void SaveRequins(ObservableCollection<Requin> reqs);
List<Requin> LoadRequinsEdit();
void SaveRequinsEdit(List<Requin> reqs);
ObservableCollection<Requin> LoadRequinsEdit();
void SaveRequinsEdit(ObservableCollection<Requin> reqs);
List<Requin> LoadRequinsAdd();
void SaveRequinsAdd(List<Requin> reqs);
ObservableCollection<Requin> LoadRequinsAdd();
void SaveRequinsAdd(ObservableCollection<Requin> reqs);
List<Personne> LoadUsers();

25
StubLib/Stub.cs
Unescape View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Modèle;
using Persistance;
@ -8,9 +9,9 @@ namespace StubLib
public class Stub : IPersistanceManager
{
private List<Requin> requins = new List<Requin>();
private List<Requin> requinsEdit = new List<Requin>();
private List<Requin> requinsAdd = new List<Requin>();
private ObservableCollection<Requin> requins = new ObservableCollection<Requin>();
private ObservableCollection<Requin> requinsEdit = new ObservableCollection<Requin>();
private ObservableCollection<Requin> requinsAdd = new ObservableCollection<Requin>();
private List<Personne> utilisateurs = new List<Personne>();
@ -31,32 +32,32 @@ namespace StubLib
}
public List<Requin> LoadRequins()
public ObservableCollection<Requin> LoadRequins()
{
return new List<Requin>(requins);
return new ObservableCollection<Requin>(requins);
}
public void SaveRequins(List<Requin> reqs)
public void SaveRequins(ObservableCollection<Requin> reqs)
{
requins = reqs;
}
public List<Requin> LoadRequinsAdd()
public ObservableCollection<Requin> LoadRequinsAdd()
{
return new List<Requin>(requinsAdd);
return new ObservableCollection<Requin>(requinsAdd);
}
public void SaveRequinsAdd(List<Requin> reqs)
public void SaveRequinsAdd(ObservableCollection<Requin> reqs)
{
requins = reqs;
}
public List<Requin> LoadRequinsEdit()
public ObservableCollection<Requin> LoadRequinsEdit()
{
return new List<Requin>(requinsEdit);
return new ObservableCollection<Requin>(requinsEdit);
}
public void SaveRequinsEdit(List<Requin> reqs)
public void SaveRequinsEdit(ObservableCollection<Requin> reqs)
{
requinsEdit = reqs;
}

9
WpfApp1/AddAShark.xaml.cs
Unescape View File

@ -24,15 +24,14 @@ namespace WpfApp1
public AddAShark()
{
InitializeComponent();
Manager.LoadRequins();
Mgr.LoadRequins();
DataContext = Manager;
DataContext = Mgr;
}
public Manager Manager => (Application.Current as App).LeManager;
public Manager Mgr => (Application.Current as App).LeManager;
public ManagerAddEdit ManagerAddEdit => (Application.Current as App).LeManagerAddEdit;
@ -129,7 +128,7 @@ namespace WpfApp1
else
{
Requin requin = new Requin(nom, sciNam, descri, photo, video, map, cons, lesZones, fun);
ManagerAddEdit.AjouterRequinAdd(requin);
Mgr.AjouterRequinAdd(requin);
Close();
}
}

2
WpfApp1/App.xaml.cs
Unescape View File

@ -16,10 +16,10 @@ namespace WpfApp1
public partial class App : Application
{
public IPersistanceManager strat = new DataContractPersistance();
public Manager LeManager { get; private set; } = new Manager(new StubLib.Stub());
public ManagerUsers LeManagerUser { get; private set; } = new ManagerUsers(new StubLib.Stub());
public ManagerAddEdit LeManagerAddEdit { get; private set; } = new ManagerAddEdit(new StubLib.Stub());
public void Temp()
{
var mw = MainWindow as MainWindow;

5
WpfApp1/DescriptionAdd.xaml.cs
Unescape View File

@ -29,7 +29,6 @@ namespace WpfApp1
public Manager Mgr => (Application.Current as App).LeManager;
public ManagerAddEdit MgrAddEdit => (Application.Current as App).LeManagerAddEdit;
@ -67,12 +66,12 @@ namespace WpfApp1
private void valider_Click(object sender, RoutedEventArgs e)
{
Mgr.AjouterRequin(requin);
MgrAddEdit.SupprimerRequinAdd(requin);
Mgr.SupprimerRequinAdd(requin);
}
private void refuser_Click(object sender, RoutedEventArgs e)
{
MgrAddEdit.SupprimerRequinAdd(requin);
Mgr.SupprimerRequinAdd(requin);
}
}

42
WpfApp1/DescriptionEdit.xaml
Unescape View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfApp1"
mc:Ignorable="d"
Title="DescriptionEdit" Height="450" Width="1350">
Title="DescriptionEdit" Height="550" Width="1600">
<DockPanel>
<Grid DockPanel.Dock="Top">
<Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
@ -13,7 +13,7 @@
<Image Source="Images\cross.png" />
</Button>
</Grid>
<DockPanel DockPanel.Dock="Left">
<DockPanel DockPanel.Dock="Right">
<DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
<Grid>
<Grid.ColumnDefinitions>
@ -26,24 +26,24 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding SelectedRequin.Nom}" 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="{Binding SelectedRequin.NomSci}" 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="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photo"/>
<TextBlock Text="{Binding SelectedRequin.Nom}" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReqOld"/>
<TextBlock Text="{Binding SelectedRequin.NomSci}" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciNameOld"/>
<Image Source="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photoOld"/>
<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="{Binding SelectedRequin.Description}"></TextBlock>
<TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center" x:Name="descOld" Text="{Binding SelectedRequin.Description}"></TextBlock>
</ScrollViewer>
<MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3" x:Name="vid"/>
<MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3" x:Name="vidOld"/>
</Grid>
</DockPanel>
<DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
<Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center" x:Name="cartePic"></Image>
<Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60" x:Name="consPic" ></Image>
<Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center" x:Name="cartePicOld"></Image>
<Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60" x:Name="consPicOld" ></Image>
<TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
<TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175" x:Name="funFact"></TextBlock>
<Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Garder" Margin="0,20,0,0" Click="garder_Click" x:Name="garder"/>
<TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175" x:Name="funFactOld"></TextBlock>
<Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Remplacer" Margin="0,20,0,0" Click="remplacer_Click" x:Name="remplacer"/>
</DockPanel>
</DockPanel>
<DockPanel DockPanel.Dock="Right">
<DockPanel DockPanel.Dock="Left">
<DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
<Grid>
<Grid.ColumnDefinitions>
@ -56,21 +56,21 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding SelectedRequin.Nom}" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReqOld"/>
<TextBlock Text="{Binding SelectedRequin.NomSci}" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciNameOld"/>
<Image Source="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photoOld"/>
<TextBlock Text="{Binding SelectedRequin.Nom}" 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="{Binding SelectedRequin.NomSci}" 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="{Binding SelectedRequin.Photo}" 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="descOld" Text="{Binding SelectedRequin.Description}"></TextBlock>
<TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center" x:Name="desc" Text="{Binding SelectedRequin.Description}"></TextBlock>
</ScrollViewer>
<MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3" x:Name="vidOld"/>
<MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3" x:Name="vid"/>
</Grid>
</DockPanel>
<DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
<Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center" x:Name="cartePicOld"></Image>
<Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60" x:Name="consPicOld" ></Image>
<Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center" x:Name="cartePic"></Image>
<Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60" x:Name="consPic" ></Image>
<TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
<TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175" x:Name="funFactOld"></TextBlock>
<Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Remplacer" Margin="0,20,0,0" Click="remplacer_Click" x:Name="remplacer"/>
<TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175" x:Name="funFact"></TextBlock>
<Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Garder" Margin="0,20,0,0" Click="garder_Click" x:Name="garder"/>
</DockPanel>
</DockPanel>
</DockPanel>

11
WpfApp1/DescriptionEdit.xaml.cs
Unescape View File

@ -28,9 +28,6 @@ namespace WpfApp1
public Manager Mgr => (Application.Current as App).LeManager;
public ManagerAddEdit MgrAddEdit => (Application.Current as App).LeManagerAddEdit;
private Requin _requin;
public Requin requin
{
@ -51,7 +48,7 @@ namespace WpfApp1
set
{
_requinOld = value;
uptadeUiOld(_requin);
uptadeUiOld(_requinOld);
}
}
@ -85,11 +82,15 @@ namespace WpfApp1
private void remplacer_Click(object sender, RoutedEventArgs e)
{
Mgr.ModifieRequin(requinOld, requin);
Mgr.SupprimerRequinEdit(requin);
Close();
}
private void garder_Click(object sender, RoutedEventArgs e)
{Close();
{
Mgr.SupprimerRequinEdit(requin);
Close();
}
private void exit_Click(object sender, RoutedEventArgs e)

1
WpfApp1/MainWindow.xaml.cs
Unescape View File

@ -44,6 +44,7 @@ namespace WpfApp1
chargerUC();
}

5
WpfApp1/UCRequinValSubmit.xaml.cs
Unescape View File

@ -25,7 +25,6 @@ namespace WpfApp1
public Manager Mgr => (Application.Current as App).LeManager;
public ManagerAddEdit MgrAddEdit => (Application.Current as App).LeManagerAddEdit;
public UCRequinValSubmit()
{
InitializeComponent();
@ -67,12 +66,12 @@ namespace WpfApp1
private void valider_Click(object sender, RoutedEventArgs e)
{
Mgr.AjouterRequin(requin);
MgrAddEdit.SupprimerRequinAdd(requin);
Mgr.SupprimerRequinAdd(requin);
}
private void refuser_Click(object sender, RoutedEventArgs e)
{
MgrAddEdit.SupprimerRequinAdd(requin);
Mgr.SupprimerRequinAdd(requin);
}
}
}

31
WpfApp1/ValiderSubmit.xaml.cs
Unescape View File

@ -26,18 +26,27 @@ namespace WpfApp1
public ManagerAddEdit MgrAddEdit => (Application.Current as App).LeManagerAddEdit;
public Manager Mgr => (Application.Current as App).LeManager;
public ValiderSubmit()
{
InitializeComponent();
MgrAddEdit.LoadRequins();
Mgr.RequinsEdit.CollectionChanged += RequinsEdit_CollectionChanged;
Mgr.RequinsAdd.CollectionChanged += RequinsAdd_CollectionChanged;
DataContext = MgrAddEdit;
ChargerUCAdd();
ChargerUCEdit();
}
chargerUC();
private void RequinsAdd_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
ChargerUCAdd();
}
private void RequinsEdit_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
ChargerUCEdit();
}
private void exit_Click(object sender, RoutedEventArgs e)
@ -45,22 +54,22 @@ namespace WpfApp1
Close();
}
public void chargerUC()
public void ChargerUCAdd()
{
foreach (Requin req in MgrAddEdit.RequinsAdd)
foreach (Requin req in Mgr.RequinsAdd)
{
laListeAdd.Items.Add(new UserControlRequin { requin = req, type=UCrequinType.add });
}
foreach (Requin req in MgrAddEdit.RequinsEdit)
}
public void ChargerUCEdit()
{
foreach (Requin req in Mgr.RequinsEdit)
{
laListeEdit.Items.Add(new UserControlRequin { requin = req, type = UCrequinType.edit });
}
}
public void ContentControlSwapDes(Requin req)
{
//contentControl.Content = new userControlDescription { requin = req };
}
private void addShark_Click(object sender, RoutedEventArgs e)
{

Write Preview
Loading…
Cancel
Save