From d77b97bb3371a953142906dab6d77d92927782f2 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 10 Jan 2023 17:22:05 +0000
Subject: [PATCH]

---
 server/DataList/ProductDataList.cs             | 11 ++++++++++-
 server/DataList/TrialLicenseRequestDataList.cs | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/server/DataList/ProductDataList.cs b/server/DataList/ProductDataList.cs
index 98cf311..a6a3bb9 100644
--- a/server/DataList/ProductDataList.cs
+++ b/server/DataList/ProductDataList.cs
@@ -14,7 +14,7 @@ namespace Sockeye.DataList
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "ProductName", "ProductVendorCode", "ProductOurCode" };
+            DefaultColumns = new List<string>() { "ProductName", "ProductGroup", "ProductVendorCode", "ProductOurCode" };
             DefaultSortBy = new Dictionary<string, string>() { { "ProductName", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
             /*
@@ -41,6 +41,15 @@ id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, active B
                 IsRowId = true
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "ProductGroup",
+                FieldKey = "ProductGroup",
+                UiFieldDataType = (int)UiFieldDataType.Enum,
+                EnumType = Sockeye.Util.StringUtil.TrimTypeName(typeof(ProductGroup).ToString()),
+                SqlValueColumnName = "aproduct.pgroup"
+            });
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "Active",
diff --git a/server/DataList/TrialLicenseRequestDataList.cs b/server/DataList/TrialLicenseRequestDataList.cs
index 605c3c0..36b818b 100644
--- a/server/DataList/TrialLicenseRequestDataList.cs
+++ b/server/DataList/TrialLicenseRequestDataList.cs
@@ -14,7 +14,7 @@ namespace Sockeye.DataList
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "id", "TrialLicenseRequestCompanyName", "TrialLicenseRequestRequested", "TrialLicenseRequestStatus", "TrialLicenseRequestFetchedOn" };
+            DefaultColumns = new List<string>() { "id", "TrialLicenseRequestCompanyName", "TrialLicenseRequestRequested", "TrialLicenseRequestStatus", "TrialLicenseRequestFetchedOn", "ProductGroup" };
             DefaultSortBy = new Dictionary<string, string>() { { "id", "-" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
             /*
@@ -133,6 +133,16 @@ await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SE
                 SqlValueColumnName = "atriallicenserequest.perpetual"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "ProductGroup",
+                FieldKey = "ProductGroup",
+                UiFieldDataType = (int)UiFieldDataType.Enum,
+                EnumType = Sockeye.Util.StringUtil.TrimTypeName(typeof(ProductGroup).ToString()),
+                SqlValueColumnName = "atriallicenserequest.pgroup"
+            });
+
+
 
         }