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

5342-monitor.tickets_isFragile #1393

Merged
vicent merged 10 commits from 5342-monitor.tickets_isFragile into dev 2023-03-24 07:10:42 +00:00
Conversation 0 Commits 10 Files Changed 8 +118 -29
vicent commented 2023-03-16 10:38:29 +00:00
Contributor
Copy Link
No description provided.
vicent added the
CR / Tests passed
 label 2023-03-16 10:38:29 +00:00
vicent added 2 commits 2023-03-16 10:38:30 +00:00
gitea/salix/pipeline/head This commit looks good Details
23ce51abf0 refs #5342 add changelog
vicent requested review from jgallego 2023-03-16 10:38:36 +00:00
jgallego requested changes 2023-03-20 06:29:47 +00:00
db/changes/231201/00-sale_getWarnings.sql Outdated
@ -0,0 +30,4 @@
LEFT JOIN agencyMode am ON am.id = tt.agencyModeFk
LEFT JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
WHERE dm.code IN ('AGENCY', 'DELIVERY')
AND (ic.code = 'plant' OR it.code IN ('ZKA', 'ZKE'));
jgallego commented 2023-03-20 06:28:07 +00:00
Owner
Copy Link

açò es susceptible d'anar canviant en eltemps, hi ha que crear un camp en itemType, algo així com que "avisar si va en agencia"

açò es susceptible d'anar canviant en eltemps, hi ha que crear un camp en itemType, algo així com que "avisar si va en agencia"
vicent commented 2023-03-21 10:44:23 +00:00
Author
Contributor
Copy Link

Se ha preguntado a Julia, si solo hay que avisar cuando es por 'agencia' o por 'agencia' o 'reparto'

Se ha preguntado a Julia, si solo hay que avisar cuando es por 'agencia' o por 'agencia' o 'reparto'
jgallego commented 2023-03-21 11:40:31 +00:00
Owner
Copy Link

quina es la proposta teua per a llevar zka del codi?

quina es la proposta teua per a llevar zka del codi?
vicent commented 2023-03-22 09:57:27 +00:00
Author
Contributor
Copy Link

He creat el camp itemType.isFragile

He creat el camp itemType.isFragile
vicent marked this conversation as resolved
db/changes/231201/00-ticket_getWarnings.sql
@ -0,0 +2,4 @@
DELIMITER $$
$$
CREATE PROCEDURE `vn`.`ticket_getWarnings`()
jgallego commented 2023-03-20 06:28:42 +00:00
Owner
Copy Link

si sols es gasta ací jo ho posaria tot en un procedure

si sols es gasta ací jo ho posaria tot en un procedure
vicent commented 2023-03-21 10:47:01 +00:00
Author
Contributor
Copy Link

Fusionar ticket_getWarnings y sale_getWarnings dius?
Ho vaig fer aixi per seguir la mateixa estructura que ticket_getProblems (que crida a sale_getProblems).
Pero si se vol fusionar en un unic proc ho faig.

Fusionar ticket_getWarnings y sale_getWarnings dius? Ho vaig fer aixi per seguir la mateixa estructura que ticket_getProblems (que crida a sale_getProblems). Pero si se vol fusionar en un unic proc ho faig.
jgallego commented 2023-03-21 11:39:51 +00:00
Owner
Copy Link

sí, junta

sí, junta
vicent marked this conversation as resolved
db/changes/231201/00-ticket_getWarnings.sql Outdated
@ -0,0 +25,4 @@
GROUP BY sw.ticketFk;
UPDATE tmp.ticket_warnings tw
SET tw.totalWarnings =
jgallego commented 2023-03-20 06:29:21 +00:00
Owner
Copy Link

açò es molt raro, no se lo que fa, no te join..per a canviar-ho pots canviar-ho dalt directe no?

açò es molt raro, no se lo que fa, no te join..per a canviar-ho pots canviar-ho dalt directe no?
vicent commented 2023-03-21 10:47:33 +00:00
Author
Contributor
Copy Link

Eliminar este trozo de código.

