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

feat(worker_calendar): add restrictions to add absence and to add hours recorded #812

Merged
carlosjr merged 4 commits from 3275-worker_calendar into dev 2021-11-30 13:14:22 +00:00
Conversation 0 Commits 4 Files Changed 8 +96 -8
vicent commented 2021-11-30 08:29:30 +00:00
Contributor
Copy Link
No description provided.
vicent added the
CR / Tests passed
 label 2021-11-30 08:29:30 +00:00
vicent added 1 commit 2021-11-30 08:29:32 +00:00
vicent added 1 commit 2021-11-30 11:31:22 +00:00
gitea/salix/pipeline/head This commit looks good Details
21bd625b3b add exceprion to half day absence
carlosjr added 1 commit 2021-11-30 11:41:07 +00:00
gitea/salix/pipeline/head This commit looks good Details
d760eba446 Merge branch 'dev' into 3275-worker_calendar
carlosjr approved these changes 2021-11-30 11:41:22 +00:00
carlosjr left a comment
Contributor
Copy Link

LGTM

LGTM
carlosjr requested changes 2021-11-30 11:42:56 +00:00
modules/worker/back/methods/worker-time-control/addTimeEntry.js Outdated
@ -51,0 +59,4 @@
});
if (absence) {
const absenceType = await models.AbsenceType.findById(absence.dayOffTypeFk, null, myOptions);
const isNotHalfAbsence = absenceType.id != 6 && absenceType.id != 15 && absenceType.id != 21;
carlosjr commented 2021-11-30 11:42:50 +00:00
Contributor
Copy Link

try finding types by code instead of id usage.

try finding types by code instead of id usage.
vicent marked this conversation as resolved
carlosjr removed the
CR / Tests passed
 label 2021-11-30 11:43:16 +00:00
vicent added 1 commit 2021-11-30 12:57:45 +00:00
gitea/salix/pipeline/head This commit looks good Details
238577ec8f refactor: change ids by codes and add fixtures
vicent added the
CR / Tests passed
 label 2021-11-30 13:00:34 +00:00
carlosjr approved these changes 2021-11-30 13:14:03 +00:00
carlosjr left a comment
Contributor
Copy Link

LGTM

LGTM
carlosjr merged commit cfdef6d090 into dev 2021-11-30 13:14:22 +00:00
carlosjr deleted branch 3275-worker_calendar 2021-11-30 13:14:29 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
carlosjr
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#812
No description provided.
Delete Branch "3275-worker_calendar"

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?