refs #4707 fix: problemas fichadas y test #1808

Merged
carlosap merged 6 commits from 4707-test-workerTimeControl into master 2023-10-25 08:54:40 +00:00
Member
No description provided.
carlosap added 1 commit 2023-10-23 12:52:42 +00:00
gitea/salix/pipeline/head This commit looks good Details
6e3517b40f
refs #4707 fix: problemas fichadas y test
carlosap requested review from jgallego 2023-10-23 12:52:49 +00:00
jgallego requested changes 2023-10-23 13:09:09 +00:00
@ -0,0 +11,4 @@
ALTER TABLE `vn`.`workerTimeControlConfig`
ADD COLUMN `maxWorkShortCycle` INT(10) UNSIGNED DEFAULT 561600
COMMENT 'Máximo tiempo que un trabajador puede estar trabajando con el que adquirirá el derecho a un descando semanal corto';
Owner

descanso

descanso
carlosap marked this conversation as resolved
@ -0,0 +18,4 @@
ALTER TABLE `vn`.`workerTimeControlConfig`
ADD COLUMN `maxWorkLongCycle` INT(10) UNSIGNED DEFAULT 950400
COMMENT 'Máximo tiempo que un trabajador puede estar trabajando con el que adquirirá el derecho a un descando semanal largo';
Owner

descanso

descanso
carlosap marked this conversation as resolved
@ -0,0 +12,4 @@
* @param vDirection solo se pueden pasa los valores del campo
* workerTimeControl.direction ENUM('in', 'out', 'middle')
* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
* Si hay algún problema, devuelve el mesaje a que se debe mostrar al usuario
Owner

mensaje que

mensaje que
carlosap marked this conversation as resolved
carlosap added 1 commit 2023-10-23 13:52:12 +00:00
gitea/salix/pipeline/head This commit looks good Details
0055abc0a8
refs #4707 fix: problemas fichadas y test
carlosap requested review from jgallego 2023-10-23 13:52:39 +00:00
carlosap added 1 commit 2023-10-23 13:52:58 +00:00
gitea/salix/pipeline/head This commit looks good Details
08431e94c6
Merge branch 'master' into 4707-test-workerTimeControl
carlosap added 2 commits 2023-10-23 14:59:04 +00:00
jgallego approved these changes 2023-10-23 16:01:57 +00:00
carlosap added 1 commit 2023-10-24 15:03:43 +00:00
gitea/salix/pipeline/head This commit looks good Details
001d7cd574
Merge branch 'master' into 4707-test-workerTimeControl
carlosap merged commit 3ba4e72359 into master 2023-10-25 08:54:40 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
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#1808
No description provided.