Eliminar este trozo de código.
vicent marked this conversation as resolved
vicent added 35 commits 2023-03-22 09:58:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed
gitea/salix/pipeline/head There was a failure building this commit Details
4173a15f5e Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
7c3c3a2d66 refs #4632 added userError
gitea/salix/pipeline/head This commit looks good Details
4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head This commit looks good Details
a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
70beaf9b6c refs #5423 añadido 3r decimal
gitea/salix/pipeline/head This commit looks good Details
6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
aadb796adf Merge branch 'dev' into #5423-tercerDecimalCoste
gitea/salix/pipeline/head There was a failure building this commit Details
60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
f61c205a7b Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head This commit looks good Details
ed20927b52 Merge pull request 'fixes #4632 Llamar al nuevo método back de guardar firmas de salix' (!1346) from 4632-guardarFirmas-salix into dev 
Reviewed-on: #1346
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
40ccc4f409 Merge pull request 'refs #4357 add operator model' (!1395) from 4357-operatorSalix into dev 
Reviewed-on: #1395
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f5109724bf refs #5073 adaptacion para solo el año
gitea/salix/pipeline/head There was a failure building this commit Details
634db7c7fc refactor(getTransactions): lilium customer transactions
gitea/salix/pipeline/head There was a failure building this commit Details
3881e435f4 Renamed method
gitea/salix/pipeline/head This commit looks good Details
12a9ff599b Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
5e61cbabc7 Merge pull request 'refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion' (!1398) from 5203-supplier.create_refactor into dev 
Reviewed-on: #1398
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head Build queued... Details
6d6c2cbfb3 Default formatter
gitea/salix/pipeline/head There was a failure building this commit Details
3a922b453f Merge branch 'dev' into 5241-virtual_pos
gitea/salix/pipeline/head There was a failure building this commit Details
46b40c03a7 Merge pull request '5241-virtual_pos' (!1399) from 5241-virtual_pos into dev 
Reviewed-on: #1399
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
82a674e2f6 Merge pull request 'refs #5073 adaptacion para solo el año' (!1397) from 5073-diaActual into dev 
Reviewed-on: #1397
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d209b35071 Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev 
Reviewed-on: #1392
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d276c7b611 refs #5342 unificados proc x_getWarnings
vicent requested review from jgallego 2023-03-22 09:59:36 +00:00
vicent added 2 commits 2023-03-22 11:19:07 +00:00
gitea/salix/pipeline/head This commit looks good Details
27bb50ad12 refs #5342 esta tabla ya se borra en el proc
jgallego requested changes 2023-03-22 11:45:53 +00:00
db/changes/231201/00-ticket_getWarnings.sql Outdated
@ -0,0 +30,4 @@
LEFT JOIN agencyMode am ON am.id = tt.agencyModeFk
LEFT JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
WHERE dm.code IN ('AGENCY')
AND (ic.code = 'plant' OR it.isFragile);
jgallego commented 2023-03-22 11:45:23 +00:00
Owner
Copy Link

si ací deixes plant no es queda tot igual, canvia tot per a que siga isFragile, sino el dia que creen un tipo de planta que no siga fragile, no podrien.

si ací deixes plant no es queda tot igual, canvia tot per a que siga isFragile, sino el dia que creen un tipo de planta que no siga fragile, no podrien.
vicent commented 2023-03-22 11:53:36 +00:00
Author
Contributor
Copy Link

no entenc molt bé, que cree un camp isFragile per a itemCategory?

no entenc molt bé, que cree un camp isFragile per a itemCategory?
jgallego commented 2023-03-23 06:46:05 +00:00
Owner
Copy Link

seria una opció pero jo no faria ixa, jo rellenaria amb true tots els valors d'ItemType que pertanyan a plantes.

seria una opció pero jo no faria ixa, jo rellenaria amb true tots els valors d'ItemType que pertanyan a plantes.
vicent marked this conversation as resolved
vicent added 1 commit 2023-03-23 08:26:04 +00:00
vicent requested review from jgallego 2023-03-23 08:26:32 +00:00
vicent added 1 commit 2023-03-23 08:29:13 +00:00
jgallego approved these changes 2023-03-23 08:31:18 +00:00
vicent added 1 commit 2023-03-23 13:38:32 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
2513377add Merge branch 'dev' into 5342-monitor.tickets_isFragile
vicent added 1 commit 2023-03-24 06:59:40 +00:00
gitea/salix/pipeline/head This commit looks good Details
a45308c6a5 refs #5342 fix: testFront
alexandre approved these changes 2023-03-24 07:10:17 +00:00
vicent merged commit 3b9a17e179 into dev 2023-03-24 07:10:42 +00:00
vicent deleted branch 5342-monitor.tickets_isFragile 2023-03-24 07:10:42 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
alexandre
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
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#1393
No description provided.
Delete Branch "5342-monitor.tickets_isFragile"

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?