From 32a45063fa395136b561a79ff3989c2ec134411d Mon Sep 17 00:00:00 2001
From: Ash Frost <barazok.blackrocks@gmail.com>
Date: Thu, 16 Apr 2020 20:36:13 +0200
Subject: [PATCH] Improve interface design

---
 .../AttestationsGenerator.xaml                | 11 +++++----
 AttestationsGenerator/CreateProfile.xaml      | 23 +++++++++++--------
 Setup/Setup.vdproj                            |  6 ++---
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/AttestationsGenerator/AttestationsGenerator.xaml b/AttestationsGenerator/AttestationsGenerator.xaml
index d3311a0..6c0b136 100644
--- a/AttestationsGenerator/AttestationsGenerator.xaml
+++ b/AttestationsGenerator/AttestationsGenerator.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="Générateur d'attestation" Height="167" Width="358" ResizeMode="CanMinimize">
+        Title="Générateur d'attestation" Height="208" Width="358" ResizeMode="CanMinimize">
     <DockPanel Loaded="Window_Loaded">
         <Menu DockPanel.Dock="Top" Height="23">
             <MenuItem Header="_Options" Height="23">
@@ -16,8 +16,10 @@
             </MenuItem>
         </Menu>
         <Grid Margin="0,0,0,0">
-            <ComboBox Name="Profiles_ComboBox" Margin="10,10,10,0" VerticalAlignment="Top"/>
-            <ComboBox Name="Exit_Reasons_ComboBox" Margin="10,37,10,0" VerticalAlignment="Top" SelectedIndex="0">
+            <Label Padding="0,0,0,0" Margin="10,10,10,0" VerticalAlignment="Top">Profile</Label>
+            <ComboBox Name="Profiles_ComboBox" Margin="10,26,10,0" VerticalAlignment="Top"/>
+            <Label Padding="0,0,0,0" Margin="10,53,10,0" VerticalAlignment="Top">Raison de sortie</Label>
+            <ComboBox Name="Exit_Reasons_ComboBox" Margin="10,69,10,0" VerticalAlignment="Top" SelectedIndex="0">
                 <ComboBoxItem>Déplacements entre domicile et travail</ComboBoxItem>
                 <ComboBoxItem>Déplacements achats nécéssaires</ComboBoxItem>
                 <ComboBoxItem>Consultations et soins</ComboBoxItem>
@@ -26,7 +28,8 @@
                 <ComboBoxItem>Convcation judiciaire ou administrative</ComboBoxItem>
                 <ComboBoxItem>Mission d'intérêt général</ComboBoxItem>
             </ComboBox>
-            <Button Content="Générer l'attestation" Margin="10,64,10,10" Click="Button_Click"/>
+            <Button Content="Générer l'attestation" Margin="10,100
+                    ,10,10" Click="Button_Click"/>
         </Grid>
     </DockPanel>
 </Window>
diff --git a/AttestationsGenerator/CreateProfile.xaml b/AttestationsGenerator/CreateProfile.xaml
index 2c5ed39..14f9e3a 100644
--- a/AttestationsGenerator/CreateProfile.xaml
+++ b/AttestationsGenerator/CreateProfile.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="Créer un profile" Height="225" Width="318" ResizeMode="NoResize">
+        Title="Créer un profile" Height="278" Width="370" ResizeMode="NoResize">
     <Window.Resources>
         <Style x:Key="placeHolder" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
             <Setter Property="Template">
@@ -17,8 +17,8 @@
                                                 UpdateSourceTrigger=PropertyChanged}"
                                  x:Name="textSource" 
                                  Background="Transparent" 
-                                 Panel.ZIndex="2" />
-                            <TextBox Text="{TemplateBinding Tag}" Background="{TemplateBinding Background}" Panel.ZIndex="1">
+                                 Panel.ZIndex="2" VerticalContentAlignment="Center" />
+                            <TextBox Text="{TemplateBinding Tag}" Background="{TemplateBinding Background}" Panel.ZIndex="1" VerticalContentAlignment="Center">
                                 <TextBox.Style>
                                     <Style TargetType="{x:Type TextBox}">
                                         <Setter Property="Foreground" Value="Transparent"/>
@@ -37,11 +37,16 @@
         </Style>
     </Window.Resources>
     <Grid Margin="0,0,0,0">
