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-09-10 23:50:20 +00:00
parent b4c9bdb639
commit 9075210040
9 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -52,7 +52,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\\"

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

@@ -171,14 +171,14 @@ namespace AyaNova.DataList
{
//case DataListFilterComparisonOperator.Equality: //no specific addition on equals for nulls, let default handle it
//case DataListFilterComparisonOperator.GreaterThan:
//no specific addition on greater than for nulls
//(nulls are going to be assumed to be always at the
//less than end of the scale) so let default handle it
//no specific addition on greater than for nulls
//(nulls are going to be assumed to be always at the
//less than end of the scale) so let default handle it
//case DataListFilterComparisonOperator.GreaterThanOrEqualTo:
//no change on greater than for nulls
//(nulls are going to be assumed to be always at the
//less than end of the scale) let default case handle it
//no change on greater than for nulls
//(nulls are going to be assumed to be always at the
//less than end of the scale) let default case handle it
case DataListFilterComparisonOperator.LessThan:
sb.Append($"{SqlColumnNameToFilter} ");
sb.Append("Is Null OR ");
@@ -971,7 +971,12 @@ namespace AyaNova.DataList
throw new System.ArgumentNullException("DataListSqlFilterCriteriaBuilder::TagDataFilterToColumnCriteria - NO tags were provided for filtering");
foreach (string s in normalizedTags)
sbTemp.Append($"'{s}',");
{
//escape any pre-existing apostrophes
//i.e. "O'Flaherty's pub"
var cleaned = s.Replace("'", "''");
sbTemp.Append($"'{cleaned}',");
}
PostgresTagArrayFragment = sbTemp.ToString().TrimEnd(',');
PostgresTagArrayFragment += "::VARCHAR(255)]";

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

@@ -67,7 +67,7 @@ namespace AyaNova.DataList
{
FieldKey = "LoanUnitCurrentWorkOrderItemLoan",
TKey = "LoanUnitCurrentWorkOrderItemLoan",
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
AType = (int)AyaType.WorkOrderItemLoan,
SqlIdColumnName = "wil.id",
SqlValueColumnName = "w.serial"

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

@@ -111,7 +111,7 @@ namespace AyaNova.DataList
{
TKey = "PurchaseOrder",
FieldKey = "WorkOrderItemPartRequestPurchaseOrder",
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
AType = (int)AyaType.PurchaseOrder,
SqlIdColumnName = "apurchaseorder.id",
SqlValueColumnName = "apurchaseorder.serial"

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

@@ -80,7 +80,7 @@ namespace AyaNova.DataList
{
FieldKey = "WorkOrder",
TKey = "WorkOrder",
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
AType = (int)AyaType.WorkOrderItem,
SqlIdColumnName = "wi.id",
SqlValueColumnName = "w.serial"

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

@@ -67,7 +67,7 @@ namespace AyaNova.DataList
TKey = "UnitMeterReadingWorkOrderItemID",
FieldKey = "UnitMeterReadingWorkOrderItemID",
AType = (int)AyaType.WorkOrderItemUnit,
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
SqlIdColumnName = "aworkorderitemunit.id",
SqlValueColumnName = "aworkorder.serial",
IsRowId = false

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

@@ -60,7 +60,7 @@ namespace AyaNova.DataList
{
FieldKey = "WorkOrderFromPMID",
TKey = "WorkOrderFromPMID",
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
AType = (int)AyaType.PM,
SqlIdColumnName = "apm.id",
SqlValueColumnName = "apm.serial"
@@ -70,7 +70,7 @@ namespace AyaNova.DataList
{
FieldKey = "WorkOrderFromQuoteID",
TKey = "WorkOrderFromQuoteID",
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
AType = (int)AyaType.Quote,
SqlIdColumnName = "aquote.id",
SqlValueColumnName = "aquote.serial"

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

@@ -104,7 +104,7 @@ namespace AyaNova.DataList
{
TKey = "PurchaseOrder",
FieldKey = "WorkOrderItemPartRequestPurchaseOrder",
UiFieldDataType = (int)UiFieldDataType.Text,
UiFieldDataType = (int)UiFieldDataType.Integer,
AType = (int)AyaType.PurchaseOrder,
SqlIdColumnName = "apurchaseorder.id",
SqlValueColumnName = "apurchaseorder.serial"

2
server/AyaNova/PickList/LoanUnitPickList.cs
View File

@@ -52,7 +52,7 @@ namespace AyaNova.PickList
{
TKey = "LoanUnitSerial",
FieldKey = "LoanUnitSerial",
ColumnDataType = UiFieldDataType.Integer,
ColumnDataType = UiFieldDataType.Text,
SqlValueColumnName = "aloanunit.serial"
});