From 045bf43bf1cc67e5ebf92faa4db02ef61f9b7379 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 11 Nov 2020 01:07:53 +0000 Subject: [PATCH] --- server/AyaNova/DataList/CustomerDataList.cs | 215 +++++++++++++------- 1 file changed, 139 insertions(+), 76 deletions(-) diff --git a/server/AyaNova/DataList/CustomerDataList.cs b/server/AyaNova/DataList/CustomerDataList.cs index 0ca88b09..f557ae02 100644 --- a/server/AyaNova/DataList/CustomerDataList.cs +++ b/server/AyaNova/DataList/CustomerDataList.cs @@ -8,7 +8,7 @@ namespace AyaNova.DataList public CustomerDataList() { DefaultListObjectType = AyaType.Customer; - SQLFrom = "from acustomer"; + SQLFrom = "from acustomer left outer join aheadoffice on (acustomer.headofficeid=aheadoffice.id) left outer join acontract on (acustomer.contractid=acontract.id)"; var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; @@ -21,92 +21,168 @@ namespace AyaNova.DataList dlistView.Add(cm); cm = new JObject(); - cm.fld = "customeraccountnumber"; + cm.fld = "customerphone1"; dlistView.Add(cm); cm = new JObject(); - cm.fld = "active"; + cm.fld = "customeremail"; dlistView.Add(cm); - - DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); - - // DefaultDataListView = @" - // { - // [{key:""COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}] - - // ""full"":[""widgetname"",""widgetserial"",""widgetdollaramount"",""widgetusertype"",""widgetstartdate"",""widgetactive"",""username""], - - // } - // "; - - //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined (in this case User) table need to be specified completely + //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely FieldDefinitions = new List(); - //DEPRECATED: FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "df", AyaObjectType = (int)AyaType.Customer, SqlIdColumnName = "awidget.id", IsFilterable = false, IsSortable = false, }); FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerName", - FieldKey = "widgetname", + FieldKey = "customername", AyaObjectType = (int)AyaType.Customer, UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "awidget.id", - SqlValueColumnName = "awidget.name", + SqlIdColumnName = "acustomer.id", + SqlValueColumnName = "acustomer.name", IsRowId = true }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "CustomerNotes", + FieldKey = "customernotes", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "acustomer.notes" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "Active", + FieldKey = "customeractive", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "acustomer.active" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "Tags", + FieldKey = "customertags", + UiFieldDataType = (int)UiFieldDataType.Tags, + SqlValueColumnName = "acustomer.tags" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "WebAddress", + FieldKey = "customerwebaddress", + UiFieldDataType = (int)UiFieldDataType.HTTP, + SqlValueColumnName = "acustomer.webaddress" + }); + + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "CustomerPopUpNotes", + FieldKey = "customerpopupnotes", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "acustomer.popupnotes" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "CustomerBillHeadOffice", + FieldKey = "customerbillheadoffice", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "acustomer.billheadoffice" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "CustomerTechNotes", + FieldKey = "customertechnotes", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "acustomer.technotes" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "CustomerAccountNumber", + FieldKey = "customeraccountnumber", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "acustomer.accountnumber" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "UsesBanking", + FieldKey = "usesbanking", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "acustomer.usesbanking" + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "CustomerStartDate", + FieldKey = "customerstartdate", + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlValueColumnName = "acustomer.startdate" + }); + + + + + + + + + + //------- FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerSerial", - FieldKey = "widgetserial", + FieldKey = "customerserial", UiFieldDataType = (int)UiFieldDataType.Integer, - SqlValueColumnName = "awidget.serial" + SqlValueColumnName = "acustomer.serial" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerDollarAmount", - FieldKey = "widgetdollaramount", + FieldKey = "customerdollaramount", UiFieldDataType = (int)UiFieldDataType.Currency, - SqlValueColumnName = "awidget.dollaramount" + SqlValueColumnName = "acustomer.dollaramount" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCount", - FieldKey = "widgetcount", + FieldKey = "customercount", UiFieldDataType = (int)UiFieldDataType.Integer, - SqlValueColumnName = "awidget.count" + SqlValueColumnName = "acustomer.count" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UserType", - FieldKey = "widgetusertype", + FieldKey = "customerusertype", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()), - SqlValueColumnName = "awidget.usertype" + SqlValueColumnName = "acustomer.usertype" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "CustomerStartDate", - FieldKey = "widgetstartdate", - UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "awidget.startdate" - }); - FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "CustomerEndDate", - FieldKey = "widgetenddate", - UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "awidget.enddate" - }); - FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "CustomerNotes", - FieldKey = "widgetnotes", + { + TKey = "Contract", + FieldKey = "Contract", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "awidget.notes" + AyaObjectType = (int)AyaType.Contract, + SqlIdColumnName = "acontract.id", + SqlValueColumnName = "acontract.name" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "ContractExpires", + FieldKey = "contractexpires", + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlValueColumnName = "acustomer.contractexpires" + }); + + //FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "User", FieldKey = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.User }); FieldDefinitions.Add(new AyaDataListFieldDefinition { @@ -117,37 +193,24 @@ namespace AyaNova.DataList SqlIdColumnName = "auser.id", SqlValueColumnName = "auser.name" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "Active", - FieldKey = "widgetactive", - UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "awidget.active" - }); - FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "Tags", - FieldKey = "widgettags", - UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "awidget.tags" - }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom1", FieldKey = "widgetcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom2", FieldKey = "widgetcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom3", FieldKey = "widgetcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom4", FieldKey = "widgetcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom5", FieldKey = "widgetcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom6", FieldKey = "widgetcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom7", FieldKey = "widgetcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom8", FieldKey = "widgetcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom9", FieldKey = "widgetcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom10", FieldKey = "widgetcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom11", FieldKey = "widgetcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom12", FieldKey = "widgetcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom13", FieldKey = "widgetcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom14", FieldKey = "widgetcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom15", FieldKey = "widgetcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom16", FieldKey = "widgetcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom1", FieldKey = "customercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom2", FieldKey = "customercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom3", FieldKey = "customercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom4", FieldKey = "customercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom5", FieldKey = "customercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom6", FieldKey = "customercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom7", FieldKey = "customercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom8", FieldKey = "customercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom9", FieldKey = "customercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom10", FieldKey = "customercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom11", FieldKey = "customercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom12", FieldKey = "customercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom13", FieldKey = "customercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom14", FieldKey = "customercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom15", FieldKey = "customercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom16", FieldKey = "customercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); } }//eoc }//eons \ No newline at end of file