From c92d04fabf174ef1ad92043d78be465763037100 Mon Sep 17 00:00:00 2001 From: Valentin VERDIER Date: Thu, 3 Dec 2020 23:49:45 +0100 Subject: [PATCH] Modification de la gestion des adresses --- CitoyenModal.xaml | 34 ++++----------- CitoyenModal.xaml.cs | 6 +-- Hermes.csproj | 14 ++++--- MainWindow.xaml | 14 +++---- MainWindow.xaml.cs | 6 +-- ...gner.cs => 202012032233531_V1.Designer.cs} | 2 +- ...1292109022_V1.cs => 202012032233531_V1.cs} | 6 +-- ...109022_V1.resx => 202012032233531_V1.resx} | 2 +- Model/Citoyen.cs | 41 +++++-------------- PreferencesModal.xaml.cs | 3 -- packages.config | 1 + 11 files changed, 39 insertions(+), 90 deletions(-) rename Migrations/{202011292109022_V1.Designer.cs => 202012032233531_V1.Designer.cs} (93%) rename Migrations/{202011292109022_V1.cs => 202012032233531_V1.cs} (88%) rename Migrations/{202011292109022_V1.resx => 202012032233531_V1.resx} (74%) diff --git a/CitoyenModal.xaml b/CitoyenModal.xaml index 78f17df..4360e01 100644 --- a/CitoyenModal.xaml +++ b/CitoyenModal.xaml @@ -38,15 +38,7 @@ - - - - - - - - - + @@ -79,20 +71,10 @@ - - + + - - - - - - - - - - - + @@ -118,12 +100,10 @@ - - - - + + - + diff --git a/CitoyenModal.xaml.cs b/CitoyenModal.xaml.cs index 1d95ce0..c570c6a 100644 --- a/CitoyenModal.xaml.cs +++ b/CitoyenModal.xaml.cs @@ -6,9 +6,6 @@ using System.Windows.Controls; using System.Windows.Data; namespace Hermes { - /// - /// Logique d'interaction pour CitoyenModal.xaml - /// public partial class CitoyenModal : Window { private ModelContext dbContext = null; private Citoyen citoyen = null; @@ -72,8 +69,7 @@ namespace Hermes { nomNaissanceTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource(); prenomTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource(); ageTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource(); - adresseNumeroTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource(); - adresseRueTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource(); + adresseTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource(); if(_isInvalidElements.Count == 0) { if(_modeCreate) { ((Citoyen) DataContext).DateCreation = DateTime.Now; diff --git a/Hermes.csproj b/Hermes.csproj index 0e3c500..b735376 100644 --- a/Hermes.csproj +++ b/Hermes.csproj @@ -62,6 +62,10 @@ packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll + + packages\Microsoft.Office.Interop.Outlook.15.0.4797.1003\lib\net20\Microsoft.Office.Interop.Outlook.dll + True + @@ -90,9 +94,9 @@ Designer - - - 202011292109022_V1.cs + + + 202012032233531_V1.cs @@ -141,8 +145,8 @@ Settings.settings True - - 202011292109022_V1.cs + + 202012032233531_V1.cs ResXFileCodeGenerator diff --git a/MainWindow.xaml b/MainWindow.xaml index f995406..0b36860 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -37,11 +37,9 @@ - - + - - + @@ -108,12 +106,10 @@ - - + - - - + + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 5488961..6a2fbbb 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -7,9 +7,6 @@ using System.Windows.Input; using System.Windows.Data; namespace Hermes { - /// - /// Logique d'interaction pour MainWindow.xaml - /// public partial class MainWindow : Window { private ModelContext dbContext = null; private CitoyenModal citoyenModal = new CitoyenModal(); @@ -32,7 +29,6 @@ namespace Hermes { dbContext.Preferences.Load(); citoyenCollectionViewSource = (CollectionViewSource) this.FindResource("citoyenCollectionViewSource"); citoyenCollectionViewSource.Source = dbContext.CitoyenSet.Local; - //dgCitoyens.ItemsSource = dbContext.CitoyenSet.Local; } private void Options_Click(object sender, RoutedEventArgs e) { @@ -127,7 +123,7 @@ namespace Hermes { } string addrBat = citoyen.AdresseBatiment == null ? "" : citoyen.AdresseBatiment; - string addr = $"{citoyen.AdresseNumero} {citoyen.AdresseRue} {addrBat}".ToLower(); + string addr = $"{citoyen.Adresse} {addrBat}".ToLower(); if(!String.IsNullOrEmpty(adresseFilterTextBox.Text)) { if(!addr.Contains(adresseFilterTextBox.Text.ToLower())) { e.Accepted = false; diff --git a/Migrations/202011292109022_V1.Designer.cs b/Migrations/202012032233531_V1.Designer.cs similarity index 93% rename from Migrations/202011292109022_V1.Designer.cs rename to Migrations/202012032233531_V1.Designer.cs index 5ece8a4..2b8aa75 100644 --- a/Migrations/202011292109022_V1.Designer.cs +++ b/Migrations/202012032233531_V1.Designer.cs @@ -13,7 +13,7 @@ namespace Hermes.Migrations string IMigrationMetadata.Id { - get { return "202011292109022_V1"; } + get { return "202012032233531_V1"; } } string IMigrationMetadata.Source diff --git a/Migrations/202011292109022_V1.cs b/Migrations/202012032233531_V1.cs similarity index 88% rename from Migrations/202011292109022_V1.cs rename to Migrations/202012032233531_V1.cs index a9668d6..2d4e008 100644 --- a/Migrations/202011292109022_V1.cs +++ b/Migrations/202012032233531_V1.cs @@ -23,11 +23,9 @@ Tel = c.String(maxLength: 4000), TelPort = c.String(maxLength: 4000), Quartier = c.String(maxLength: 4000), - AdresseNumero = c.String(maxLength: 4000), - AdresseRue = c.String(maxLength: 4000), + Adresse = c.String(maxLength: 4000), AdresseBatiment = c.String(maxLength: 4000), - AdresseExtNumero = c.String(maxLength: 4000), - AdresseExtRue = c.String(maxLength: 4000), + AdresseExt = c.String(maxLength: 4000), AdresseExtCP = c.String(maxLength: 4000), AdresseExtVille = c.String(maxLength: 4000), DateCreation = c.DateTime(nullable: false), diff --git a/Migrations/202011292109022_V1.resx b/Migrations/202012032233531_V1.resx similarity index 74% rename from Migrations/202011292109022_V1.resx rename to Migrations/202012032233531_V1.resx index e7dba67..780c8ea 100644 --- a/Migrations/202011292109022_V1.resx +++ b/Migrations/202012032233531_V1.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 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 dbo diff --git a/Model/Citoyen.cs b/Model/Citoyen.cs index 32f1f26..9ddbf97 100644 --- a/Model/Citoyen.cs +++ b/Model/Citoyen.cs @@ -18,11 +18,9 @@ namespace Hermes.Model { private string _tel; private string _telPort; private string _quartier; - private string _adresseNumero; - private string _adresseRue; + private string _adresse; private string _adresseBatiment; - private string _adresseExtNumero; - private string _adresseExtRue; + private string _adresseExt; private string _adresseExtCP; private string _adresseExtVille; private DateTime _dateCreation; @@ -79,8 +77,7 @@ namespace Hermes.Model { set { _typeResidence = value; if(_typeResidence == false) { - AdresseExtNumero = null; - AdresseExtRue = null; + AdresseExt = null; AdresseExtCP = null; AdresseExtVille = null; } @@ -116,17 +113,10 @@ namespace Hermes.Model { OnPropertyChanged(); } } - public string AdresseNumero { - get => _adresseNumero; + public string Adresse { + get => _adresse; set { - _adresseNumero = value; - OnPropertyChanged(); - } - } - public string AdresseRue { - get => _adresseRue; - set { - _adresseRue = value; + _adresse = value; OnPropertyChanged(); } } @@ -137,17 +127,10 @@ namespace Hermes.Model { OnPropertyChanged(); } } - public string AdresseExtNumero { - get => TypeResidence == false ? null : _adresseExtNumero; + public string AdresseExt { + get => TypeResidence == false ? null : _adresseExt; set { - _adresseExtNumero = value; - OnPropertyChanged(); - } - } - public string AdresseExtRue { - get => TypeResidence == false ? null : _adresseExtRue; - set { - _adresseExtRue = value; + _adresseExt = value; OnPropertyChanged(); } } @@ -240,11 +223,9 @@ namespace Hermes.Model { citoyen.Tel = Tel; citoyen.TelPort = TelPort; citoyen.Quartier = Quartier; - citoyen.AdresseNumero = AdresseNumero; - citoyen.AdresseRue = AdresseRue; + citoyen.Adresse = Adresse; citoyen.AdresseBatiment = AdresseBatiment; - citoyen.AdresseExtNumero = AdresseExtNumero; - citoyen.AdresseExtRue = AdresseExtRue; + citoyen.AdresseExt = AdresseExt; citoyen.AdresseExtCP = AdresseExtCP; citoyen.AdresseExtVille = AdresseExtVille; citoyen.DateCreation = DateCreation; diff --git a/PreferencesModal.xaml.cs b/PreferencesModal.xaml.cs index 05f4b52..ed417d0 100644 --- a/PreferencesModal.xaml.cs +++ b/PreferencesModal.xaml.cs @@ -2,9 +2,6 @@ using System.Windows; namespace Hermes { - /// - /// Logique d'interaction pour PreferencesModal.xaml - /// public partial class PreferencesModal : Window { private ModelContext dbContext = null; diff --git a/packages.config b/packages.config index fa7238f..679e036 100644 --- a/packages.config +++ b/packages.config @@ -2,5 +2,6 @@ + \ No newline at end of file