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

7965-unifyProblems #2990

Open
carlosap wants to merge 20 commits from 7965-unifyProblems into dev
pull from: 7965-unifyProblems
merge into: verdnatura:dev
Conversation 1 Commits 20 Files Changed 17 +460 -376
carlosap commented 2024-09-18 11:03:48 +00:00
Member
Copy Link
No description provided.
carlosap added 2 commits 2024-09-18 11:03:48 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
750b83bb45 fix: refs #7760 tmp.ticketIPT
carlosap added 1 commit 2024-09-19 18:15:42 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
712bfe7368 fix: refs #7965 UnifyProblems
carlosap added 1 commit 2024-09-30 12:30:23 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
69cafd5a04 fix: refs #7965 UnifyProblems
carlosap added 1 commit 2024-09-30 12:31:53 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
af4d1ad513 Merge branch 'dev' into 7965-unifyProblems
carlosap added 1 commit 2024-09-30 14:39:58 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
bb1695eac6 fix: refs #7965 UnifyProblems
carlosap added 1 commit 2024-10-01 13:46:56 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
6a5cf1a57f fix: refs #7965 UnifyProblems
carlosap added 2 commits 2024-10-02 12:25:33 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
99c70a533a fix: test
carlosap added 1 commit 2024-10-02 13:13:00 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
4e0a81464c fix: test
jon added 1 commit 2024-11-29 10:51:28 +00:00
jon added 1 commit 2024-11-29 10:55:06 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
568661021a feat: refs #7965 added #6242 back to unify PR
jon added 1 commit 2024-11-29 11:47:32 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
8fedd78938 fix: refs #7965 filter and sales back tests
jon commented 2024-11-29 11:53:12 +00:00
Member
Copy Link

Se habla con Carlos Andrés y se decide añadir el back de la tarea #6242 en esta PR puesto que están relacionadas.

Se habla con Carlos Andrés y se decide añadir el back de la tarea #6242 en esta PR puesto que están relacionadas.
jon requested review from alexm 2024-12-18 07:08:03 +00:00
carlosap requested review from jgallego 2024-12-19 11:42:23 +00:00
jgallego refused to review 2024-12-19 11:44:46 +00:00
alexm approved these changes 2024-12-19 12:08:37 +00:00
carlosap requested review from jgallego 2024-12-19 13:44:15 +00:00
jgallego requested changes 2024-12-19 15:49:49 +00:00
Dismissed
db/routines/vn/procedures/sale_getProblems.sql Outdated
@ -9,3 +9,1 @@
* @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
* @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Tickets a calcular
* @return tmp.sale_problems
* @table tmp.sale(saleFk) Identificadores de los sale a calcular
jgallego commented 2024-12-19 15:40:04 +00:00
Owner
Copy Link

falta vIsTodayRelative

falta vIsTodayRelative
jgallego marked this conversation as resolved
db/routines/vn/procedures/sale_getProblems.sql
@ -23,0 +20,4 @@
JOIN sale s ON s.id = ts.saleFk
JOIN ticket t ON t.id = s.ticketFk
WHERE t.shipped BETWEEN util.VN_CURDATE()
AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY)
jgallego commented 2024-12-19 15:40:56 +00:00
Owner
Copy Link

confirma si açò es lo mateix que gastar dayend

confirma si açò es lo mateix que gastar dayend
jgallego commented 2025-01-09 07:55:45 +00:00
Owner
Copy Link

Açò no has contestat ni has modificat.

Açò no has contestat ni has modificat.
carlosap commented 2025-01-15 10:16:08 +00:00
Author
Member
Copy Link

util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY) no és igual que gastar dayEnd, el que està fent es sumar 9 ó 1 día segons el paràmetro vIsTodayRelative. És com està ara en producció. Entenc que podem simplificar-ho, no entenc perqué 9.9 / 1.9 i no 9 / 1, però és com està en producció

util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY) no és igual que gastar dayEnd, el que està fent es sumar 9 ó 1 día segons el paràmetro vIsTodayRelative. És com està ara en producció. Entenc que podem simplificar-ho, no entenc perqué 9.9 / 1.9 i no 9 / 1, però és com està en producció
jgallego marked this conversation as resolved
db/routines/vn/procedures/sale_getProblems.sql Outdated
@ -141,0 +77,4 @@
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
AND tis.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible, 0) < s.quantity
AND IFNULL(av.available, 0) < s.quantity
jgallego commented 2024-12-19 15:42:41 +00:00
Owner
Copy Link

ja posats canvia el IFNULL que en la convencio ja no esta acceptat

ja posats canvia el IFNULL que en la convencio ja no esta acceptat
jgallego marked this conversation as resolved
db/routines/vn/procedures/ticket_getProblems.sql Outdated
@ -9,3 +8,2 @@
*
* @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
* @return tmp.ticket_problems
* @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
jgallego commented 2024-12-19 15:44:32 +00:00
Owner
Copy Link

vIsTodayRelative falta descripcio

vIsTodayRelative falta descripcio
jgallego marked this conversation as resolved
db/routines/vn/procedures/ticket_getProblems.sql Outdated
@ -32,0 +73,4 @@
)SELECT tt.ticketFk,
IF(FIND_IN_SET('isFreezed', t.problem), TRUE, FALSE) isFreezed,
t.risk,
IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk,
jgallego commented 2024-12-19 15:45:19 +00:00
Owner
Copy Link

es posible que el if sobre si true es true, asignau directament no?

es posible que el if sobre si true es true, asignau directament no?
jgallego marked this conversation as resolved
db/routines/vn/procedures/ticket_getProblems.sql Outdated
@ -32,0 +84,4 @@
TRUE, FALSE) isTooLittle,
IF(c.businessTypeFk = 'VIP', TRUE, FALSE) isVip,
IF(his.ticketFk IS NULL, FALSE, TRUE) hasItemShortage,
IF(hid.ticketFk IS NULL, FALSE, TRUE) hasItemDelay,
jgallego commented 2024-12-19 15:45:41 +00:00
Owner
Copy Link

aci pots posar NOT i la comparacio

aci pots posar NOT i la comparacio
jgallego marked this conversation as resolved
modules/ticket/back/methods/ticket/filter.js
@ -312,2 +308,2 @@
AND f.shipped >= ?
`, [date]);
SELECT f.id ticketFk
FROM tmp.filter f`);
jgallego commented 2024-12-19 15:47:15 +00:00
Owner
Copy Link

ací que lleves el where no se dir si esta be o no, asegurat tu.

ací que lleves el where no se dir si esta be o no, asegurat tu.
carlosap commented 2025-01-15 10:11:16 +00:00
Author
Member
Copy Link

Ja porta els filtros de fecha y estado la taula tmp.filter

Ja porta els filtros de fecha y estado la taula tmp.filter
carlosap added 1 commit 2025-01-09 07:13:48 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
71fcce4ed7 Merge branch 'dev' into 7965-unifyProblems
carlosap added 1 commit 2025-01-09 07:43:18 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
8f99b14510 fix: refs #7965 UnifyProblems
carlosap requested review from jgallego 2025-01-09 07:44:03 +00:00
carlosap added 1 commit 2025-01-09 09:34:52 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
638a8e344d fix: refs #7965 UnifyProblems
carlosap added 1 commit 2025-01-09 10:52:38 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
09b4b2cf1b fix: refs #7965 UnifyProblems
carlosap added 1 commit 2025-01-09 14:46:09 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
2d8bda2b56 fix: refs #7965 UnifyProblems
carlosap added 1 commit 2025-01-15 10:16:27 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
948ad3a752 Merge branch 'dev' into 7965-unifyProblems
carlosap requested review from alexm 2025-01-15 10:17:01 +00:00
jgallego approved these changes 2025-01-15 11:19:22 +00:00
carlosap added 1 commit 2025-01-15 17:37:35 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
f79bc2a665 Merge branch 'dev' into 7965-unifyProblems
alexm requested changes 2025-01-16 06:17:44 +00:00
modules/ticket/back/methods/ticket/getSales.js
@ -107,2 +102,2 @@
sale.hasTicketRequest = problems.hasTicketRequest;
sale.hasComponentLack = problems.hasComponentLack;
for (const problem in problems)
sale[problem] = problems[problem];
alexm commented 2025-01-16 06:17:05 +00:00
Member
Copy Link

Podriem ficarli una anidacio
sale.problems[problem]
Aixina en el front sols hi ha q recorrers ixa propietat encomter de totes les de sale

Si voleu com esta avisam i la aprove

Podriem ficarli una anidacio `sale.problems[problem]` Aixina en el front sols hi ha q recorrers ixa propietat encomter de totes les de sale Si voleu com esta avisam i la aprove
All checks were successful
gitea/salix/pipeline/pr-dev This commit looks good
Required
Details
This pull request has changes requested by an official reviewer.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
alexm
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
4 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#2990
No description provided.
Delete Branch "7965-unifyProblems"

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?