fix: refs #8222 fix deleteZone #3239

Open
carlossa wants to merge 4 commits from 8222-refactDeleteZone into master
Member
No description provided.
carlossa added the
CR / Tests passed
label 2024-11-25 07:14:03 +00:00
carlossa added 1 commit 2024-11-25 07:14:03 +00:00
gitea/salix/pipeline/pr-master There was a failure building this commit Details
272dbd210b
fix: refs #8222 fix deleteZone
carlossa added 1 commit 2024-11-25 07:19:19 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
672578542e
fix: refs #8222 fix sql method
carlossa requested review from jgallego 2024-11-25 08:43:27 +00:00
carlossa requested review from alexm 2024-11-25 08:43:31 +00:00
jgallego requested changes 2024-11-25 12:06:19 +00:00
@ -241,3 +241,3 @@
"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
"The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line",
"There are tickets for this area, delete them first": "There are tickets for this area, delete them first"
"There are tickets to be invoiced for this area, please delete them first": "There are tickets to be invoiced for this area, please delete them first"
Owner

la clave es molt llarga, ha de ser mes curta, despues el text el pots deixar igual de llarg.
Ademés, el text this area no es intuitiu, canviau per this zone, y la traduccio seria en esa zona

la clave es molt llarga, ha de ser mes curta, despues el text el pots deixar igual de llarg. Ademés, el text this area no es intuitiu, canviau per this zone, y la traduccio seria en esa zona
carlossa marked this conversation as resolved
@ -54,3 +54,1 @@
if (ticketList.length > 0)
throw new UserError('There are tickets for this area, delete them first');
const hasRefFkFilled = ticketList.some(ticket => ticket.refFk !== null && ticket.refFk !== undefined);
Owner

hasRefFk suficient

hasRefFk suficient
carlossa marked this conversation as resolved
@ -10,3 +10,3 @@
const ctx = {req: activeCtx};
const zoneId = 4;
const zoneId2 = 3;
const zoneId1 = 1;
Owner

si sols es gasta baix, meneja els const cadascun a la seua seccio

si sols es gasta baix, meneja els const cadascun a la seua seccio
carlossa marked this conversation as resolved
carlossa added 1 commit 2024-11-25 12:16:16 +00:00
gitea/salix/pipeline/pr-master There was a failure building this commit Details
117baa3298
fix: refs #8222 fix deleteZone
carlossa added 1 commit 2024-11-25 12:23:02 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
100b709cee
fix: refs #8222 fix pr
carlossa requested review from jgallego 2024-11-25 12:25:17 +00:00
jgallego approved these changes 2024-11-25 12:30:01 +00:00
@ -19,3 +17,3 @@
const originalTickets = await models.Ticket.find({
where: {
zoneFk: zoneId
zoneFk: 4
Owner

en el proxim pr, crea de nou la constant, pero en cada una de les seccions

en el proxim pr, crea de nou la constant, pero en cada una de les seccions
alexm requested changes 2024-11-29 06:38:32 +00:00
@ -54,3 +54,1 @@
if (ticketList.length > 0)
throw new UserError('There are tickets for this area, delete them first');
const hasRefFk = ticketList.some(ticket => ticket.refFk !== null && ticket.refFk !== undefined);
Member

const hasRefFk = ticketList.some(ticket => ticket.refFk)

const hasRefFk = ticketList.some(ticket => ticket.refFk)
All checks were successful
gitea/salix/pipeline/pr-master This commit looks good
Required
Details
This pull request has changes conflicting with the target branch.
  • loopback/locale/en.json
  • loopback/locale/es.json
Sign in to join this conversation.
No reviewers
No Milestone
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#3239
No description provided.