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

#6924 Notify absences only to department boss #3175

Merged
jon merged 12 commits from 6924-NotifyOnlyToBoss into dev 2024-11-21 07:06:28 +00:00
Conversation 0 Commits 12 Files Changed 1 +21 -23
jon commented 2024-11-11 09:44:44 +00:00
Member
Copy Link
No description provided.
jon added 1 commit 2024-11-11 09:44:45 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
25891e0bad feat: refs #6924 notify absences only to department boss
jon added 1 commit 2024-11-11 10:01:12 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
bb7cecdcff Merge branch 'dev' into 6924-NotifyOnlyToBoss
jon added 1 commit 2024-11-13 06:51:35 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0f913d8975 Merge branch 'dev' into 6924-NotifyOnlyToBoss
jon requested review from alexm 2024-11-13 07:13:12 +00:00
alexm requested changes 2024-11-13 07:27:13 +00:00
Dismissed
modules/worker/back/methods/worker/createAbsence.js Outdated
@ -121,3 +122,3 @@
const department = labour.department();
if (department && department.notificationEmail) {
if (department) {
alexm commented 2024-11-13 07:26:07 +00:00
Member
Copy Link

Diria que ja no cal mirar ni el department

Diria que ja no cal mirar ni el department
jon added 3 commits 2024-11-13 07:45:52 +00:00
jon requested review from alexm 2024-11-13 07:49:52 +00:00
alexm requested changes 2024-11-13 11:06:28 +00:00
Dismissed
alexm left a comment
Member
Copy Link

No cal la relacio en department:

 const labour = await models.WorkerLabour.findById(args.businessFk, {
                include: {relation: 'department'}		                include: {relation: 'department'}
            }, myOptions);		            }, myOptions);
No cal la relacio en department: ``` const labour = await models.WorkerLabour.findById(args.businessFk, { include: {relation: 'department'} include: {relation: 'department'} }, myOptions); }, myOptions); ```
jon added 1 commit 2024-11-14 07:35:36 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
7be1bc385f perf: refs #6924 deleted useless relation
jon added 1 commit 2024-11-14 07:37:45 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
66149a69a7 Merge branch 'dev' into 6924-NotifyOnlyToBoss
jon requested review from alexm 2024-11-14 07:40:31 +00:00
jon added the
CR / Tests passed
 label 2024-11-14 07:57:49 +00:00
alexm requested changes 2024-11-14 08:11:30 +00:00
Dismissed
modules/worker/back/methods/worker/createAbsence.js Outdated
@ -61,3 +61,1 @@
const labour = await models.WorkerLabour.findById(args.businessFk, {
include: {relation: 'department'}
}, myOptions);
const labour = await models.WorkerLabour.findById(args.businessFk, myOptions);
alexm commented 2024-11-14 08:11:17 +00:00
Member
Copy Link

findById espera 3 parametres (o 2 si no vols gastar options)
En este cas seria:
const labour = await models.WorkerLabour.findById(args.businessFk, null, myOptions);

Pero hi ha que especificar sempre els fields, entonces seria (per el que he vist, revisau per si acas)
const labour = await models.WorkerLabour.findById(args.businessFk, {fields: ['started', 'ended', 'businessFk']}, myOptions);

findById espera 3 parametres (o 2 si no vols gastar options) En este cas seria: `const labour = await models.WorkerLabour.findById(args.businessFk, null, myOptions);` Pero hi ha que especificar sempre els fields, entonces seria (per el que he vist, revisau per si acas) `const labour = await models.WorkerLabour.findById(args.businessFk, {fields: ['started', 'ended', 'businessFk']}, myOptions);`
jon added 2 commits 2024-11-19 12:40:40 +00:00
jon added 1 commit 2024-11-19 12:42:55 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
492c79de46 Merge branch 'dev' into 6924-NotifyOnlyToBoss
jon requested review from alexm 2024-11-19 12:44:33 +00:00
alexm added 1 commit 2024-11-21 06:54:02 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0ac46882be Merge branch 'dev' into 6924-NotifyOnlyToBoss
alexm approved these changes 2024-11-21 06:54:17 +00:00
jon merged commit 9cd16981e6 into dev 2024-11-21 07:06:28 +00:00
jon deleted branch 6924-NotifyOnlyToBoss 2024-11-21 07:06:28 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#3175
No description provided.
Delete Branch "6924-NotifyOnlyToBoss"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?