diff --git a/.vscode/launch.json b/.vscode/launch.json index fcc80a75..b77f3b95 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "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\\postgres_13\\bin\\" diff --git a/server/AyaNova/PickList/ReportPickList.cs b/server/AyaNova/PickList/ReportPickList.cs index 8f2714e8..41ed61f2 100644 --- a/server/AyaNova/PickList/ReportPickList.cs +++ b/server/AyaNova/PickList/ReportPickList.cs @@ -14,7 +14,7 @@ namespace AyaNova.PickList dynamic dTemplate = new JArray(); dynamic cm = new JObject(); - cm.fld = "name"; + cm.fld = "reportname"; dTemplate.Add(cm); base.DefaultTemplate = dTemplate.ToString(Newtonsoft.Json.Formatting.None); @@ -24,18 +24,18 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { TKey = "Active", - FieldKey = "useractive", + FieldKey = "reportactive", ColumnDataType = UiFieldDataType.Bool, - SqlValueColumnName = "auser.active", + SqlValueColumnName = "areport.active", IsActiveColumn = true }); ColumnDefinitions.Add(new AyaPickListFieldDefinition { TKey = "Name", - FieldKey = "username", + FieldKey = "reportname", ColumnDataType = UiFieldDataType.Text, - SqlIdColumnName = "auser.id", - SqlValueColumnName = "auser.name", + SqlIdColumnName = "areport.id", + SqlValueColumnName = "areport.name", IsRowId = true });