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

refs #7531 Modify zone_getAddresses #2675

Merged
guillermo merged 5 commits from 7531-Modify-zone_getAddresses into dev 2024-07-30 10:02:12 +00:00
Conversation 0 Commits 5 Files Changed 1 +39 -37
ivanm commented 2024-07-03 15:11:29 +00:00
Member
Copy Link
No description provided.
ivanm added 1 commit 2024-07-03 15:11:29 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
4bef3e9107 refs #7531 Modify zone_getAddresses
ivanm requested review from guillermo 2024-07-03 15:13:21 +00:00
guillermo requested changes 2024-07-04 05:18:00 +00:00
Dismissed
db/routines/vn/procedures/zone_getAddresses.sql Outdated
@ -3,2 +3,3 @@
vSelf INT,
vLanded DATE
vDated DATE,
vDepartment INT
guillermo commented 2024-07-04 05:09:05 +00:00
Member
Copy Link

vDepartmentFk

vDepartmentFk
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql Outdated
@ -12,6 +13,7 @@ BEGIN
*
* @param vSelf Id de zona
* @param vDated Fecha de entrega
* @param vDepartment Departamento del trabajador
guillermo commented 2024-07-04 05:09:11 +00:00
Member
Copy Link

vDepartmentFk Id de departamento

vDepartmentFk Id de departamento
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql
@ -22,34 +24,47 @@ BEGIN
WHERE id NOT IN (
guillermo commented 2024-07-04 05:17:05 +00:00
Member
Copy Link

notHasTicket crec que te sobra

notHasTicket crec que te sobra
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql
@ -26,1 +27,4 @@
WHERE landed BETWEEN vDated AND util.dayEnd(vDated)
)
),
hasTicketShippedToday AS (
guillermo commented 2024-07-04 05:10:07 +00:00
Member
Copy Link

hasTickets (today no es correcte perque li pots pasar una altra fetxa que no siga hui)

hasTickets (today no es correcte perque li pots pasar una altra fetxa que no siga hui)
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql
@ -26,1 +28,4 @@
)
),
hasTicketShippedToday AS (
SELECT clientFk,
guillermo commented 2024-07-04 05:14:43 +00:00
Member
Copy Link

Aço queda mes net aixina:

		SELECT DISTINCT clientFk
			FROM vn.ticket
			WHERE shipped BETWEEN vDated AND util.dayEnd(vDated)
Aço queda mes net aixina: ``` SELECT DISTINCT clientFk FROM vn.ticket WHERE shipped BETWEEN vDated AND util.dayEnd(vDated) ```
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql
@ -27,0 +31,4 @@
SELECT clientFk,
IF (COUNT(*) > 0, TRUE, FALSE) hasTicketShipped
FROM vn.ticket
WHERE shipped BETWEEN vDated AND util.dayEnd(vDated)
guillermo commented 2024-07-04 05:17:57 +00:00
Member
Copy Link

Si li preguntares i volia per shipped ok

Si li preguntares i volia per shipped ok
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql
@ -53,0 +42,4 @@
u.name username,
aai.invoiced,
cnb.lastShipped,
ht.hasTicketShipped
guillermo commented 2024-07-04 05:15:40 +00:00
Member
Copy Link

IF(ht.clientFk, TRUE, FALSE) hasTicket

IF(ht.clientFk, TRUE, FALSE) hasTicket
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql Outdated
@ -53,0 +58,4 @@
LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
JOIN vn.clientType ct ON ct.code = c.typeFk
JOIN vn.businessType bt ON bt.code = c.businessTypeFk
LEFT JOIN hasTicketShippedToday ht ON ht.clientFk = c.id
guillermo commented 2024-07-04 05:11:10 +00:00
Member
Copy Link

hasTickets

hasTickets
ivanm marked this conversation as resolved
db/routines/vn/procedures/zone_getAddresses.sql Outdated
@ -53,0 +63,4 @@
AND c.isActive
AND ct.code = 'normal'
AND bt.code <> 'worker'
AND d.id = vDepartment
guillermo commented 2024-07-04 05:11:20 +00:00
Member
Copy Link

vDepartmentFk

vDepartmentFk
ivanm marked this conversation as resolved
ivanm added 1 commit 2024-07-16 16:56:10 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
50e2c03d3e refs #7531 Requested modifications in redmine
ivanm added 1 commit 2024-07-16 16:57:54 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
350e4b4c53 Merge branch 'dev' into 7531-Modify-zone_getAddresses
ivanm requested review from guillermo 2024-07-16 17:00:42 +00:00
guillermo requested changes 2024-07-18 05:58:13 +00:00
Dismissed
db/routines/vn/procedures/zone_getAddresses.sql Outdated
@ -53,0 +50,4 @@
AND c.isActive
AND ct.code = 'normal'
AND bt.code <> 'worker'
AND d.id = vDepartmentFk
guillermo commented 2024-07-18 05:55:27 +00:00
Member
Copy Link

Soporta que pueda ser null:
(d.id = vDepartmentFk OR NOT vDepartmentFk)

Soporta que pueda ser null: `(d.id = vDepartmentFk OR NOT vDepartmentFk)`
ivanm commented 2024-07-18 13:16:42 +00:00
Author
Member
Copy Link

Cert, també demana els que no tinguen comercial/departament assignat. Ho modifique.

Cert, també demana els que no tinguen comercial/departament assignat. Ho modifique.
ivanm marked this conversation as resolved
ivanm added 1 commit 2024-07-18 13:22:10 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
a6e6f435f7 refs #7531 No assigned department
ivanm added 1 commit 2024-07-18 13:23:41 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
c44bf909b2 Merge branch 'dev' into 7531-Modify-zone_getAddresses
ivanm requested review from guillermo 2024-07-18 13:26:18 +00:00
guillermo approved these changes 2024-07-19 05:26:32 +00:00
guillermo merged commit bcf08db6d6 into dev 2024-07-30 10:02:12 +00:00
guillermo deleted branch 7531-Modify-zone_getAddresses 2024-07-30 10:02:12 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
guillermo
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
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#2675
No description provided.
Delete Branch "7531-Modify-zone_getAddresses"

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?