From d93f978eb5081faf8807c56f7da5856c49c33131 Mon Sep 17 00:00:00 2001
From: Valentin VERDIER <valentin@aztrom.fr>
Date: Mon, 30 Nov 2020 21:01:45 +0100
Subject: [PATCH] Restructuration des vues

---
 CitoyenModal.xaml     | 256 +++++++++++++++++++++---------------------
 MainWindow.xaml       |  95 +++++++++++-----
 PreferencesModal.xaml |  42 +++----
 3 files changed, 216 insertions(+), 177 deletions(-)

diff --git a/CitoyenModal.xaml b/CitoyenModal.xaml
index 77fd897..151fe26 100644
--- a/CitoyenModal.xaml
+++ b/CitoyenModal.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hermes"
         mc:Ignorable="d"
-        Title="Informations" Height="390" Width="750"
+        Title="Informations" Height="400" Width="750"
         Icon="hermes.png"
         ResizeMode="NoResize"
         xmlns:Validation="clr-namespace:Hermes.Validation"
@@ -17,132 +17,134 @@
     <Window.Resources>
         <Converter:NegateBoolean x:Key="NegateBoolean"/>
     </Window.Resources>
-    
+
     <Grid>
-        <StackPanel>
-            <WrapPanel>
-                <StackPanel Margin="10,10,0,0" VerticalAlignment="Top">
-                    <Label>Civilité:</Label>
-                    <ComboBox Name="civiliteComboBox" SelectedItem="{Binding Civilite}" Height="23" Width="150"/>
-                    <Label>Nom :</Label>
-                    <TextBox Name="nomTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
-                        <TextBox.Text>
-                            <Binding Path="Nom" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
-                                <Binding.ValidationRules>
-                                    <Validation:MandatoryString/>
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
-                    </TextBox>
-                    <Label>Nom de naissance :</Label>
-                    <TextBox Name="nomNaissanceTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
-                        <TextBox.Text>
-                            <Binding Path="NomNaissance" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
-                                <Binding.ValidationRules>
-                                    <Validation:MandatoryString/>
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
-                    </TextBox>
-                    <Label>Prénom :</Label>
-                    <TextBox Name="prenomTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
-                        <TextBox.Text>
-                            <Binding Path="Prenom" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
-                                <Binding.ValidationRules>
-                                    <Validation:MandatoryString/>
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
-                    </TextBox>
-                    <Label>Age :</Label>
-                    <TextBox Name="ageTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="30">
-                        <TextBox.Text>
-                            <Binding Path="Age" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
-                                <Binding.ValidationRules>
-                                    <Validation:Age/>
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </TextBox.Text>
-                    </TextBox>
-                    <Label>Profession :</Label>
-                    <TextBox Name="professionTextBox" Text="{Binding Path=Profession}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                </StackPanel>
-                <StackPanel>
-                    <GroupBox Header="Résidence" Margin="10,10,0,0" VerticalAlignment="Top">
-                        <StackPanel>
-                            <RadioButton Name="principaleResCheckBox" IsChecked="{Binding Path=TypeResidence, Converter={StaticResource NegateBoolean}}" Margin="5,5,5,0">Principale</RadioButton>
-                            <RadioButton Name="secondResCheckBox" IsChecked="{Binding Path=TypeResidence}" Margin="5,5,5,5">Secondaire</RadioButton>
-                        </StackPanel>
-                    </GroupBox>
-                    <GroupBox Header="Adresse Locale" Margin="10,10,0,0" VerticalAlignment="Top">
-                        <StackPanel>
-                            <Label>Numéro :</Label>
-                            <TextBox Name="adresseNumeroTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="50">
-                                <TextBox.Text>
-                                    <Binding Path="AdresseNumero" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
-                                        <Binding.ValidationRules>
-                                            <Validation:MandatoryString/>
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </TextBox.Text>
-                            </TextBox>
-                            <Label>Rue:</Label>
-                            <TextBox Name="adresseRueTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
-                                <TextBox.Text>
-                                    <Binding Path="AdresseRue" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
-                                        <Binding.ValidationRules>
-                                            <Validation:MandatoryString/>
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </TextBox.Text>
-                            </TextBox>
-                            <Label>Bâtiment :</Label>
-                            <TextBox Name="adresseBatimentTextBox" Text="{Binding Path=AdresseBatiment}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                            <Label>Quartier :</Label>
-                            <TextBox Name="quartierTextBox" Text="{Binding Path=Quartier}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                        </StackPanel>
-                    </GroupBox>
-                </StackPanel>
-                <StackPanel>
-                    <GroupBox IsEnabled="{Binding IsChecked, ElementName=secondResCheckBox}" x:Name="mainAddrGroupBox" Header="Adresse" Margin="10,10,0,0" VerticalAlignment="Top" >
-                        <GroupBox.Style>
-                            <Style>
-                                <Style.Triggers>
-                                    <Trigger Property="Control.IsEnabled" Value="False">
-                                        <Setter Property="Control.Foreground" Value ="#FF6D6D6D" />
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </GroupBox.Style>
-                        <StackPanel>
-                            <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Numéro :</Label>
-                            <TextBox Name="adresseExtNumeroTextBox" Text="{Binding Path=AdresseExtNumero}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="50"/>
-                            <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Rue :</Label>
-                            <TextBox Name="adresseExtRueTextBox" Text="{Binding Path=AdresseExtRue}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                            <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Code postal :</Label>
-                            <TextBox Name="adresseExtCPTextBox" Text="{Binding Path=AdresseExtCP}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="80"/>
-                            <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Ville :</Label>
-                            <TextBox Name="adresseExtVilleTextBox" Text="{Binding Path=AdresseExtVille}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                        </StackPanel>
-                    </GroupBox>
-                </StackPanel>
-                <StackPanel>
-                    <GroupBox Header="Contact" Margin="10,10,0,0" VerticalAlignment="Top">
-                        <StackPanel>
-                            <Label>E-Mail :</Label>
-                            <TextBox Name="mailTextBox" Text="{Binding Path=Mail}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="200"/>
-                            <Label>Téléphone :</Label>
-                            <TextBox Name="telTextBox" Text="{Binding Path=Tel}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                            <Label>Mobile :</Label>
-                            <TextBox Name="telPortTextBox" Text="{Binding Path=TelPort}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                        </StackPanel>
-                    </GroupBox>
-                </StackPanel>
-            </WrapPanel>
-            <WrapPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10,10,10,10">
-                <Button Height="25" Margin="0,0,10,0" Width="100" Click="Save_Click">Enregister</Button>
-                <Button Height="25" Width="100" Click="Cancel_Click">Annuler</Button>
-            </WrapPanel>
-        </StackPanel>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="320"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <WrapPanel Grid.Row="0">
+            <StackPanel Margin="10,10,0,0">
+                <Label>Civilité :</Label>
+                <ComboBox Name="civiliteComboBox" SelectedItem="{Binding Civilite}" Height="23" Width="150"/>
+                <Label>Nom :</Label>
+                <TextBox Name="nomTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
+                    <TextBox.Text>
+                        <Binding Path="Nom" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
+                            <Binding.ValidationRules>
+                                <Validation:MandatoryString/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </TextBox.Text>
+                </TextBox>
+                <Label>Nom de naissance :</Label>
+                <TextBox Name="nomNaissanceTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
+                    <TextBox.Text>
+                        <Binding Path="NomNaissance" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
+                            <Binding.ValidationRules>
+                                <Validation:MandatoryString/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </TextBox.Text>
+                </TextBox>
+                <Label>Prénom :</Label>
+                <TextBox Name="prenomTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
+                    <TextBox.Text>
+                        <Binding Path="Prenom" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
+                            <Binding.ValidationRules>
+                                <Validation:MandatoryString/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </TextBox.Text>
+                </TextBox>
+                <Label>Age :</Label>
+                <TextBox Name="ageTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="30">
+                    <TextBox.Text>
+                        <Binding Path="Age" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
+                            <Binding.ValidationRules>
+                                <Validation:Age/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </TextBox.Text>
+                </TextBox>
+                <Label>Profession :</Label>
+                <TextBox Name="professionTextBox" Text="{Binding Path=Profession}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+            </StackPanel>
+            <StackPanel>
+                <GroupBox Header="Résidence" Margin="10,10,0,0" VerticalAlignment="Top">
+                    <StackPanel>
+                        <RadioButton Name="principaleResCheckBox" IsChecked="{Binding Path=TypeResidence, Converter={StaticResource NegateBoolean}}" Margin="5,5,5,0">Principale</RadioButton>
+                        <RadioButton Name="secondResCheckBox" IsChecked="{Binding Path=TypeResidence}" Margin="5,5,5,5">Secondaire</RadioButton>
+                    </StackPanel>
+                </GroupBox>
+                <GroupBox Header="Adresse Locale" Margin="10,10,0,0" VerticalAlignment="Top">
+                    <StackPanel>
+                        <Label>Numéro :</Label>
+                        <TextBox Name="adresseNumeroTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="50">
+                            <TextBox.Text>
+                                <Binding Path="AdresseNumero" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
+                                    <Binding.ValidationRules>
+                                        <Validation:MandatoryString/>
+                                    </Binding.ValidationRules>
+                                </Binding>
+                            </TextBox.Text>
+                        </TextBox>
+                        <Label>Rue :</Label>
+                        <TextBox Name="adresseRueTextBox" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}" Validation.Error="ValidationError" Binding.TargetUpdated="BindingTargetUpdated" Binding.SourceUpdated="BindingSourceUpdated" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150">
+                            <TextBox.Text>
+                                <Binding Path="AdresseRue" NotifyOnSourceUpdated="True" NotifyOnTargetUpdated="true" NotifyOnValidationError="true">
+                                    <Binding.ValidationRules>
+                                        <Validation:MandatoryString/>
+                                    </Binding.ValidationRules>
+                                </Binding>
+                            </TextBox.Text>
+                        </TextBox>
+                        <Label>Bâtiment :</Label>
+                        <TextBox Name="adresseBatimentTextBox" Text="{Binding Path=AdresseBatiment}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                        <Label>Quartier :</Label>
+                        <TextBox Name="quartierTextBox" Text="{Binding Path=Quartier}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+            <StackPanel>
+                <GroupBox IsEnabled="{Binding IsChecked, ElementName=secondResCheckBox}" x:Name="mainAddrGroupBox" Header="Adresse" Margin="10,10,0,0" VerticalAlignment="Top" >
+                    <GroupBox.Style>
+                        <Style>
+                            <Style.Triggers>
+                                <Trigger Property="Control.IsEnabled" Value="False">
+                                    <Setter Property="Control.Foreground" Value ="#FF6D6D6D" />
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </GroupBox.Style>
+                    <StackPanel>
+                        <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Numéro :</Label>
+                        <TextBox Name="adresseExtNumeroTextBox" Text="{Binding Path=AdresseExtNumero}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="50"/>
+                        <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Rue :</Label>
+                        <TextBox Name="adresseExtRueTextBox" Text="{Binding Path=AdresseExtRue}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                        <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Code postal :</Label>
+                        <TextBox Name="adresseExtCPTextBox" Text="{Binding Path=AdresseExtCP}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="80"/>
+                        <Label IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}">Ville :</Label>
+                        <TextBox Name="adresseExtVilleTextBox" Text="{Binding Path=AdresseExtVille}" IsEnabled="{Binding IsEnabled, ElementName=mainAddrGroupBox}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+            <StackPanel>
+                <GroupBox Header="Contact" Margin="10,10,0,0" VerticalAlignment="Top">
+                    <StackPanel>
+                        <Label>E-Mail :</Label>
+                        <TextBox Name="mailTextBox" Text="{Binding Path=Mail}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="200"/>
+                        <Label>Téléphone :</Label>
+                        <TextBox Name="telTextBox" Text="{Binding Path=Tel}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                        <Label>Mobile :</Label>
+                        <TextBox Name="telPortTextBox" Text="{Binding Path=TelPort}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+        </WrapPanel>
+        <WrapPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0">
+            <Button Height="25" Margin="0,0,10,0" Width="100" Click="Save_Click" IsDefault="True">Enregister</Button>
+            <Button Height="25" Width="100" Click="Cancel_Click">Annuler</Button>
+        </WrapPanel>
     </Grid>
 </Window>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 51c0d4e..3563b05 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -12,8 +12,13 @@
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="Bool2VisibilityConv"/>
     </Window.Resources>
