admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-03-06 01:12:27 +00:00
parent a11e423375
commit 2ecfb25f94
6 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

9
server/AyaNova/biz/ContractBiz.cs
View File

@@ -98,7 +98,14 @@ namespace AyaNova.Biz
// //
internal async Task<Contract> GetAsync(long id, bool logTheGetEvent = true) internal async Task<Contract> GetAsync(long id, bool logTheGetEvent = true)
{ {
var ret = await ct.Contract.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id); var ret = await ct.Contract
.Include(z => z.ContractPartOverrideItems)
.Include(z => z.ContractServiceRateOverrideItems)
.Include(z => z.ContractTravelRateOverrideItems)
.Include(z => z.ServiceRateItems)
.Include(z => z.TravelRateItems)
.AsNoTracking()
.SingleOrDefaultAsync(m => m.Id == id);
if (logTheGetEvent && ret != null) if (logTheGetEvent && ret != null)
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
return ret; return ret;

1
server/AyaNova/resource/de.json
View File

@@ -197,6 +197,7 @@
"ContractDefaultAdjustments": "Standardpreisanpassungen", "ContractDefaultAdjustments": "Standardpreisanpassungen",
"ContractTaggedAdjustments": "Verschlagwortet mit Preisanpassungen", "ContractTaggedAdjustments": "Verschlagwortet mit Preisanpassungen",
"ContractDefaultResponseTime": "Reaktionszeit", "ContractDefaultResponseTime": "Reaktionszeit",
"ContractAdjustment":"Preisanpassung",
"ContractOverrideType": "Preisanpassungsart", "ContractOverrideType": "Preisanpassungsart",
"ContractOverrideTypePriceDiscount": "Preis minus Prozentsatz", "ContractOverrideTypePriceDiscount": "Preis minus Prozentsatz",
"ContractOverrideTypeMarkup": "Kosten plus Prozentsatz", "ContractOverrideTypeMarkup": "Kosten plus Prozentsatz",

1
server/AyaNova/resource/en.json
View File

@@ -197,6 +197,7 @@
"ContractDefaultAdjustments": "Default price adjustments", "ContractDefaultAdjustments": "Default price adjustments",
"ContractTaggedAdjustments": "Tagged price adjustments", "ContractTaggedAdjustments": "Tagged price adjustments",
"ContractDefaultResponseTime": "Response time", "ContractDefaultResponseTime": "Response time",
"ContractAdjustment":"Adjustment",
"ContractOverrideType": "Price adjustment type", "ContractOverrideType": "Price adjustment type",
"ContractOverrideTypePriceDiscount": "Price minus percentage", "ContractOverrideTypePriceDiscount": "Price minus percentage",
"ContractOverrideTypeMarkup": "Cost plus percentage", "ContractOverrideTypeMarkup": "Cost plus percentage",

1
server/AyaNova/resource/es.json
View File

@@ -197,6 +197,7 @@
"ContractDefaultAdjustments": "Ajustes de precio predeterminados", "ContractDefaultAdjustments": "Ajustes de precio predeterminados",
"ContractTaggedAdjustments": "Ajustes de precio etiquetados", "ContractTaggedAdjustments": "Ajustes de precio etiquetados",
"ContractDefaultResponseTime": "Tiempo de respuesta", "ContractDefaultResponseTime": "Tiempo de respuesta",
"ContractAdjustment":"Ajuste de precio",
"ContractOverrideType": "Tipo de ajuste de precio", "ContractOverrideType": "Tipo de ajuste de precio",
"ContractOverrideTypePriceDiscount": "Precio menos porcentaje", "ContractOverrideTypePriceDiscount": "Precio menos porcentaje",
"ContractOverrideTypeMarkup": "Costo más porcentaje", "ContractOverrideTypeMarkup": "Costo más porcentaje",

1
server/AyaNova/resource/fr.json
View File

@@ -197,6 +197,7 @@
"ContractDefaultAdjustments": "Ajustements de prix par défaut", "ContractDefaultAdjustments": "Ajustements de prix par défaut",
"ContractTaggedAdjustments": "Ajustements de prix balisés", "ContractTaggedAdjustments": "Ajustements de prix balisés",
"ContractDefaultResponseTime": "Temps de réponse", "ContractDefaultResponseTime": "Temps de réponse",
"ContractAdjustment":"Ajustement de prix",
"ContractOverrideType": "Type d'ajustement de prix", "ContractOverrideType": "Type d'ajustement de prix",
"ContractOverrideTypePriceDiscount": "Prix moins pourcentage", "ContractOverrideTypePriceDiscount": "Prix moins pourcentage",
"ContractOverrideTypeMarkup": "Coût plus pourcentage", "ContractOverrideTypeMarkup": "Coût plus pourcentage",