verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch '2059-zone_index_searchPanel' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-02-06 12:14:31 +00:00 committed by Gitea
parent 6457a9cf61 73c4e310f0
commit b6a2344e14
2 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
modules/agency/back/models/agency-mode.json
View File

@ -1,73 +1,77 @@
{ {
"name": "AgencyMode", "name": "AgencyMode",
"description": "Agency modes", "description": "Agency modes",
"base": "VnModel", "base": "VnModel",
"options": { "options": {
"mysql": { "mysql": {
"table": "agencyMode" "table": "agencyMode"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "string",
"required": true
},
"description": {
"type": "string"
},
"deliveryMethodFk": {
"type": "number"
},
"m3": {
"type": "Number"
},
"inflation": {
"type": "Number"
},
"reportMail": {
"type": "string"
},
"isActive": {
"type": "boolean"
},
"code": {
"type": "String",
"required": false
}
},
"relations": {
"agency": {
"type": "belongsTo",
"model": "Agency",
"foreignKey": "agencyFk"
},
"agencyType": {
"type": "belongsTo",
"model": "AgencyType",
"foreignKey": "agencyTypeFk"
},
"deliveryMethod": {
"type": "belongsTo",
"model": "DeliveryMethod",
"foreignKey": "deliveryMethodFk"
}
},
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
],
"scopes": {
"isActive": {
"where": {
"isActive": {
"neq": false
}
}
}
} }
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "string",
"required": true
},
"description": {
"type": "string"
},
"deliveryMethodFk":{
"type": "number"
},
"m3": {
"type": "Number"
},
"inflation": {
"type": "Number"
},
"reportMail": {
"type": "string"
},
"isActive":{
"type": "boolean"
},
"code": {
"type": "String",
"required": false
}
},
"relations": {
"agency": {
"type": "belongsTo",
"model": "Agency",
"foreignKey": "agencyFk"
},
"agencyType": {
"type": "belongsTo",
"model": "AgencyType",
"foreignKey": "agencyTypeFk"
},
"deliveryMethod": {
"type": "belongsTo",
"model": "DeliveryMethod",
"foreignKey": "deliveryMethodFk"
}
},
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
],
"scopes" : {
"isActive" : {
"where": {"isActive": {"neq": false}}
}
}
} }

1
modules/agency/front/search-panel/index.html
View File

@ -22,6 +22,7 @@
label="Agency" label="Agency"
ng-model="filter.agencyModeFk" ng-model="filter.agencyModeFk"
url="AgencyModes/isActive" url="AgencyModes/isActive"
where="{deliveryMethodFk: {neq: null}}"
value-field="id" value-field="id"
show-field="name"> show-field="name">
</vn-autocomplete> </vn-autocomplete>