refs #6882 absence #2271

Merged
carlossa merged 13 commits from 6682-notHolidays into dev 2024-05-08 10:27:21 +00:00
Member
No description provided.
carlossa added 1 commit 2024-04-09 10:30:07 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
de75d811c3
refs #6682 absence
carlossa added 1 commit 2024-05-03 10:26:41 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f77cf619db
refs #6682 holidays conditional
carlossa added 1 commit 2024-05-06 07:25:31 +00:00
carlossa changed title from WIP: refs #6682 absence to refs #6682 absence 2024-05-06 07:26:35 +00:00
carlossa requested review from alexm 2024-05-06 07:26:39 +00:00
carlossa added the
CR / Tests passed
label 2024-05-06 08:09:16 +00:00
carlossa added 1 commit 2024-05-06 08:09:24 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
bc5f78827c
Merge branch 'dev' into 6682-notHolidays
alexm changed title from refs #6682 absence to refs #6882 absence 2024-05-07 09:29:08 +00:00
alexm reviewed 2024-05-07 09:33:51 +00:00
@ -0,0 +1,9 @@
-- Place your SQL code here
ALTER TABLE vn.absenceType ADD isFestive BOOL DEFAULT 1 NOT NULL COMMENT 'Para marcar un tipo de absence';
Member

No me acaba el nom

No me acaba el nom
carlossa marked this conversation as resolved
alexm reviewed 2024-05-07 09:34:09 +00:00
@ -0,0 +3,4 @@
UPDATE vn.absenceType
SET isFestive=0
WHERE id=1;
Member

ficant el code se veu mes visual

ficant el code se veu mes visual
carlossa marked this conversation as resolved
alexm reviewed 2024-05-07 09:35:44 +00:00
@ -99,0 +101,4 @@
where: {id: args.businessFk}
},);
const [holiday] = await models.CalendarHoliday.find({
Member

es lo mateix q fer const holiday = ... .findOne no?

es lo mateix q fer `const holiday = ... .findOne` no?
carlossa marked this conversation as resolved
alexm requested changes 2024-05-07 09:37:05 +00:00
Dismissed
@ -99,0 +110,4 @@
if (holiday && isFestive)
throw new UserError(`Cannot add holidays on this day`);
if ((isHalfHoliday && hasHalfHoliday) && isFestive)
Member

El error este el posaria de lo primer (aixina no cal fer peticions) i sobra el isFestive

El error este el posaria de lo primer (aixina no cal fer peticions) i sobra el isFestive
carlossa marked this conversation as resolved
carlossa added 2 commits 2024-05-07 12:58:40 +00:00
carlossa added 1 commit 2024-05-08 06:47:42 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
8637488fc1
refs #6882 fix pr
carlossa requested review from alexm 2024-05-08 07:36:14 +00:00
carlossa added 1 commit 2024-05-08 07:55:30 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
c0b4a931a6
Merge branch 'dev' into 6682-notHolidays
alexm requested changes 2024-05-08 08:16:20 +00:00
Dismissed
alexm left a comment
Member

Y hacer un test basico probandolo

Y hacer un test basico probandolo
@ -99,0 +109,4 @@
},);
if (holiday && isFestive)
throw new UserError(`Cannot add holidays on this day`);
Member

if (isHalfHoliday && (hasHalfHoliday || isFestive))

if (isHalfHoliday && (hasHalfHoliday || isFestive))
carlossa marked this conversation as resolved
carlossa added 2 commits 2024-05-08 09:46:21 +00:00
carlossa requested review from alexm 2024-05-08 09:49:12 +00:00
carlossa added 1 commit 2024-05-08 10:05:04 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0709a64dca
refs #6882 fix back
carlossa added 1 commit 2024-05-08 10:17:02 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
8a7d124066
refs #6882 fix traductions
alexm approved these changes 2024-05-08 10:18:21 +00:00
carlossa added 1 commit 2024-05-08 10:23:21 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
7b298c1baf
refs #6882 fix tback
carlossa merged commit f64e899061 into dev 2024-05-08 10:27:21 +00:00
carlossa deleted branch 6682-notHolidays 2024-05-08 10:27:21 +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#2271
No description provided.