-    <StackPanel>
-        <Menu>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="20"/>
+            <RowDefinition Height="100"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Menu Grid.Row="0">
             <MenuItem Header="Fichier">
                 <MenuItem Header="Exporter..."/>
                 <MenuItem Header="Importer..."/>
@@ -23,7 +28,26 @@
                 <MenuItem Header="Supprimer" Click="Supprimer_Click"/>
             </MenuItem>
             <MenuItem Header="Affichage">
-                <MenuItem x:Name="completeViewCheckbox" Header="Vue détaillée" IsCheckable="true"/>
+                <MenuItem Name="civiliteViewCheckBox" Header="Civilité" IsCheckable="true"/>
+                <MenuItem Name="nomViewCheckBox" Header="Nom" IsCheckable="true" IsChecked="True"/>
+                <MenuItem Name="nomNaissanceViewCheckBox" Header="Nom de naissance" IsCheckable="true"/>
+                <MenuItem Name="prenomViewCheckBox" Header="Prénom" IsCheckable="true" IsChecked="True"/>
+                <MenuItem Name="ageViewCheckBox" Header="Age" IsCheckable="true" IsChecked="True"/>
+                <MenuItem Name="professionViewCheckBox" Header="Profession" IsCheckable="true"/>
+                <MenuItem Name="typeResidenceViewCheckBox" Header="Résidence" IsCheckable="true" IsChecked="True"/>
+                <MenuItem Name="quartierViewCheckBox" Header="Quartier" IsCheckable="true"/>
+                <MenuItem Name="adresseNumeroViewCheckBox" Header="Numéro de rue" IsCheckable="true" IsChecked="True"/>
+                <MenuItem Name="adresseRueViewCheckBox" Header="Rue" IsCheckable="true" IsChecked="True"/>
+                <MenuItem Name="adresseBatimentViewCheckBox" Header="Bâtiment" IsCheckable="true"/>
+                <MenuItem Name="adresseExtNumeroViewCheckBox" Header="Numéro de rue (autre)" IsCheckable="true"/>
+                <MenuItem Name="adresseExtRueViewCheckBox" Header="Rue (autre)" IsCheckable="true"/>
+                <MenuItem Name="adresseExtCPViewCheckBox" Header="Code postal (autre)" IsCheckable="true"/>
+                <MenuItem Name="adresseExtVilleViewCheckBox" Header="Ville (autre)" IsCheckable="true"/>
+                <MenuItem Name="mailViewCheckBox" Header="E-Mail" IsCheckable="true"/>
+                <MenuItem Name="telViewCheckBox" Header="Téléphone" IsCheckable="true"/>
+                <MenuItem Name="telPortViewCheckBox" Header="Mobile" IsCheckable="true"/>
+                <MenuItem Name="dateCreationViewCheckBox" Header="Date de création" IsCheckable="true"/>
+                <MenuItem Name="dateModificationViewCheckBox" Header="Date de modification" IsCheckable="true"/>
             </MenuItem>
             <MenuItem Header="Communication">
                 <MenuItem Header="Courriel..."/>
