Ajout de la persistence des paramètres d'affichage et de la taille de la fenêtre principale

This commit is contained in:
Valentin Verdier 2020-12-29 22:56:32 +01:00
parent 794ad8342d
commit 06cb964d6c
10 changed files with 383 additions and 61 deletions

View File

@ -118,6 +118,10 @@
<Compile Include="Migrations\202012281505590_V1.designer.cs"> <Compile Include="Migrations\202012281505590_V1.designer.cs">
<DependentUpon>202012281505590_V1.cs</DependentUpon> <DependentUpon>202012281505590_V1.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Migrations\202012292127194_V2.cs" />
<Compile Include="Migrations\202012292127194_V2.designer.cs">
<DependentUpon>202012292127194_V2.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" /> <Compile Include="Migrations\Configuration.cs" />
<Compile Include="Model\Citoyen.cs" /> <Compile Include="Model\Citoyen.cs" />
<Compile Include="Model\Preferences.cs" /> <Compile Include="Model\Preferences.cs" />
@ -186,6 +190,9 @@
<EmbeddedResource Include="Migrations\202012281505590_V1.resx"> <EmbeddedResource Include="Migrations\202012281505590_V1.resx">
<DependentUpon>202012281505590_V1.cs</DependentUpon> <DependentUpon>202012281505590_V1.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Migrations\202012292127194_V2.resx">
<DependentUpon>202012292127194_V2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>

View File

@ -812,15 +812,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Hermes" "ProductName" = "8:Hermes"
"ProductCode" = "8:{6CB60F2B-B970-4C1C-AD58-E1F5C9A94227}" "ProductCode" = "8:{4783D494-1251-4579-8FA1-682CD7D89B9C}"
"PackageCode" = "8:{1AB73328-33FC-4865-86BB-F02BE13121C2}" "PackageCode" = "8:{89020EC2-14E6-40DB-B0E2-1FA4F11EEEC3}"
"UpgradeCode" = "8:{A8FB75F3-57A5-4B7D-A0AE-9E87F69529B0}" "UpgradeCode" = "8:{A8FB75F3-57A5-4B7D-A0AE-9E87F69529B0}"
"AspNetVersion" = "8:2.0.50727.0" "AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.1" "ProductVersion" = "8:1.0.2"
"Manufacturer" = "8:Aztrom" "Manufacturer" = "8:Aztrom"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"

View File

