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-02 00:30:15 +00:00
parent 8d0e9fe8c9
commit 74db405e62
17 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ namespace AyaNova.PickList
{
/*Example
select awidget.id as plId, awidget.active as plActive, awidget.name || ' ' || awidget.serial || ' ' || auser.name as plname, awidget.tags
from awidget left outer join auser on (awidget.userid=auser.id)
from awidget left join auser on (awidget.userid=auser.id)
where array_to_string(awidget.tags,',') like '%zone-8%'
and awidget.active = true
and ((awidget.name like '%we%') or (cast (awidget.serial as text) like '%we%') or (auser.name like '%we%'))
@@ -311,7 +311,7 @@ namespace AyaNova.PickList
return sb.ToString();
}
//"select awidget.id as plId || ' 'awidget.active as plActive || ' 'awidget.name || ' 'awidget.serial || ' 'auser.name as plname from awidget left outer join auser on (awidget.userid=auser.id)
//"select awidget.id as plId || ' 'awidget.active as plActive || ' 'awidget.name || ' 'awidget.serial || ' 'auser.name as plname from awidget left join auser on (awidget.userid=auser.id)
//where awidget.active = true and ((awidget.name like '%on%') or (cast (awidget.serial as text) like '%on%') or (auser.name like '%on%')) order by awidget.name,awidget.serial,auser.name limit 100"

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

@@ -9,7 +9,7 @@ namespace AyaNova.PickList
{
DefaultListObjectType = AyaType.UnitModel;
SQLFrom = "from aunitmodel left outer join avendor on (aunitmodel.vendorid=avendor.id)";
SQLFrom = "from aunitmodel left join avendor on (aunitmodel.vendorid=avendor.id)";
AllowedRoles = BizRoles.GetRoleSet(DefaultListObjectType).Select;
dynamic dTemplate = new JArray();
dynamic cm = null;

6
server/AyaNova/PickList/UnitPickList.cs
View File

@@ -10,8 +10,8 @@ namespace AyaNova.PickList
DefaultListObjectType = AyaType.Unit;
SQLFrom = "from aunit "
+ "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id) "
+ "left outer join avendor on (aunitmodel.vendorid=avendor.id) ";
+ "left join aunitmodel on (aunit.unitmodelid=aunitmodel.id) "
+ "left join avendor on (aunitmodel.vendorid=avendor.id) ";
AllowedRoles = BizRoles.GetRoleSet(DefaultListObjectType).Select;
dynamic dTemplate = new JArray();
@@ -41,7 +41,7 @@ namespace AyaNova.PickList
SqlValueColumnName = "aunit.active",
IsActiveColumn = true
});
ColumnDefinitions.Add(new AyaPickListFieldDefinition
{
TKey = "UnitSerial",

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

@@ -8,7 +8,7 @@ namespace AyaNova.PickList
public WidgetPickList()
{
DefaultListObjectType = AyaType.Widget;
SQLFrom = "from awidget left outer join auser on (awidget.userid=auser.id)";
SQLFrom = "from awidget left join auser on (awidget.userid=auser.id)";
AllowedRoles = BizRoles.GetRoleSet(DefaultListObjectType).Select;
//Default template