admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-07-14 18:20:34 +00:00
parent 431af8cd7c
commit f3bf8e2d8f
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -50,7 +50,7 @@
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "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_SEEDLEVEL":"small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7",
"AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\"

15
server/AyaNova/Controllers/GlobalBizSettingsController.cs
View File

@@ -115,13 +115,14 @@ namespace AyaNova.Api.Controllers
LicenseStatus = AyaNova.Core.License.ActiveKey.Status, LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired, MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
ServerDbId = AyaNova.Core.License.ServerDbId, ServerDbId = AyaNova.Core.License.ServerDbId,
Company=AyaNova.Core.License.ActiveKey.RegisteredTo, Company=AyaNova.Core.License.ActiveKey.RegisteredTo
TestTSDaysWMS=new TimeSpan(22,10,15,22,33), // ,
TestTSHMS=new TimeSpan(5,16,33), // TestTSDaysWMS=new TimeSpan(22,10,15,22,33),
TestTS_DHMS=new TimeSpan(5,10,15,33), // TestTSHMS=new TimeSpan(5,16,33),
TestTS_MS=new TimeSpan(0,15,33), // TestTS_DHMS=new TimeSpan(5,10,15,33),
TestTS_S=new TimeSpan(0,0,33), // TestTS_MS=new TimeSpan(0,15,33),
TestTS_D=new TimeSpan(22,0,0,0,0) // TestTS_S=new TimeSpan(0,0,33),
// TestTS_D=new TimeSpan(22,0,0,0,0)

26
server/AyaNova/DataList/NotifySubscriptionDataList.cs
View File

@@ -17,6 +17,10 @@ namespace AyaNova.DataList
dynamic dlistView = new JArray(); dynamic dlistView = new JArray();
dynamic cm = new JObject(); dynamic cm = new JObject();
cm.fld = "id";
dlistView.Add(cm);
cm = new JObject();
cm.fld = "ayatype"; cm.fld = "ayatype";
dlistView.Add(cm); dlistView.Add(cm);
@@ -44,6 +48,17 @@ namespace AyaNova.DataList
DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
FieldDefinitions = new List<AyaDataListFieldDefinition>(); 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 FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
TKey = "AyaType", TKey = "AyaType",
@@ -60,6 +75,17 @@ namespace AyaNova.DataList
EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(NotifyEventType).ToString()) 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 FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
TKey = "NotifyDeliveryMethod", TKey = "NotifyDeliveryMethod",