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

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +18 -107
6 changed files with 18 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 74fafdf330 - Show all commits

4
db/versions/11227-maroonEucalyptus/00-addWorkerTimeControlMailAcl.sql Normal file
View File

@ -0,0 +1,4 @@
-- Place your SQL code here
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES ('WorkerTimeControlMail', 'count', 'READ', 'ALLOW', 'ROLE', 'employee'),
('Worker', '__get__mail', 'READ', 'ALLOW', 'ROLE', 'hr');

3
db/versions/11227-maroonEucalyptus/00-firstScript.sql
View File

@ -1,3 +0,0 @@
-- Place your SQL code here
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES ('WorkerTimeControlMail', 'getWeeklyMail', 'READ', 'ALLOW', 'ROLE', '$owner');

34
modules/worker/back/methods/worker-time-control-mail/getWeeklyMail.js
View File

@ -1,34 +0,0 @@
module.exports = Self => {
Self.remoteMethod('getWeeklyMail', {
description: 'Check an email inbox and process it',
accessType: 'READ',
accepts: [{
arg: 'id',
type: 'number',
description: 'workerFk',
required: true,
http: {source: 'path'}
}, {
arg: 'week',
type: 'number',
required: true
}, {
arg: 'year',
type: 'number',
required: true
}],
returns:
{
type: 'Object',
root: true
},
http: {
path: `/:id/getWeeklyMail`,
verb: 'GET'
}
});
Self.getWeeklyMail = async(workerFk, week, year) => {
return Self.findOne({where: {workerFk, week, year}});
};
};

1
modules/worker/back/models/worker-time-control-mail.js
View File

@ -1,4 +1,3 @@
module.exports = Self => { module.exports = Self => {
require('../methods/worker-time-control-mail/checkInbox')(Self); require('../methods/worker-time-control-mail/checkInbox')(Self);
require('../methods/worker-time-control-mail/getWeeklyMail')(Self);
}; };

10
modules/worker/back/models/worker-time-control-mail.json
View File

@ -32,13 +32,5 @@
"sendedCounter": { "sendedCounter": {
"type": "number" "type": "number"
} }
}, }
"relations": {
"user": {
"type": "belongsTo",
"model": "VnUser",
"foreignKey": "workerFk"
}
},
"acls": []
} }

73
modules/worker/back/models/worker.json
View File

@ -116,11 +116,6 @@
"model": "Locker", "model": "Locker",
"foreignKey": "workerFk" "foreignKey": "workerFk"
}, },
"medicalReview": {
"type": "hasMany",
"model": "MedicalReview",
"foreignKey": "workerFk"
},
"incomes": { "incomes": {
"type": "hasMany", "type": "hasMany",
"model": "WorkerIncome", "model": "WorkerIncome",
@ -130,6 +125,11 @@
"type": "hasMany", "type": "hasMany",
"model": "TrainingCourse", "model": "TrainingCourse",
"foreignKey": "workerFk" "foreignKey": "workerFk"
},
"mail": {
"type": "hasMany",
"model": "WorkerTimeControlMail",
"foreignKey": "workerFk"
} }
}, },
"acls": [ "acls": [
@ -139,60 +139,13 @@
"permission": "ALLOW", "permission": "ALLOW",
"principalType": "ROLE", "principalType": "ROLE",
"principalId": "$owner" "principalId": "$owner"
},
{
"property": "__get__mail",
"accessType": "READ",
"permission": "ALLOW",
"principalType": "ROLE",
"principalId": "$owner"
} }
], ]
"scopes": {
"descriptor": {
"fields": [
"id",
"phone"
],
"include": [
{
"relation": "user",
"scope": {
"fields": [
"name",
"nickname"
],
"include": {
"relation": "emailUser",
"scope": {
"fields": [
"email"
]
}
}
}
},
{
"relation": "department",
"scope": {
"fields": [
"departmentFk"
],
"include": [
{
"relation": "department",
"scope": {
"fields": [
"id",
"name"
]
}
}
]
}
},
{
"relation": "sip",
"scope": {
"fields": [
"extension"
]
}
}
]
}
}
} }