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-01-01 22:49:39 +00:00
parent 16d5598273
commit b6fc029da3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -53,8 +53,8 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "huge", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
}, },

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

@@ -11,7 +11,7 @@ namespace AyaNova.DataList
SQLFrom = "from aunit " SQLFrom = "from aunit "
+ "left outer join acustomer on (aunit.customerid=acustomer.id) " + "left outer join acustomer on (aunit.customerid=acustomer.id) "
+ "left outer join aunit as aparentunit on (aunit.parentunitid=aunit.id and aunit.parentunitid <> null) " + "left outer join aunit as aparentunit on (aunit.parentunitid=aunit.id and aunit.parentunitid <> null) "
+ "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id and aunit.unitmodelid <> null) " + "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id and aunit.unitmodelid <> null) "
+ "left outer join avendor on (aunit.purchasedfromvendorid=avendor.id and aunit.purchasedfromvendorid <> null) " + "left outer join avendor on (aunit.purchasedfromvendorid=avendor.id and aunit.purchasedfromvendorid <> null) "
+ "left outer join aunit as areplacedbyunit on (aunit.replacedbyunitid=aunit.id and aunit.replacedbyunitid <> null) "; + "left outer join aunit as areplacedbyunit on (aunit.replacedbyunitid=aunit.id and aunit.replacedbyunitid <> null) ";
var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType); var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
@@ -117,7 +117,7 @@ namespace AyaNova.DataList
UiFieldDataType = (int)UiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
AyaObjectType = (int)AyaType.UnitModel, AyaObjectType = (int)AyaType.UnitModel,
SqlIdColumnName = "aunitmodel.id", SqlIdColumnName = "aunitmodel.id",
SqlValueColumnName = "aunitmodel.name" SqlValueColumnName = "aunitmodel.number"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition