From 4d1c95c375e2158e3ccaf9508131e41c29c25fb0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 13 Dec 2022 23:09:34 +0000 Subject: [PATCH] case 4341 --- docs/8.0/ayanova/docs/ay-report-edit.md | 1 + server/AyaNova/DataList/CustomerDataList.cs | 10 +++++++- server/AyaNova/DataList/HeadOfficeDataList.cs | 8 +++++++ server/AyaNova/DataList/PMDataList.cs | 8 +++++++ server/AyaNova/DataList/PMItemDataList.cs | 8 +++++++ .../AyaNova/DataList/PMItemExpenseDataList.cs | 8 +++++++ .../AyaNova/DataList/PMItemLaborDataList.cs | 8 +++++++ server/AyaNova/DataList/PMItemLoanDataList.cs | 8 +++++++ .../DataList/PMItemOutsideServiceDataList.cs | 8 +++++++ server/AyaNova/DataList/PMItemPartDataList.cs | 8 +++++++ .../DataList/PMItemScheduledUserDataList.cs | 8 +++++++ server/AyaNova/DataList/PMItemTaskDataList.cs | 8 +++++++ server/AyaNova/util/Seeder.cs | 23 +++++++++++++++++++ 13 files changed, 113 insertions(+), 1 deletion(-) diff --git a/docs/8.0/ayanova/docs/ay-report-edit.md b/docs/8.0/ayanova/docs/ay-report-edit.md index 1530cc98..4e53afb2 100644 --- a/docs/8.0/ayanova/docs/ay-report-edit.md +++ b/docs/8.0/ayanova/docs/ay-report-edit.md @@ -329,6 +329,7 @@ ayServerMetaData: "CompanyCity": "Port Wilfred", "CompanyRegion": "ExampleRegion", "CompanyCountry": "ExampleCountry", + "CompanyAddressPostal": "12398218", "CompanyLatitude": 13.6747, "CompanyLongitude": -70.6925 } diff --git a/server/AyaNova/DataList/CustomerDataList.cs b/server/AyaNova/DataList/CustomerDataList.cs index 993f68d7..fa8d9129 100644 --- a/server/AyaNova/DataList/CustomerDataList.cs +++ b/server/AyaNova/DataList/CustomerDataList.cs @@ -9,7 +9,7 @@ namespace AyaNova.DataList { public CustomerDataList(long translationId) { - DefaultListAType = AyaType.Customer; + DefaultListAType = AyaType.Customer; SQLFrom = @"FROM ACUSTOMER LEFT JOIN AHEADOFFICE ON (ACUSTOMER.HEADOFFICEID = AHEADOFFICE.ID) LEFT JOIN ACONTRACT ON (ACUSTOMER.CONTRACTID = ACONTRACT.ID) @@ -282,6 +282,14 @@ LEFT JOIN LATERAL SqlValueColumnName = "acustomer.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "customeraddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "acustomer.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/HeadOfficeDataList.cs b/server/AyaNova/DataList/HeadOfficeDataList.cs index ee6e3e9f..d073a416 100644 --- a/server/AyaNova/DataList/HeadOfficeDataList.cs +++ b/server/AyaNova/DataList/HeadOfficeDataList.cs @@ -215,6 +215,14 @@ namespace AyaNova.DataList SqlValueColumnName = "aheadoffice.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "headofficeaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aheadoffice.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMDataList.cs b/server/AyaNova/DataList/PMDataList.cs index 46bbdff9..a27f6fe9 100644 --- a/server/AyaNova/DataList/PMDataList.cs +++ b/server/AyaNova/DataList/PMDataList.cs @@ -233,6 +233,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemDataList.cs b/server/AyaNova/DataList/PMItemDataList.cs index d3a76541..7b665a07 100644 --- a/server/AyaNova/DataList/PMItemDataList.cs +++ b/server/AyaNova/DataList/PMItemDataList.cs @@ -372,6 +372,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemExpenseDataList.cs b/server/AyaNova/DataList/PMItemExpenseDataList.cs index 2de2c15a..0655c45d 100644 --- a/server/AyaNova/DataList/PMItemExpenseDataList.cs +++ b/server/AyaNova/DataList/PMItemExpenseDataList.cs @@ -476,6 +476,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemLaborDataList.cs b/server/AyaNova/DataList/PMItemLaborDataList.cs index 52be0d33..1e980633 100644 --- a/server/AyaNova/DataList/PMItemLaborDataList.cs +++ b/server/AyaNova/DataList/PMItemLaborDataList.cs @@ -492,6 +492,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemLoanDataList.cs b/server/AyaNova/DataList/PMItemLoanDataList.cs index f1161572..dff2ac80 100644 --- a/server/AyaNova/DataList/PMItemLoanDataList.cs +++ b/server/AyaNova/DataList/PMItemLoanDataList.cs @@ -481,6 +481,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs b/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs index 73e1e881..39454338 100644 --- a/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs +++ b/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs @@ -496,6 +496,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemPartDataList.cs b/server/AyaNova/DataList/PMItemPartDataList.cs index 6015e9ef..76aeddc9 100644 --- a/server/AyaNova/DataList/PMItemPartDataList.cs +++ b/server/AyaNova/DataList/PMItemPartDataList.cs @@ -490,6 +490,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemScheduledUserDataList.cs b/server/AyaNova/DataList/PMItemScheduledUserDataList.cs index 60ef585e..9c6d8cf6 100644 --- a/server/AyaNova/DataList/PMItemScheduledUserDataList.cs +++ b/server/AyaNova/DataList/PMItemScheduledUserDataList.cs @@ -463,6 +463,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/DataList/PMItemTaskDataList.cs b/server/AyaNova/DataList/PMItemTaskDataList.cs index a48e389b..8c82573b 100644 --- a/server/AyaNova/DataList/PMItemTaskDataList.cs +++ b/server/AyaNova/DataList/PMItemTaskDataList.cs @@ -450,6 +450,14 @@ namespace AyaNova.DataList SqlValueColumnName = "apm.country" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostal", + FieldKey = "workorderaddresspostal", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "apm.postcodestreet" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "AddressLatitude", diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 929059a4..83ecc7ea 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -856,6 +856,11 @@ namespace AyaNova.Util ho.City = Fake.Address.City(); ho.Region = Fake.Address.State(); ho.Country = Fake.Address.Country(); + ho.PostAddress = Fake.Address.StreetAddress(); + ho.PostCity = ho.City; + ho.PostRegion = ho.Region; + ho.PostCountry = ho.Country; + ho.AddressPostal = ho.PostCode = Fake.Address.ZipCode(); ho.Phone1 = Fake.Phone.PhoneNumber(); ho.Phone2 = Fake.Phone.PhoneNumber(); @@ -902,6 +907,11 @@ namespace AyaNova.Util o.City = Fake.Address.City(); o.Region = Fake.Address.State(); o.Country = Fake.Address.Country(); + o.PostAddress = Fake.Address.StreetAddress(); + o.PostCity = o.City; + o.PostRegion = o.Region; + o.PostCountry = o.Country; + o.AddressPostal = o.PostCode = Fake.Address.ZipCode(); o.Phone1 = Fake.Phone.PhoneNumber(); o.Phone2 = Fake.Phone.PhoneNumber(); @@ -989,6 +999,12 @@ namespace AyaNova.Util o.Region = Fake.Address.State(); o.Country = Fake.Address.Country(); + o.PostAddress = Fake.Address.StreetAddress(); + o.PostCity = o.City; + o.PostRegion = o.Region; + o.PostCountry = o.Country; + o.AddressPostal = o.PostCode = Fake.Address.ZipCode(); + o.Phone1 = Fake.Phone.PhoneNumber(); o.Phone2 = Fake.Phone.PhoneNumber(); o.Phone3 = Fake.Phone.PhoneNumber(); @@ -2131,6 +2147,12 @@ namespace AyaNova.Util o.Region = Fake.Address.State(); o.Country = Fake.Address.Country(); + o.PostAddress = Fake.Address.StreetAddress(); + o.PostCity = o.City; + o.PostRegion = o.Region; + o.PostCountry = o.Country; + o.AddressPostal = o.PostCode = Fake.Address.ZipCode(); + o.Phone1 = Fake.Phone.PhoneNumber(); o.Phone2 = Fake.Phone.PhoneNumber(); o.Phone3 = Fake.Phone.PhoneNumber(); @@ -3903,6 +3925,7 @@ namespace AyaNova.Util o.City = cust.City; o.Region = cust.Region; o.Country = cust.Country; + o.AddressPostal = cust.AddressPostal; if (cust.BillHeadOffice && cust.HeadOfficeId != null)