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

hotFix: workerTimeControl #1796

Merged
alexm merged 1 commits from hotFix_workeTimeControl_sendMail into master 2023-10-17 07:03:05 +00:00
Conversation 1 Commits 1 Files Changed 1 +27 -37
alexm commented 2023-10-16 13:23:14 +00:00
Member
Copy Link
No description provided.
alexm added 1 commit 2023-10-16 13:23:15 +00:00
gitea/salix/pipeline/head This commit looks good Details
9e39e96cf4 hotFix: workerTimeControl
alexm reviewed 2023-10-16 13:23:55 +00:00
modules/worker/back/methods/worker-time-control/sendMail.js
@ -102,4 +85,0 @@
stmt = new ParameterizedSQL('DROP TEMPORARY TABLE IF EXISTS tmp.`user`');
stmts.push(stmt);
stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT id as userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.id WHERE id IS NOT NULL');
alexm commented 2023-10-16 13:23:55 +00:00
Author
Member
Copy Link

Realment lo unic que fallava era que el id era un camp ambiguo, pero ja que estava he refactorisat el codi que esta tot duplicat

Realment lo unic que fallava era que el id era un camp ambiguo, pero ja que estava he refactorisat el codi que esta tot duplicat
alexm requested review from carlosap 2023-10-16 13:24:15 +00:00
alexm requested review from jgallego 2023-10-16 13:24:20 +00:00
alexm commented 2023-10-16 13:24:56 +00:00
Author
Member
Copy Link

Tot ve pq ha fallà la setmana pasada el envio de registro de horas

Tot ve pq ha fallà la setmana pasada el envio de registro de horas
jgallego approved these changes 2023-10-16 13:29:37 +00:00
jgallego left a comment
Owner
Copy Link

Asegurat que account.user i worker es lo mateix

Asegurat que account.user i worker es lo mateix
carlosap approved these changes 2023-10-16 14:13:44 +00:00
alexm merged commit dbb2372cd3 into master 2023-10-17 07:03:05 +00:00
alexm deleted branch hotFix_workeTimeControl_sendMail 2023-10-17 07:03:06 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
carlosap
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
3 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#1796
No description provided.
Delete Branch "hotFix_workeTimeControl_sendMail"

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?