diff --git a/Sources/Data/tables.sql b/Sources/Data/tables.sql index 7ea8a68..30b580d 100644 --- a/Sources/Data/tables.sql +++ b/Sources/Data/tables.sql @@ -69,7 +69,7 @@ CREATE TABLE Echeancier methodePayement varchar(20), isDebit boolean, tag varchar(30), - CONSTRAINT ck_methEch CHECK (methodePayement IN ('Cb','Esp','Chq','Vir','Pre', 'None')), + CONSTRAINT ck_methEch CHECK (methodePayement IN ('None','CB','Espece','Cheque','Virement', 'Prevelement')), CONSTRAINT ck_tagEch CHECK (tag IN ('Alimentaire','Carburant','Habitation','Energie','Telephonie','Loisir','Restauration','Divers','Transport','Transaction','Santé')), FOREIGN KEY(compte) REFERENCES Compte(id) ); @@ -85,7 +85,7 @@ CREATE TABLE Operation isDebit boolean, fromBanque boolean, tag varchar(30), - CONSTRAINT ck_methOpe CHECK (methodePayement IN ('Cb','Esp','Chq','Vir','Pre', 'None')), + CONSTRAINT ck_methOpe CHECK (methodePayement IN ('None','CB','Espece','Cheque','Virement', 'Prevelement')), CONSTRAINT ck_tagOpe CHECK (tag IN ('Alimentaire','Carburant','Habitation','Energie','Telephonie','Loisir','Restauration','Divers','Transport','Transaction','Santé')), FOREIGN KEY(compte) REFERENCES Compte(id) ); @@ -100,7 +100,7 @@ CREATE TABLE Planification methodePayement varchar(20), isDebit boolean, tag varchar(30), - CONSTRAINT ck_methPla CHECK (methodePayement IN ('Cb','Esp','Chq','Vir','Pre', 'None')), + CONSTRAINT ck_methPla CHECK (methodePayement IN ('None','CB','Espece','Cheque','Virement', 'Prevelement')), CONSTRAINT ck_tagPla CHECK (tag IN ('Alimentaire','Carburant','Habitation','Energie','Telephonie','Loisir','Restauration','Divers','Transport','Transaction','Santé')), FOREIGN KEY(compte) REFERENCES Compte(id) ); \ No newline at end of file diff --git a/Sources/Modele/Echeance.cs b/Sources/Modele/Echeance.cs index 4ebfa82..939ebcb 100644 --- a/Sources/Modele/Echeance.cs +++ b/Sources/Modele/Echeance.cs @@ -23,12 +23,12 @@ namespace Model public TagOperation Tag { get; private set; } [JsonConstructor] - public Echeance(string nom, double montant, DateTime dateOperation, MethodePayement modePayement, TagOperation tag, bool isDebit = true) + public Echeance(string nom, double montant, DateTime dateOperation, MethodePayement methodePayement, TagOperation tag, bool isDebit = true) { Nom = nom; Montant = montant; DateOperation = dateOperation; - ModePayement = modePayement; + ModePayement = methodePayement; IsDebit = isDebit; Tag = tag; } diff --git a/Sources/Modele/Operation.cs b/Sources/Modele/Operation.cs index e53c9e7..9d33be2 100644 --- a/Sources/Modele/Operation.cs +++ b/Sources/Modele/Operation.cs @@ -38,12 +38,12 @@ namespace Model public bool FromBanque { get; private set; } [JsonConstructor] - public Operation(string nom, double montant, DateTime dateOperation, MethodePayement modePayement, TagOperation tag, bool fromBanque, bool isDebit=true) + public Operation(string nom, double montant, DateTime dateOperation, MethodePayement methodePayement, TagOperation tag, bool fromBanque, bool isDebit=true) { Nom = nom; Montant = montant; DateOperation = dateOperation; - ModePayement = modePayement; + ModePayement = methodePayement; IsDebit = isDebit; Tag = tag; FromBanque = fromBanque; diff --git a/Sources/Modele/Planification.cs b/Sources/Modele/Planification.cs index 0d80630..72dd5e3 100644 --- a/Sources/Modele/Planification.cs +++ b/Sources/Modele/Planification.cs @@ -24,12 +24,12 @@ namespace Model public TagOperation Tag { get; private set; } [JsonConstructor] - public Planification(string nom, double montant, DateTime dateOperation, MethodePayement modePayement, TagOperation tag, bool isDebit = true) + public Planification(string nom, double montant, DateTime dateOperation, MethodePayement methodePayement, TagOperation tag, bool isDebit = true) { Nom = nom; Montant = montant; DateOperation = dateOperation; - ModePayement = modePayement; + ModePayement = methodePayement; IsDebit = isDebit; Tag = tag; }