From 122be16d5fc4c8ae4d29f244b84a04994ef5c44c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 2 Jun 2021 19:46:16 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/FormFieldReference.cs | 6 ++++++ server/AyaNova/resource/de.json | 6 ++++++ server/AyaNova/resource/en.json | 18 ++++++++++++------ server/AyaNova/resource/es.json | 6 ++++++ server/AyaNova/resource/fr.json | 6 ++++++ 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b77f3b95..fcc80a75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 75c30731..9e2c64e8 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -297,6 +297,12 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "LoanUnitRateWeek", FieldKey = "RateWeek" }); l.Add(new FormField { TKey = "LoanUnitRateMonth", FieldKey = "RateMonth" }); l.Add(new FormField { TKey = "LoanUnitRateYear", FieldKey = "RateYear" }); + l.Add(new FormField { TKey = "LoanUnitRateHourCost", FieldKey = "RateHourCost" }); + l.Add(new FormField { TKey = "LoanUnitRateHalfDayCost", FieldKey = "RateHalfDayCost" }); + l.Add(new FormField { TKey = "LoanUnitRateDayCost", FieldKey = "RateDayCost" }); + l.Add(new FormField { TKey = "LoanUnitRateWeekCost", FieldKey = "RateWeekCost" }); + l.Add(new FormField { TKey = "LoanUnitRateMonthCost", FieldKey = "RateMonthCost" }); + l.Add(new FormField { TKey = "LoanUnitRateYearCost", FieldKey = "RateYearCost" }); l.Add(new FormField { TKey = "LoanUnitDefaultRate", FieldKey = "DefaultRate" }); l.Add(new FormField { TKey = "LoanUnitShadowUnit", FieldKey = "UnitId" }); l.Add(new FormField { TKey = "LoanUnitNotes", FieldKey = "Notes" }); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 7cfeae1f..04a512cd 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -396,6 +396,12 @@ "LoanUnitDefaultRate": "Standardrate", "LoanUnitSerial": "Seriennummer", "LoanUnitShadowUnit": "Schatteneinheit", + "LoanUnitRateDayCost": "Tägliche Kosten", + "LoanUnitRateHalfDayCost": "Halber Tag Kosten", + "LoanUnitRateHourCost": "Stundenkosten", + "LoanUnitRateMonthCost": "Monatliche Kosten", + "LoanUnitRateWeekCost": "Wöchentliche Kosten", + "LoanUnitRateYearCost": "Jährliche Kosten", "TranslationCustomizeText": "Customize text", "TranslationExport": "Gebietsschema in Datei exportieren", "TranslationImport": "Gebietsschema aus Datei importieren", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 75194c5c..eca33edf 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -386,16 +386,22 @@ "LoanUnitList": "Loan Items", "LoanUnitName": "Name", "LoanUnitNotes": "Notes", - "LoanUnitRateDay": "Day", - "LoanUnitRateHalfDay": "Half day", - "LoanUnitRateHour": "Hour", - "LoanUnitRateMonth": "Month", + "LoanUnitRateDay": "Daily charge", + "LoanUnitRateHalfDay": "Half day charge", + "LoanUnitRateHour": "Hourly charge", + "LoanUnitRateMonth": "Monthly charge", "LoanUnitRateNone": "-", - "LoanUnitRateWeek": "Week", - "LoanUnitRateYear": "Year", + "LoanUnitRateWeek": "Weekly charge", + "LoanUnitRateYear": "Yearly charge", "LoanUnitDefaultRate": "Default rate", "LoanUnitSerial": "Serial number", "LoanUnitShadowUnit": "Shadow Unit", + "LoanUnitRateDayCost": "Daily cost", + "LoanUnitRateHalfDayCost": "Half day cost", + "LoanUnitRateHourCost": "Hourly cost", + "LoanUnitRateMonthCost": "Monthly cost", + "LoanUnitRateWeekCost": "Weekly cost", + "LoanUnitRateYearCost": "Yearly cost", "TranslationCustomizeText": "Customize text", "TranslationExport": "Export translation to file", "TranslationImport": "Import translation from file", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index b60d6157..a27ec560 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -396,6 +396,12 @@ "LoanUnitDefaultRate": "Tasa de incumplimiento", "LoanUnitSerial": "Número de serie", "LoanUnitShadowUnit": "Unidad de sombra", + "LoanUnitRateDayCost": "Costo diario", + "LoanUnitRateHalfDayCost": "Costo de medio día", + "LoanUnitRateHourCost": "Costo por hora", + "LoanUnitRateMonthCost": "Costo mensual", + "LoanUnitRateWeekCost": "Costo semanal", + "LoanUnitRateYearCost": "Costo anual", "TranslationCustomizeText": "Customize text", "TranslationExport": "Exportar localización en archivo", "TranslationImport": "Importar localización desde archivo", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 9fbd5997..afff32d7 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -396,6 +396,12 @@ "LoanUnitDefaultRate": "Taux de défaut", "LoanUnitSerial": "Numéro de série", "LoanUnitShadowUnit": "Unité de l'ombre", + "LoanUnitRateDayCost": "Coût journalier", + "LoanUnitRateHalfDayCost": "Cout demi-journée", + "LoanUnitRateHourCost": "Coût horaire", + "LoanUnitRateMonthCost": "Coût mensuel", + "LoanUnitRateWeekCost": "Coût hebdomadaire", + "LoanUnitRateYearCost": "Coût annuel", "TranslationCustomizeText": "Customize text", "TranslationExport": "Exporter les paramètres régionaux dans le fichier", "TranslationImport": "Importer les paramètres régionaux du fichier",