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

changed all lambda experssion variables to z from various where appropriate

Browse Source
This commit is contained in:
John Cardinal
2020-05-18 19:42:42 +00:00
parent 3a359f1052
commit fd8c489914
65 changed files with 431 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ namespace AyaNova.DataList
foreach (string s in ListViewFieldKeys)
{
AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s);
AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(z => z.FieldKey == s);
#if (DEBUG)
//Developers little helper
if (o == null)
@@ -139,7 +139,7 @@ namespace AyaNova.DataList
//fetch it and set it
using (var ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{
var fc = ct.FormCustom.AsNoTracking().SingleOrDefault(x => x.FormKey == ayatypename);
var fc = ct.FormCustom.AsNoTracking().SingleOrDefault(z => z.FormKey == ayatypename);
//This is normal and expected in an empty db, removing this block
// #if (DEBUG)
// if (fc == null)

2
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -97,7 +97,7 @@ namespace AyaNova.DataList
{
//get the AyaObjectFieldDefinition
AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(x => x.FieldKey == TemplateField);
AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField);
if (f.IsCustomField)
{

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

@@ -36,8 +36,8 @@ namespace AyaNova.DataList
//Get some info about this column / field
var fld = cm["fld"].Value<string>();
var dataType = objectFieldsList.Find(x => x.FieldKey.ToLowerInvariant() == fld).UiFieldDataType;
AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(x => x.FieldKey == fld);
var dataType = objectFieldsList.Find(z => z.FieldKey.ToLowerInvariant() == fld).UiFieldDataType;
AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(z => z.FieldKey == fld);
//No filtering on custom fields!
if (DataListField.IsCustomField)

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

@@ -28,7 +28,7 @@ namespace AyaNova.DataList
var fld = cm["fld"].Value<string>();
var dir = cm["sort"].Value<string>();
//Get the correct sql column name
AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(x => x.FieldKey == fld);
AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(z => z.FieldKey == fld);
//No sorting on custom fields!
if (DataListField.IsCustomField)
{
@@ -57,7 +57,7 @@ namespace AyaNova.DataList
if (sb.Length == 0)
{
//no sort specified so default it
AyaDataListFieldDefinition rid = objectFieldsList.FirstOrDefault(x => x.IsRowId == true);
AyaDataListFieldDefinition rid = objectFieldsList.FirstOrDefault(z => z.IsRowId == true);
if (rid != null)
{
return $"ORDER BY {rid.SqlIdColumnName} DESC";

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

@@ -27,7 +27,7 @@ namespace AyaNova.DataList
//DEPRECATED
// //Default ID column for each row (always is aliased as df)
// AyaDataListFieldDefinition def = objectFieldsList.FirstOrDefault(x => x.FieldKey == "df");
// AyaDataListFieldDefinition def = objectFieldsList.FirstOrDefault(z => z.FieldKey == "df");
// if (def == null)
// {
// throw new System.ArgumentNullException("DataListSqlSelectBuilder: objectFieldList is missing the df default field");
@@ -59,7 +59,7 @@ namespace AyaNova.DataList
// //skip the df column, it's already been processed above
// if (ColumnName == "df")
// continue;
AyaDataListFieldDefinition o = objectFieldsList.FirstOrDefault(x => x.FieldKey == ColumnName);
AyaDataListFieldDefinition o = objectFieldsList.FirstOrDefault(z => z.FieldKey == ColumnName);
#if (DEBUG)
//Developers little helper
if (o == null)