diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 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/DataList/CustomerServiceRequestDataList.cs b/server/AyaNova/DataList/CustomerServiceRequestDataList.cs index c1661394..5b6a63a4 100644 --- a/server/AyaNova/DataList/CustomerServiceRequestDataList.cs +++ b/server/AyaNova/DataList/CustomerServiceRequestDataList.cs @@ -9,6 +9,7 @@ namespace AyaNova.DataList { DefaultListObjectType = AyaType.CustomerServiceRequest; SQLFrom = "from acustomerservicerequest left join " + + "acustomer on (acustomerservicerequest.customerid=acustomer.id) " + "auser on (acustomerservicerequest.requestedbyuserid=auser.id) " + "left join aunit on (acustomerservicerequest.unitid) " + "left join aworkorderitem as wi on (acustomerservicerequest.workorderitemid=wi.id) " + @@ -83,6 +84,16 @@ namespace AyaNova.DataList SqlValueColumnName = "acustomerservicerequest.daterequested" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition + { + FieldKey = "Customer", + TKey = "Customer", + UiFieldDataType = (int)UiFieldDataType.Text, + AyaObjectType = (int)AyaType.Customer, + SqlIdColumnName = "acustomer.id", + SqlValueColumnName = "acustomer.serial" + }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "CustomerServiceRequestItemUnitID",