-        <TextBox Style="{StaticResource placeHolder}" Tag="Nom complet" x:Name="FullName" Margin="10,10,10,0" VerticalAlignment="Top" FontSize="16" KeyUp="OnKeyUpHandler"/>
-        <TextBox Style="{StaticResource placeHolder}" Tag="Date de naissance" x:Name="DateBirth" Margin="10,38,10,0" VerticalAlignment="Top" FontSize="16" KeyUp="OnKeyUpHandler"/>
-        <TextBox Style="{StaticResource placeHolder}" Tag="Lieu de naissance" x:Name="CityBirth" Margin="10,66,10,0" VerticalAlignment="Top" FontSize="16" KeyUp="OnKeyUpHandler"/>
-        <TextBox Style="{StaticResource placeHolder}" Tag="Adresse" x:Name="Address" Margin="10,94,10,0" VerticalAlignment="Top" FontSize="16" KeyUp="OnKeyUpHandler"/>
-        <TextBox Style="{StaticResource placeHolder}" Tag="Ville" x:Name="City" Margin="10,122,10,0" VerticalAlignment="Top" FontSize="16" KeyUp="OnKeyUpHandler"/>
-        <Button x:Name="CreateProfileButton" Content="Créer le profile" Margin="10,150,10,10" Click="Create_Profile"/>
+        <Label Padding="0,0,0,0" Margin="10,10,10,0" VerticalAlignment="Top">Nom complet</Label>
+        <TextBox Style="{StaticResource placeHolder}" Tag="Prénom NOM" x:Name="FullName" Margin="10,26,10,0" Padding="10,10,10,10" VerticalAlignment="Top" KeyUp="OnKeyUpHandler" Height="22" VerticalContentAlignment="Center"/>
+        <Label Padding="0,0,0,0" Margin="10,53,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160">Date de naissance</Label>
+        <TextBox Style="{StaticResource placeHolder}" Tag="01 Janvier 1901" x:Name="DateBirth" Margin="10,69,0,0" Padding="10,10,10,10" VerticalAlignment="Top" KeyUp="OnKeyUpHandler" HorizontalAlignment="Left" Width="160" Height="22" VerticalContentAlignment="Center"/>
+        <Label Padding="0,0,0,0" Margin="0,53,10,0" HorizontalAlignment="Right" VerticalAlignment="Top" Width="160">Lieu de naissance</Label>
+        <TextBox Style="{StaticResource placeHolder}" Tag="Paris 1er arrondissement" x:Name="CityBirth" Margin="0,69,10,0" Padding="10,10,10,10" VerticalAlignment="Top" KeyUp="OnKeyUpHandler" HorizontalAlignment="Right" Width="160" Height="22" VerticalContentAlignment="Center"/>
+        <Label Padding="0,0,0,0" Margin="10,96,10,0" VerticalAlignment="Top">Adresse</Label>
+        <TextBox Style="{StaticResource placeHolder}" Tag="1 Rue Cambon 75001 Paris" x:Name="Address" Margin="10,112,10,0" Padding="10,10,10,10" VerticalAlignment="Top" KeyUp="OnKeyUpHandler" Height="22" VerticalContentAlignment="Center"/>
+        <Label Padding="0,0,0,0" Margin="10,139,10,0" VerticalAlignment="Top">Ville (Fait à)</Label>
+        <TextBox Style="{StaticResource placeHolder}" Tag="Paris" x:Name="City" Margin="10,155,10,0" VerticalAlignment="Top" KeyUp="OnKeyUpHandler" Height="22"/>
+        <Button x:Name="CreateProfileButton" Content="Créer le profile" Margin="10,190,10,10" Click="Create_Profile"/>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
index 2416118..7c2761c 100644
--- a/Setup/Setup.vdproj
+++ b/Setup/Setup.vdproj
@@ -429,15 +429,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Générateur d'attestation"
-        "ProductCode" = "8:{020FAC96-A373-4DB8-A5F6-9A4C026B8897}"
-        "PackageCode" = "8:{AE60F0C9-B871-43EA-A604-D7A8359F46FE}"
+        "ProductCode" = "8:{1F0D7D40-C7BB-4A5A-8FD8-7553070FB7E6}"
+        "PackageCode" = "8:{F9DF8554-F524-4591-AB3D-49276E113055}"
         "UpgradeCode" = "8:{3A184958-1664-4602-BDA6-DAB7424E4270}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.2"
+        "ProductVersion" = "8:1.0.3"
         "Manufacturer" = "8:BabaWorld"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"