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

refs #6553 changes models #2522

Merged
carlossa merged 41 commits from 6553-workerBusiness into dev 2025-01-31 09:19:15 +00:00
Conversation 0 Commits 41 Files Changed 11 +7 -4
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cc8af9d14a - Show all commits

8
modules/client/back/models/business.json
View File

@ -42,7 +42,7 @@
"type": "string" "type": "string"
}, },
"departmentFk": { "departmentFk": {
"type": "number" "type": "string"
}, },
"workerBusinessProfessionalCategoryFk": { "workerBusinessProfessionalCategoryFk": {
"type": "number" "type": "number"
@ -91,7 +91,8 @@
"companyCode": { "companyCode": {
"type": "belongsTo", "type": "belongsTo",
"model": "Company", "model": "Company",
"foreignKey": "companyCodeFk" "foreignKey": "companyCodeFk",
"primaryKey": "code"
}, },
"reasonEnd": { "reasonEnd": {
"type": "belongsTo", "type": "belongsTo",
@ -101,7 +102,8 @@
"occupationCode": { "occupationCode": {
"type": "belongsTo", "type": "belongsTo",
"model": "OccupationCode", "model": "OccupationCode",
"foreignKey":"occupationCodeFk" "foreignKey":"occupationCodeFk",
"primaryKey": "code"
}, },
"payrollCategory": { "payrollCategory": {
"type": "belongsTo", "type": "belongsTo",

0
modules/client/back/models/occupationCode.json → modules/client/back/models/occupation-code.json
View File

3
modules/client/back/models/worker-business-type.json
View File

@ -8,7 +8,8 @@
}, },
"properties": { "properties": {
"id": { "id": {
"type": "number" "type": "number",
"id": true
}, },
"name": { "name": {
"type": "string" "type": "string"