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
2021-02-08 22:29:53 +00:00
parent 27a232c888
commit e799323b50
5 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/DataList/DataListProcessingBase.cs
View File

@@ -67,9 +67,7 @@ namespace AyaNova.DataList
}
public Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List<string> columns)
{
// var ListViewFieldKeys = GetFieldListFromListView(listViewArray);
{
var CustomFieldDefinitions = GetCustomFieldDefinitionsForList();
//Generate JSON fragment to return with column definitions

4
server/AyaNova/PickList/IAyaPickList.cs
View File

@@ -13,8 +13,8 @@ namespace AyaNova.PickList
AuthorizationRoles AllowedRoles { get; set; }
//Default object type to open for rows of this list (use no object if no)
AyaType DefaultListObjectType { get; set; }
//Default / STOCK DataListView when none is specified
//Default / STOCK template when none is specified
string DefaultTemplate { get; set; }
List<string> GetFieldListFromTemplate(JArray listViewArray);
List<string> GetFieldListFromTemplate(JArray fieldListArray);
}
}

2
server/AyaNova/biz/AyaType.cs
View File

@@ -12,7 +12,7 @@ namespace AyaNova.Biz
//reviewable objects can have a review which is basically the same as a Reminder but with an object attached (was follow up schedmarker in v7)
//PIckList-able (has picklist template)
//Pretty much everything that represents some kind of real world object is wikiable or attachable as long as it has an ID and a type
//exceptions would be utility type objects like datalistview, formcustom etc that are not
//exceptions would be utility type objects like dataListFilter, dataListColumn, formcustom etc that are not
//NOTE: NEW CORE OBJECTS - All areas of server AND CLIENT code that require adding any new core objects have been tagged with the following comment:
//CoreBizObject add here

15
server/AyaNova/biz/ReportBiz.cs
View File

@@ -393,16 +393,7 @@ namespace AyaNova.Biz
var WaitTimeout = new WaitForFunctionOptions() { Timeout = ServerBootConfig.REPORT_RENDERING_OPERATION_TIMEOUT };
//Get data
// var ReportData = await GetReportData(
// new DataListSelection()
// {
// ObjectType = report.ObjectType,
// SelectedRowIds = reportParam.SelectedRowIds,
// DataListKey = reportParam.DataListKey,
// ListView = reportParam.ListView,
// MetaView = reportParam.MetaView
// });
//Get data
var ReportData = await GetReportData(reportRequest);
//initialization
@@ -554,9 +545,7 @@ namespace AyaNova.Biz
CustomFieldsTemplate = FormCustomization.Template;
}
//Report meta data
// var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,ListView:`{reportParam.ListView}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}";
//removed listview as it no longer exists and I don't think there's any useful purpose to it in the report javascript at this time
//Report meta data
var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportRequest.DataListKey}`,SelectedRowIds: `{string.Join(",", reportRequest.SelectedRowIds)}`}}";

2
server/AyaNova/models/DataListSelectedProcessingOptions.cs
View File

@@ -7,7 +7,7 @@ using EnumsNET;
namespace AyaNova.Models
{
//Used to drive processes that rely on selections made at client from a datalist
//either a preselected list of id's or a datalist key and listview filter object that can
//either a preselected list of id's or a datalist key and filterid that can
//be used to rehydrate a list of id's
public class DataListSelectedProcessingOptions : DataListProcessingBase
{