@ -7,7 +7,7 @@
mc:Ignorable="d" mc:Ignorable="d"
Loaded="Window_Loaded" Loaded="Window_Loaded"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Title="Hermes" Height="640" Width="1024"> Title="Hermes" MinHeight="360" MinWidth="1010">
<Window.Resources> <Window.Resources>
<BooleanToVisibilityConverter x:Key="Bool2VisibilityConv"/> <BooleanToVisibilityConverter x:Key="Bool2VisibilityConv"/>
<CollectionViewSource x:Key="citoyenCollectionViewSource"/> <CollectionViewSource x:Key="citoyenCollectionViewSource"/>
@ -32,26 +32,26 @@
</MenuItem> </MenuItem>
<MenuItem Header="Supprimer" Click="Supprimer_Click"/> <MenuItem Header="Supprimer" Click="Supprimer_Click"/>
</MenuItem> </MenuItem>
<MenuItem Header="Affichage"> <MenuItem Name="viewMenu" Header="Affichage">
<MenuItem Name="civiliteViewCheckBox" Header="Civilité" IsCheckable="true"/> <MenuItem Name="civiliteViewCheckBox" Header="Civilité" IsCheckable="true" IsChecked="{Binding Path=civiliteViewEnabled}"/>
<MenuItem Name="nomViewCheckBox" Header="Nom" IsCheckable="true" IsChecked="True"/> <MenuItem Name="nomViewCheckBox" Header="Nom" IsCheckable="true" IsChecked="{Binding Path=nomViewEnabled}"/>
<MenuItem Name="nomNaissanceViewCheckBox" Header="Nom de naissance" IsCheckable="true"/> <MenuItem Name="nomNaissanceViewCheckBox" Header="Nom de naissance" IsCheckable="true" IsChecked="{Binding Path=nomNaissanceViewEnabled}"/>
<MenuItem Name="prenomViewCheckBox" Header="Prénom" IsCheckable="true" IsChecked="True"/> <MenuItem Name="prenomViewCheckBox" Header="Prénom" IsCheckable="true" IsChecked="{Binding Path=prenomViewEnabled}"/>
<MenuItem Name="ageViewCheckBox" Header="Age" IsCheckable="true" IsChecked="True"/> <MenuItem Name="ageViewCheckBox" Header="Age" IsCheckable="true" IsChecked="{Binding Path=ageViewEnabled}"/>
<MenuItem Name="professionViewCheckBox" Header="Profession" IsCheckable="true"/> <MenuItem Name="professionViewCheckBox" Header="Profession" IsCheckable="true" IsChecked="{Binding Path=professionViewEnabled}"/>
<MenuItem Name="typeResidenceViewCheckBox" Header="Résidence" IsCheckable="true" IsChecked="True"/> <MenuItem Name="typeResidenceViewCheckBox" Header="Résidence" IsCheckable="true" IsChecked="{Binding Path=typeResidenceViewEnabled}"/>
<MenuItem Name="quartierViewCheckBox" Header="Quartier" IsCheckable="true"/> <MenuItem Name="quartierViewCheckBox" Header="Quartier" IsCheckable="true" IsChecked="{Binding Path=quartierViewEnabled}"/>
<MenuItem Name="adresseViewCheckBox" Header="Adresse locale" IsCheckable="true" IsChecked="True"/> <MenuItem Name="adresseViewCheckBox" Header="Adresse locale" IsCheckable="true" IsChecked="{Binding Path=adresseViewEnabled}"/>
<MenuItem Name="adresseBatimentViewCheckBox" Header="Bâtiment" IsCheckable="true"/> <MenuItem Name="adresseBatimentViewCheckBox" Header="Bâtiment" IsCheckable="true" IsChecked="{Binding Path=adresseBatimentViewEnabled}"/>
<MenuItem Name="adresseNumeroBatimentViewCheckBox" Header="Numéro d'appartement" IsCheckable="true"/> <MenuItem Name="adresseNumeroBatimentViewCheckBox" Header="Numéro d'appartement" IsCheckable="true" IsChecked="{Binding Path=adresseNumeroBatimentViewEnabled}"/>
<MenuItem Name="adresseExtViewCheckBox" Header="Adresse" IsCheckable="true"/> <MenuItem Name="adresseExtViewCheckBox" Header="Adresse" IsCheckable="true" IsChecked="{Binding Path=adresseExtViewEnabled}"/>
<MenuItem Name="adresseExtCPViewCheckBox" Header="Code postal" IsCheckable="true"/> <MenuItem Name="adresseExtCPViewCheckBox" Header="Code postal" IsCheckable="true" IsChecked="{Binding Path=adresseExtCPViewEnabled}"/>
<MenuItem Name="adresseExtVilleViewCheckBox" Header="Ville" IsCheckable="true"/> <MenuItem Name="adresseExtVilleViewCheckBox" Header="Ville" IsCheckable="true" IsChecked="{Binding Path=adresseExtVilleViewEnabled}"/>
<MenuItem Name="mailViewCheckBox" Header="E-Mail" IsCheckable="true"/> <MenuItem Name="mailViewCheckBox" Header="E-Mail" IsCheckable="true" IsChecked="{Binding Path=mailViewEnabled}"/>
<MenuItem Name="telViewCheckBox" Header="Téléphone" IsCheckable="true"/> <MenuItem Name="telViewCheckBox" Header="Téléphone" IsCheckable="true" IsChecked="{Binding Path=telViewEnabled}"/>
<MenuItem Name="telPortViewCheckBox" Header="Mobile" IsCheckable="true"/> <MenuItem Name="telPortViewCheckBox" Header="Mobile" IsCheckable="true" IsChecked="{Binding Path=telPortViewEnabled}"/>
<MenuItem Name="dateCreationViewCheckBox" Header="Date de création" IsCheckable="true"/> <MenuItem Name="dateCreationViewCheckBox" Header="Date de création" IsCheckable="true" IsChecked="{Binding Path=dateCreationViewEnabled}"/>
<MenuItem Name="dateModificationViewCheckBox" Header="Date de modification" IsCheckable="true"/> <MenuItem Name="dateModificationViewCheckBox" Header="Date de modification" IsCheckable="true" IsChecked="{Binding Path=dateModificationViewEnabled}"/>
</MenuItem> </MenuItem>
<MenuItem Header="Communication"> <MenuItem Header="Communication">
<MenuItem Header="Courriel..." Click="Courriel_Click"/> <MenuItem Header="Courriel..." Click="Courriel_Click"/>

View File