@@ -34,31 +58,42 @@
                 <MenuItem Header="Options..." Click="Options_Click"/>
             </MenuItem>
         </Menu>
-        <Grid>
-            <DataGrid Name="dgCitoyens" AutoGenerateColumns="False" IsReadOnly="True" MouseDoubleClick="DgCitoyen_DoubleClick">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="Civilité" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Civilite}" Width="*"/>
-                    <DataGridTextColumn Header="Nom" Binding="{Binding Nom}" Width="*"/>
-                    <DataGridTextColumn Header="Nom de naissance" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding NomNaissance}" Width="*"/>
-                    <DataGridTextColumn Header="Prénom" Binding="{Binding Prenom}" Width="*"/>
-                    <DataGridTextColumn Header="Age" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Age}" Width="*"/>
-                    <DataGridTextColumn Header="Profession" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Profession}" Width="*"/>
-                    <DataGridTextColumn Header="Résidence" Binding="{Binding TypeResidenceLabel}" Width="*"/>
-                    <DataGridTextColumn Header="Quartier" Binding="{Binding Quartier}" Width="*"/>
-                    <DataGridTextColumn Header="Numéro de rue (locale)" Binding="{Binding AdresseNumero}" Width="*"/>
-                    <DataGridTextColumn Header="Rue (locale)" Binding="{Binding AdresseRue}" Width="*"/>
-                    <DataGridTextColumn Header="Bâtiment" Binding="{Binding AdresseBatiment}" Width="*"/>
-                    <DataGridTextColumn Header="Numéro de rue" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtNumero}" Width="*"/>
-                    <DataGridTextColumn Header="Rue" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtRue}" Width="*"/>
-                    <DataGridTextColumn Header="Code postal" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtCP}" Width="*"/>
-                    <DataGridTextColumn Header="Ville" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtVille}" Width="*"/>
-                    <DataGridTextColumn Header="E-Mail" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Mail}" Width="*"/>
-                    <DataGridTextColumn Header="Téléphone" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Tel}" Width="*"/>
-                    <DataGridTextColumn Header="Mobile" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding TelPort}" Width="*"/>
-                    <DataGridTextColumn Header="Date de création" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding DateCreation}" Width="*"/>
-                    <DataGridTextColumn Header="Date de modification" Visibility="{Binding Source={x:Reference completeViewCheckbox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding DateModification}" Width="*"/>
-                </DataGrid.Columns>
-            </DataGrid>
-        </Grid>
-    </StackPanel>
+        <WrapPanel Grid.Row="1" Margin="10">
+            <StackPanel Margin="5">
+                <Label>Age :</Label>
+                <WrapPanel>
+                    <ComboBox Name="ageOperationFilter" Width="150" Margin="0,0,5,0">
+                        <ComboBoxItem IsSelected="True">Égal à</ComboBoxItem>
+                        <ComboBoxItem>Supérieur à</ComboBoxItem>
+                        <ComboBoxItem>Inférieur à</ComboBoxItem>
+                    </ComboBox>
+                    <TextBox VerticalContentAlignment="Center" HorizontalAlignment="Left" Height="23" Width="40"/>
+                </WrapPanel>
+            </StackPanel>
+        </WrapPanel>
+        <DataGrid Grid.Row="2" VerticalScrollBarVisibility="Visible" GridLinesVisibility="All"  Margin="10" Name="dgCitoyens" AutoGenerateColumns="False" IsReadOnly="True" MouseDoubleClick="DgCitoyen_DoubleClick">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Civilité" Visibility="{Binding Source={x:Reference civiliteViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Civilite}" Width="*"/>
+                <DataGridTextColumn Header="Nom" Visibility="{Binding Source={x:Reference nomViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Nom}" Width="*"/>
+                <DataGridTextColumn Header="Nom de naissance" Visibility="{Binding Source={x:Reference nomNaissanceViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding NomNaissance}" Width="*"/>
+                <DataGridTextColumn Header="Prénom" Visibility="{Binding Source={x:Reference prenomViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Prenom}" Width="*"/>
+                <DataGridTextColumn Header="Age" Visibility="{Binding Source={x:Reference ageViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Age}" Width="*"/>
+                <DataGridTextColumn Header="Profession" Visibility="{Binding Source={x:Reference professionViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Profession}" Width="*"/>
+                <DataGridTextColumn Header="Résidence" Visibility="{Binding Source={x:Reference typeResidenceViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding TypeResidenceLabel}" Width="*"/>
+                <DataGridTextColumn Header="Quartier" Visibility="{Binding Source={x:Reference quartierViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Quartier}" Width="*"/>
+                <DataGridTextColumn Header="Numéro de rue" Visibility="{Binding Source={x:Reference adresseNumeroViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseNumero}" Width="*"/>
+                <DataGridTextColumn Header="Rue" Visibility="{Binding Source={x:Reference adresseRueViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseRue}" Width="*"/>
+                <DataGridTextColumn Header="Bâtiment" Visibility="{Binding Source={x:Reference adresseBatimentViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseBatiment}" Width="*"/>
+                <DataGridTextColumn Header="Numéro de rue (autre)" Visibility="{Binding Source={x:Reference adresseExtNumeroViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtNumero}" Width="*"/>
+                <DataGridTextColumn Header="Rue (autre)" Visibility="{Binding Source={x:Reference adresseExtRueViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtRue}" Width="*"/>
+                <DataGridTextColumn Header="Code postal (autre)" Visibility="{Binding Source={x:Reference adresseExtCPViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtCP}" Width="*"/>
+                <DataGridTextColumn Header="Ville" Visibility="{Binding Source={x:Reference adresseExtVilleViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding AdresseExtVille}" Width="*"/>
+                <DataGridTextColumn Header="E-Mail" Visibility="{Binding Source={x:Reference mailViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Mail}" Width="*"/>
+                <DataGridTextColumn Header="Téléphone" Visibility="{Binding Source={x:Reference telViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding Tel}" Width="*"/>
+                <DataGridTextColumn Header="Mobile" Visibility="{Binding Source={x:Reference telPortViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding TelPort}" Width="*"/>
+                <DataGridTextColumn Header="Date de création" Visibility="{Binding Source={x:Reference dateCreationViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding DateCreation, StringFormat='dd-MM-yyyy HH:mm'}" Width="*"/>
+                <DataGridTextColumn Header="Date de modification" Visibility="{Binding Source={x:Reference dateModificationViewCheckBox}, Path=IsChecked, Converter={StaticResource Bool2VisibilityConv}}" Binding="{Binding DateModification, StringFormat='dd-MM-yyyy HH:mm'}" Width="*"/>
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
 </Window>
diff --git a/PreferencesModal.xaml b/PreferencesModal.xaml
index 0b4d43a..6bd9857 100644
--- a/PreferencesModal.xaml
+++ b/PreferencesModal.xaml
@@ -11,26 +11,28 @@
         WindowStartupLocation="CenterOwner"
         Closing="Window_Closing">
     <Grid>
-        <StackPanel>
-            <TabControl Margin="5,5,5,5" MinHeight="160">
-                <TabItem Header="Général">
-                    <StackPanel Margin="5,5,5,5" VerticalAlignment="Top">
-                        <Label>Code postal :</Label>
-                        <TextBox HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="80"/>
-                        <Label>Ville :</Label>
-                        <TextBox HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Envoi de SMS">
-                    <StackPanel Margin="5,5,5,5" VerticalAlignment="Top">
-                        <Label>Clé API ISendPro :</Label>
-                        <TextBox HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="200"/>
-                    </StackPanel>
-                </TabItem>
-            </TabControl>
-        </StackPanel>
-        <WrapPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10,10,10,10">
-            <Button Height="25" Margin="0,0,10,0" Width="100">Enregister</Button>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="160"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TabControl Grid.Row="0" Margin="5,5,5,0">
+            <TabItem Header="Général">
+                <StackPanel Margin="5,5,5,5" VerticalAlignment="Top">
+                    <Label>Code postal :</Label>
+                    <TextBox HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="80"/>
+                    <Label>Ville :</Label>
+                    <TextBox HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="150"/>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Envoi de SMS">
+                <StackPanel Margin="5,5,5,5" VerticalAlignment="Top">
+                    <Label>Clé API ISendPro :</Label>
+                    <TextBox HorizontalAlignment="Left" VerticalContentAlignment="Center" Height="23" Width="200"/>
+                </StackPanel>
+            </TabItem>
+        </TabControl>
+        <WrapPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,5,0">
+            <Button Height="25" Margin="0,0,10,0" Width="100" IsDefault="True">Enregister</Button>
             <Button Height="25" Width="100">Annuler</Button>
         </WrapPanel>
     </Grid>