diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 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/docs/8.0/ayanova/docs/form-cust-headoffices.md b/docs/8.0/ayanova/docs/form-cust-head-offices.md similarity index 100% rename from docs/8.0/ayanova/docs/form-cust-headoffices.md rename to docs/8.0/ayanova/docs/form-cust-head-offices.md diff --git a/docs/8.0/ayanova/mkdocs.yml b/docs/8.0/ayanova/mkdocs.yml index 803b169f..ffdadb72 100644 --- a/docs/8.0/ayanova/mkdocs.yml +++ b/docs/8.0/ayanova/mkdocs.yml @@ -44,7 +44,7 @@ nav: - 'Notifications list': 'form-home-notifications.md' - Customers: - 'Customers': 'form-cust-customers.md' - - 'Head offices': 'form-cust-headoffices.md' + - 'Head offices': 'form-cust-head-offices.md' - Service: - 'Schedule': 'form-svc-schedule.md' - 'Workorders': 'form-svc-workorders.md' diff --git a/server/AyaNova/DataList/CustomerDataList.cs b/server/AyaNova/DataList/CustomerDataList.cs index 3c652df1..240bd955 100644 --- a/server/AyaNova/DataList/CustomerDataList.cs +++ b/server/AyaNova/DataList/CustomerDataList.cs @@ -28,6 +28,12 @@ namespace AyaNova.DataList cm = new JObject(); cm.fld = "customeremail"; dlistView.Add(cm); + + + cm = new JObject(); + cm.fld = "customerheadoffice"; + dlistView.Add(cm); + DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); @@ -85,6 +91,16 @@ namespace AyaNova.DataList SqlValueColumnName = "acustomer.popupnotes" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "HeadOffice", + FieldKey = "customerheadoffice", + UiFieldDataType = (int)UiFieldDataType.Text, + AyaObjectType = (int)AyaType.HeadOffice, + SqlIdColumnName = "aheadoffice.id", + SqlValueColumnName = "aheadoffice.name" + }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerBillHeadOffice", diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 89908224..47ddd43a 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -226,7 +226,7 @@ namespace AyaNova.Util await GenSeedCustomerAsync(log, 100); //HEAD-OFFICES - await GenSeedHeadOfficeAsync(log, 2); + await GenSeedHeadOfficeAsync(log, 10); @@ -286,7 +286,7 @@ namespace AyaNova.Util await GenSeedCustomerAsync(log, 500); //HEAD-OFFICES - await GenSeedHeadOfficeAsync(log, 4); + await GenSeedHeadOfficeAsync(log, 20); //PERF watch.Stop(); @@ -360,7 +360,7 @@ namespace AyaNova.Util await GenSeedCustomerAsync(log, 5000); //HEAD-OFFICES - await GenSeedHeadOfficeAsync(log, 8); + await GenSeedHeadOfficeAsync(log, 30); //PERF watch.Stop(); @@ -434,7 +434,7 @@ namespace AyaNova.Util await GenSeedCustomerAsync(log, 20000); //HEAD-OFFICES - await GenSeedHeadOfficeAsync(log, 16); + await GenSeedHeadOfficeAsync(log, 40); //PERF watch.Stop(); @@ -823,7 +823,7 @@ namespace AyaNova.Util //HeadOffice contacts await GenSeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.HeadOffice, true, null, null, 0, null, null, null, NewObject.Id); //HeadOffice Customer - await GenSeedCustomerAsync(log, 1, NewObject.Id); + await GenSeedCustomerAsync(log, 2, NewObject.Id); } }