From 8d0e9fe8c96baa57ee26e1c958d3e766dd027ce4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 1 Jan 2021 23:53:32 +0000 Subject: [PATCH] --- server/AyaNova/DataList/UnitDataList.cs | 84 ++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/server/AyaNova/DataList/UnitDataList.cs b/server/AyaNova/DataList/UnitDataList.cs index e4ea6757..227eec78 100644 --- a/server/AyaNova/DataList/UnitDataList.cs +++ b/server/AyaNova/DataList/UnitDataList.cs @@ -8,12 +8,12 @@ namespace AyaNova.DataList public UnitDataList() { DefaultListObjectType = AyaType.Unit; - SQLFrom = "from aunit " - + "left outer join acustomer on (aunit.customerid=acustomer.id) " - + "left outer join aunit as aparentunit on (aunit.parentunitid=aunit.id and aunit.parentunitid <> null) " - + "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id and aunit.unitmodelid <> null) " - + "left outer join avendor on (aunit.purchasedfromvendorid=avendor.id and aunit.purchasedfromvendorid <> null) " - + "left outer join aunit as areplacedbyunit on (aunit.replacedbyunitid=aunit.id and aunit.replacedbyunitid <> null) "; + SQLFrom = "from aunit as amainunit " + + "left outer join acustomer on (amainunit.customerid=acustomer.id) " + + "left outer join aunit as aparentunit on (amainunit.parentunitid=aparentunit.id and amainunit.parentunitid is not null) " + + "left outer join aunitmodel on (amainunit.unitmodelid=aunitmodel.id and amainunit.unitmodelid is not null) " + + "left outer join avendor on (amainunit.purchasedfromvendorid=avendor.id and amainunit.purchasedfromvendorid is not null) " + + "left outer join aunit as areplacedbyunit on (amainunit.replacedbyunitid=areplacedbyunit.id and amainunit.replacedbyunitid is not null) "; var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; @@ -51,8 +51,8 @@ namespace AyaNova.DataList FieldKey = "UnitSerial", AyaObjectType = (int)AyaType.Unit, UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "aunit.id", - SqlValueColumnName = "aunit.serial", + SqlIdColumnName = "amainunit.id", + SqlValueColumnName = "amainunit.serial", IsRowId = true }); @@ -61,7 +61,7 @@ namespace AyaNova.DataList TKey = "UnitNotes", FieldKey = "unitnotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.notes" + SqlValueColumnName = "amainunit.notes" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -69,7 +69,7 @@ namespace AyaNova.DataList TKey = "Active", FieldKey = "Active", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.active" + SqlValueColumnName = "amainunit.active" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -77,7 +77,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "unittags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aunit.tags" + SqlValueColumnName = "amainunit.tags" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -125,7 +125,7 @@ namespace AyaNova.DataList TKey = "UnitUnitHasOwnAddress", FieldKey = "UnitUnitHasOwnAddress", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.unithasownaddress" + SqlValueColumnName = "amainunit.unithasownaddress" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -133,7 +133,7 @@ namespace AyaNova.DataList TKey = "UnitBoughtHere", FieldKey = "UnitBoughtHere", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.boughthere" + SqlValueColumnName = "amainunit.boughthere" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -151,7 +151,7 @@ namespace AyaNova.DataList TKey = "UnitReceipt", FieldKey = "UnitReceipt", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.receipt" + SqlValueColumnName = "amainunit.receipt" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -159,7 +159,7 @@ namespace AyaNova.DataList TKey = "UnitPurchasedDate", FieldKey = "UnitPurchasedDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aunit.purchaseddate" + SqlValueColumnName = "amainunit.purchaseddate" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -167,7 +167,7 @@ namespace AyaNova.DataList TKey = "UnitDescription", FieldKey = "UnitDescription", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.description" + SqlValueColumnName = "amainunit.description" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -175,7 +175,7 @@ namespace AyaNova.DataList TKey = "UnitOverrideWarranty", FieldKey = "UnitOverrideWarranty", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.overridemodelwarranty" + SqlValueColumnName = "amainunit.overridemodelwarranty" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -183,7 +183,7 @@ namespace AyaNova.DataList TKey = "UnitOverrideLength", FieldKey = "UnitOverrideLength", UiFieldDataType = (int)UiFieldDataType.Integer, - SqlValueColumnName = "aunit.warrantylength" + SqlValueColumnName = "amainunit.warrantylength" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -191,7 +191,7 @@ namespace AyaNova.DataList TKey = "UnitOverrideLifeTime", FieldKey = "UnitOverrideLifeTime", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.lifetimewarranty" + SqlValueColumnName = "amainunit.lifetimewarranty" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -199,7 +199,7 @@ namespace AyaNova.DataList TKey = "UnitOverrideWarrantyTerms", FieldKey = "UnitOverrideWarrantyTerms", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.warrantyterms" + SqlValueColumnName = "amainunit.warrantyterms" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -207,7 +207,7 @@ namespace AyaNova.DataList TKey = "UsesBanking", FieldKey = "UsesBanking", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.usesbanking" + SqlValueColumnName = "amainunit.usesbanking" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -215,7 +215,7 @@ namespace AyaNova.DataList TKey = "UnitMetered", FieldKey = "UnitMetered", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aunit.metered" + SqlValueColumnName = "amainunit.metered" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -223,7 +223,7 @@ namespace AyaNova.DataList TKey = "UnitText1", FieldKey = "UnitText1", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.text1" + SqlValueColumnName = "amainunit.text1" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -231,7 +231,7 @@ namespace AyaNova.DataList TKey = "UnitText2", FieldKey = "UnitText2", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.text2" + SqlValueColumnName = "amainunit.text2" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -239,7 +239,7 @@ namespace AyaNova.DataList TKey = "UnitText3", FieldKey = "UnitText3", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.text3" + SqlValueColumnName = "amainunit.text3" }); FieldDefinitions.Add(new AyaDataListFieldDefinition @@ -247,26 +247,26 @@ namespace AyaNova.DataList TKey = "UnitText4", FieldKey = "UnitText4", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aunit.text4" + SqlValueColumnName = "amainunit.text4" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom1", FieldKey = "unitcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom2", FieldKey = "unitcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom3", FieldKey = "unitcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom4", FieldKey = "unitcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom5", FieldKey = "unitcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom6", FieldKey = "unitcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom7", FieldKey = "unitcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom8", FieldKey = "unitcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom9", FieldKey = "unitcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom10", FieldKey = "unitcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom11", FieldKey = "unitcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom12", FieldKey = "unitcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom13", FieldKey = "unitcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom14", FieldKey = "unitcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom15", FieldKey = "unitcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom16", FieldKey = "unitcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom1", FieldKey = "unitcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom2", FieldKey = "unitcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom3", FieldKey = "unitcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom4", FieldKey = "unitcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom5", FieldKey = "unitcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom6", FieldKey = "unitcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom7", FieldKey = "unitcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom8", FieldKey = "unitcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom9", FieldKey = "unitcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom10", FieldKey = "unitcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom11", FieldKey = "unitcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom12", FieldKey = "unitcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom13", FieldKey = "unitcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom14", FieldKey = "unitcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom15", FieldKey = "unitcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom16", FieldKey = "unitcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "amainunit.customfields" }); } }//eoc }//eons \ No newline at end of file