@ -14,22 +14,63 @@ namespace Hermes {
private ModelContext dbContext = null; private ModelContext dbContext = null;
private CollectionViewSource citoyenCollectionViewSource = null; private CollectionViewSource citoyenCollectionViewSource = null;
private bool isEnabledFilter = false; private bool isEnabledFilter = false;
private Preferences pref = null;
public MainWindow() { public MainWindow() {
dbContext = ModelContext.Getinstance(); dbContext = ModelContext.Getinstance();
//dbContext.Database.Log = log => System.Console.WriteLine(log); //dbContext.Database.Log = log => System.Console.WriteLine(log);
dbContext.Database.CreateIfNotExists(); dbContext.Database.CreateIfNotExists();
dbContext.CitoyenSet.Load();
dbContext.Preferences.Load();
if(dbContext.Preferences.Local.Count == 0) {
pref = new Preferences();
pref.civiliteViewEnabled = false;
pref.nomViewEnabled = true;
pref.nomNaissanceViewEnabled = false;
pref.prenomViewEnabled = true;
pref.ageViewEnabled = false;
pref.professionViewEnabled = false;
pref.typeResidenceViewEnabled = false;
pref.mailViewEnabled = false;
pref.telViewEnabled = false;
pref.telPortViewEnabled = false;
pref.quartierViewEnabled = false;
pref.adresseViewEnabled = true;
pref.adresseBatimentViewEnabled = false;
pref.adresseNumeroBatimentViewEnabled = false;
pref.adresseExtViewEnabled = false;
pref.adresseExtCPViewEnabled = false;
pref.adresseExtVilleViewEnabled = false;
pref.dateCreationViewEnabled = false;
pref.dateModificationViewEnabled = false;
pref.windowWidth = 1024;
pref.windowHeight = 640;
pref.windowMaximized = false;
dbContext.Preferences.Add(pref);
dbContext.SaveChanges();
}
pref = dbContext.Preferences.Local[0];
InitializeComponent(); InitializeComponent();
Height = pref.windowHeight;
Width = pref.windowWidth;
if(pref.windowMaximized) {
WindowState = WindowState.Maximized;
} else {
WindowState = WindowState.Normal;
}
viewMenu.DataContext = pref;
} }
private void Window_Loaded(object sender, RoutedEventArgs e) { private void Window_Loaded(object sender, RoutedEventArgs e) {
dbContext.CitoyenSet.Load();
dbContext.Preferences.Load();
citoyenCollectionViewSource = (CollectionViewSource) this.FindResource("citoyenCollectionViewSource"); citoyenCollectionViewSource = (CollectionViewSource) this.FindResource("citoyenCollectionViewSource");
citoyenCollectionViewSource.Source = dbContext.CitoyenSet.Local; citoyenCollectionViewSource.Source = dbContext.CitoyenSet.Local;
if(dbContext.Preferences.Local.Count == 0) { if(string.IsNullOrWhiteSpace(pref.VilleCP) || string.IsNullOrWhiteSpace(pref.Ville)) {
MessageBox.Show("Il s'agit du premier lancement de Hermes. Veuillez renseigner les informations sur votre commune.", "Premier lancement", MessageBoxButton.OK, MessageBoxImage.None); MessageBox.Show("Il s'agit du premier lancement de Hermes. Veuillez renseigner les informations sur votre commune.", "Premier lancement", MessageBoxButton.OK, MessageBoxImage.None);
PreferencesWindow preferencesWindow = new PreferencesWindow(this); PreferencesWindow preferencesWindow = new PreferencesWindow(this);
preferencesWindow.ShowDialog(); preferencesWindow.ShowDialog();
@ -267,6 +308,14 @@ namespace Hermes {
} }
protected override void OnClosed(EventArgs e) { protected override void OnClosed(EventArgs e) {
if(WindowState == WindowState.Maximized) {
pref.windowMaximized = true;
} else {
pref.windowMaximized = false;
}
pref.windowHeight = (int) Height;
pref.windowWidth = (int) Width;
dbContext.SaveChanges();
dbContext.Dispose(); dbContext.Dispose();
base.OnClosed(e); base.OnClosed(e);
Application.Current.Shutdown(); Application.Current.Shutdown();

View File

@ -0,0 +1,29 @@
// <auto-generated />
namespace Hermes.Migrations
{
using System.CodeDom.Compiler;
using System.Data.Entity.Migrations;
using System.Data.Entity.Migrations.Infrastructure;
using System.Resources;
[GeneratedCode("EntityFramework.Migrations", "6.4.4")]
public sealed partial class V2 : IMigrationMetadata
{
private readonly ResourceManager Resources = new ResourceManager(typeof(V2));
string IMigrationMetadata.Id
{
get { return "202012292127194_V2"; }
}
string IMigrationMetadata.Source
{
get { return null; }
}
string IMigrationMetadata.Target
{
get { return Resources.GetString("Target"); }
}
}
}

View File

@ -0,0 +1,60 @@
namespace Hermes.Migrations
{
using System;
using System.Data.Entity.Migrations;
public partial class V2 : DbMigration
{
public override void Up()
{
AddColumn("dbo.Preferences", "civiliteViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "nomViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "nomNaissanceViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "prenomViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "ageViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "professionViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "typeResidenceViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "mailViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "telViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "telPortViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "quartierViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "adresseViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "adresseBatimentViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "adresseNumeroBatimentViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "adresseExtViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "adresseExtCPViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "adresseExtVilleViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "dateCreationViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "dateModificationViewEnabled", c => c.Boolean(nullable: false));
AddColumn("dbo.Preferences", "windowHeight", c => c.Int(nullable: false));
AddColumn("dbo.Preferences", "windowWidth", c => c.Int(nullable: false));
AddColumn("dbo.Preferences", "windowMaximized", c => c.Boolean(nullable: false));
}
public override void Down()
{
DropColumn("dbo.Preferences", "windowMaximized");
DropColumn("dbo.Preferences", "windowWidth");
DropColumn("dbo.Preferences", "windowHeight");
DropColumn("dbo.Preferences", "dateModificationViewEnabled");
DropColumn("dbo.Preferences", "dateCreationViewEnabled");
DropColumn("dbo.Preferences", "adresseExtVilleViewEnabled");
DropColumn("dbo.Preferences", "adresseExtCPViewEnabled");
DropColumn("dbo.Preferences", "adresseExtViewEnabled");
DropColumn("dbo.Preferences", "adresseNumeroBatimentViewEnabled");
DropColumn("dbo.Preferences", "adresseBatimentViewEnabled");
DropColumn("dbo.Preferences", "adresseViewEnabled");
DropColumn("dbo.Preferences", "quartierViewEnabled");
DropColumn("dbo.Preferences", "telPortViewEnabled");
DropColumn("dbo.Preferences", "telViewEnabled");
DropColumn("dbo.Preferences", "mailViewEnabled");
DropColumn("dbo.Preferences", "typeResidenceViewEnabled");
DropColumn("dbo.Preferences", "professionViewEnabled");
DropColumn("dbo.Preferences", "ageViewEnabled");
DropColumn("dbo.Preferences", "prenomViewEnabled");
DropColumn("dbo.Preferences", "nomNaissanceViewEnabled");
DropColumn("dbo.Preferences", "nomViewEnabled");
DropColumn("dbo.Preferences", "civiliteViewEnabled");
}
}
}

View File

@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Target" xml:space="preserve">
<value>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</value>
</data>
<data name="DefaultSchema" xml:space="preserve">
<value>dbo</value>
</data>
</root>

View File

@ -23,5 +23,71 @@ namespace Hermes.Model {
public string ovhSmsConsumerKey { public string ovhSmsConsumerKey {
get; set; get; set;
} }
public bool civiliteViewEnabled {
get; set;
}
public bool nomViewEnabled {
get; set;
}
public bool nomNaissanceViewEnabled {
get; set;
}
public bool prenomViewEnabled {
get; set;
}
public bool ageViewEnabled {
get; set;
}
public bool professionViewEnabled {
get; set;
}
public bool typeResidenceViewEnabled {
get; set;
}
public bool mailViewEnabled {
get; set;
}
public bool telViewEnabled {
get; set;
}
public bool telPortViewEnabled {
get; set;
}
public bool quartierViewEnabled {
get; set;
}
public bool adresseViewEnabled {
get; set;
}
public bool adresseBatimentViewEnabled {
get; set;
}
public bool adresseNumeroBatimentViewEnabled {
get; set;
}
public bool adresseExtViewEnabled {
get; set;
}
public bool adresseExtCPViewEnabled {
get; set;
}
public bool adresseExtVilleViewEnabled {
get; set;
}
public bool dateCreationViewEnabled {
get; set;
}
public bool dateModificationViewEnabled {
get; set;
}
public int windowHeight {
get; set;
}
public int windowWidth {
get; set;
}
public bool windowMaximized {
get; set;
}
} }
} }

View File

@ -12,22 +12,22 @@ namespace Hermes {
Owner = parent; Owner = parent;
dbContext = ModelContext.Getinstance(); dbContext = ModelContext.Getinstance();
if(dbContext.Preferences.Local.Count > 0) { Preferences pref = dbContext.Preferences.Local[0];
Preferences pref = dbContext.Preferences.Local[0]; villeTextBox.Text = pref.Ville;
villeTextBox.Text = pref.Ville; villeCPTextBox.Text = pref.VilleCP;
villeCPTextBox.Text = pref.VilleCP;
ovhSmsServiceNameTextBox.Text = pref.ovhSmsServiceName; ovhSmsServiceNameTextBox.Text = pref.ovhSmsServiceName;
ovhSmsApplicationKeyTextBox.Text = pref.ovhSmsApplicationKey; ovhSmsApplicationKeyTextBox.Text = pref.ovhSmsApplicationKey;
ovhSmsApplicationSecretTextBox.Text = pref.ovhSmsApplicationSecret; ovhSmsApplicationSecretTextBox.Text = pref.ovhSmsApplicationSecret;
ovhSmsConsumerKeyTextBox.Text = pref.ovhSmsConsumerKey; ovhSmsConsumerKeyTextBox.Text = pref.ovhSmsConsumerKey;
}
} }
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) { private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
if(dbContext.Preferences.Local.Count == 0) { Preferences pref = dbContext.Preferences.Local[0];
if(string.IsNullOrWhiteSpace(pref.VilleCP) || string.IsNullOrWhiteSpace(pref.Ville)) {
MessageBox.Show("La saisie d'information sur la commune est obligatoire.", "Saisie obligatoire", MessageBoxButton.OK, MessageBoxImage.Warning); MessageBox.Show("La saisie d'information sur la commune est obligatoire.", "Saisie obligatoire", MessageBoxButton.OK, MessageBoxImage.Warning);
e.Cancel = true; e.Cancel = true;
return;
} }
} }
@ -37,34 +37,19 @@ namespace Hermes {
return; return;
} }
if(dbContext.Preferences.Local.Count == 0) { Preferences pref = dbContext.Preferences.Local[0];
Preferences pref = new Preferences(); pref.Ville = villeTextBox.Text;
pref.Ville = villeTextBox.Text; pref.VilleCP = villeCPTextBox.Text;
pref.VilleCP = villeCPTextBox.Text; pref.ovhSmsServiceName = ovhSmsServiceNameTextBox.Text;
pref.ovhSmsServiceName = ovhSmsServiceNameTextBox.Text; pref.ovhSmsApplicationKey = ovhSmsApplicationKeyTextBox.Text;
pref.ovhSmsApplicationKey = ovhSmsApplicationKeyTextBox.Text; pref.ovhSmsApplicationSecret = ovhSmsApplicationSecretTextBox.Text;
pref.ovhSmsApplicationSecret = ovhSmsApplicationSecretTextBox.Text; pref.ovhSmsConsumerKey = ovhSmsConsumerKeyTextBox.Text;
pref.ovhSmsConsumerKey = ovhSmsConsumerKeyTextBox.Text;
dbContext.Preferences.Add(pref);
} else {
Preferences pref = dbContext.Preferences.Local[0];
pref.Ville = villeTextBox.Text;
pref.VilleCP = villeCPTextBox.Text;
pref.ovhSmsServiceName = ovhSmsServiceNameTextBox.Text;
pref.ovhSmsApplicationKey = ovhSmsApplicationKeyTextBox.Text;
pref.ovhSmsApplicationSecret = ovhSmsApplicationSecretTextBox.Text;
pref.ovhSmsConsumerKey = ovhSmsConsumerKeyTextBox.Text;
}
dbContext.SaveChanges(); dbContext.SaveChanges();
Close(); Close();
} }
public void Annuler_Click(object sender, RoutedEventArgs e) { public void Annuler_Click(object sender, RoutedEventArgs e) {
if(dbContext.Preferences.Local.Count == 0) {
MessageBox.Show("La saisie d'information sur la commune est obligatoire.", "Saisie obligatoire", MessageBoxButton.OK, MessageBoxImage.Warning);
return;
}
Close(); Close();
} }
} }

View File

@ -51,6 +51,6 @@ using System.Windows;
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous : // en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1.0")] [assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.1.0")] [assembly: AssemblyFileVersion("1.0.2.0")]
[assembly: NeutralResourcesLanguage("fr-FR")] [assembly: NeutralResourcesLanguage("fr-FR")]