From f3bf8e2d8f8da8c1f9bf81c2abab504d8eadd71b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 14 Jul 2020 18:20:34 +0000
Subject: [PATCH]

---
 .vscode/launch.json                           |  2 +-
 .../GlobalBizSettingsController.cs            | 15 ++++++-----
 .../DataList/NotifySubscriptionDataList.cs    | 26 +++++++++++++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index bcfc56be..396abc9b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -50,7 +50,7 @@
         "AYANOVA_USE_URLS": "http://*:7575;",
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",       
-        "AYANOVA_SERVER_TEST_MODE":"true",
+        "AYANOVA_SERVER_TEST_MODE":"false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\"
diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs
index 6bf15023..ab880ef4 100644
--- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs
+++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs
@@ -115,13 +115,14 @@ namespace AyaNova.Api.Controllers
                 LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
                 MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
                 ServerDbId = AyaNova.Core.License.ServerDbId,
-                Company=AyaNova.Core.License.ActiveKey.RegisteredTo,
-                TestTSDaysWMS=new TimeSpan(22,10,15,22,33),
-                TestTSHMS=new TimeSpan(5,16,33),
-                TestTS_DHMS=new TimeSpan(5,10,15,33),
-                TestTS_MS=new TimeSpan(0,15,33),
-                TestTS_S=new TimeSpan(0,0,33),
-                TestTS_D=new TimeSpan(22,0,0,0,0)
+                Company=AyaNova.Core.License.ActiveKey.RegisteredTo
+                // ,
+                // TestTSDaysWMS=new TimeSpan(22,10,15,22,33),
+                // TestTSHMS=new TimeSpan(5,16,33),
+                // TestTS_DHMS=new TimeSpan(5,10,15,33),
+                // TestTS_MS=new TimeSpan(0,15,33),
+                // TestTS_S=new TimeSpan(0,0,33),
+                // TestTS_D=new TimeSpan(22,0,0,0,0)
 
 
                 
diff --git a/server/AyaNova/DataList/NotifySubscriptionDataList.cs b/server/AyaNova/DataList/NotifySubscriptionDataList.cs
index 89839078..1224290f 100644
--- a/server/AyaNova/DataList/NotifySubscriptionDataList.cs
+++ b/server/AyaNova/DataList/NotifySubscriptionDataList.cs
@@ -17,6 +17,10 @@ namespace AyaNova.DataList
             dynamic dlistView = new JArray();
 
             dynamic cm = new JObject();
+            cm.fld = "id";
+            dlistView.Add(cm);
+
+            cm = new JObject();
             cm.fld = "ayatype";
             dlistView.Add(cm);
 
@@ -44,6 +48,17 @@ namespace AyaNova.DataList
             DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
             FieldDefinitions = new List<AyaDataListFieldDefinition>();
 
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "ID",
+                FieldKey = "id",
+                UiFieldDataType = (int)UiFieldDataType.Integer,
+                SqlIdColumnName = "anotifysubscription.id",
+                SqlValueColumnName = "anotifysubscription.id",
+                AyaObjectType = (int)AyaType.NotifySubscription,
+                IsRowId = true
+            });
+
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "AyaType",
@@ -60,6 +75,17 @@ namespace AyaNova.DataList
                 EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(NotifyEventType).ToString())
             });
 
+            //  FieldDefinitions.Add(new AyaDataListFieldDefinition
+            // {
+            //     TKey = "FileAttachment",
+            //     FieldKey = "displayfilename",
+            //     AyaObjectType = (int)AyaType.FileAttachment,
+            //     UiFieldDataType = (int)UiFieldDataType.Text,
+            //     SqlIdColumnName = "afileattachment.id",
+            //     SqlValueColumnName = "afileattachment.displayfilename",
+            //     IsRowId = true
+            // });
+
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "NotifyDeliveryMethod",