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

feat: refs #7126 Refactor and added columns in bs.waste table & proc #2436

Closed
guillermo wants to merge 0 commits from 7126-improvedWaste into dev
pull from: 7126-improvedWaste
merge into: verdnatura:dev
Conversation 2 Commits - Files Changed - +9224 -10537
guillermo commented 2024-05-10 08:02:14 +00:00
Member
Copy Link
No description provided.
guillermo added 1 commit 2024-05-10 08:02:15 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
1ea357a5dd feat: refs #7126 Refactor and added columns in bs.waste table & proc
guillermo commented 2024-05-10 08:03:53 +00:00
Author
Member
Copy Link

Valorar si crear 2 tablas para referenciar los address que hacen de mermas internas o externas en vez de poner el nickname del address a pelo en el procedimiento

Valorar si crear 2 tablas para referenciar los address que hacen de mermas internas o externas en vez de poner el nickname del address a pelo en el procedimiento
guillermo changed title from feat: refs #7126 Refactor and added columns in bs.waste table & proc to WIP: feat: refs #7126 Refactor and added columns in bs.waste table & proc 2024-05-10 08:04:01 +00:00
guillermo added 1 commit 2024-05-10 08:05:06 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
eea04520ad Fix: refs #7126 Fix proc
guillermo added 1 commit 2024-05-10 09:05:24 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b1e136aa47 Fix: refs #7126 Tests back
guillermo added 1 commit 2024-05-10 09:06:53 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
13ed86d26d Fix: refs #7126 Tests back
guillermo added 1 commit 2024-05-10 11:20:18 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
4d1031e031 feat: refs #7126 Added manaClaim calc
guillermo added 1 commit 2024-05-10 11:20:35 +00:00
gitea/salix/pipeline/pr-dev Build queued... Details
b324b0c0f3 Merge branch 'dev' into 7126-improvedWaste
carlosap requested changes 2024-05-31 13:25:30 +00:00
Dismissed
db/routines/bs/procedures/waste_addSales.sql Outdated
@ -30,0 +47,4 @@
LEFT JOIN component c ON c.id = sc.componentFk
WHERE w.isManaged
AND YEAR(t.shipped) = YEAR(util.VN_CURDATE())
AND WEEK(t.shipped, 4) = WEEK(util.VN_CURDATE(), 4)
carlosap commented 2024-05-31 13:19:08 +00:00
Member
Copy Link

Que implica el WEEK(xxxx, 4) en los 2, se comporta igual que si lo quitamos

Que implica el WEEK(xxxx, 4) en los 2, se comporta igual que si lo quitamos
guillermo commented 2024-06-03 05:22:07 +00:00
Author
Member
Copy Link

Creo que no es así, lo puse porque si no no cuadraba con la inserción que se estaba realizando.
Si mal no recuerdo, es porque ese detecta que la primera semana es week 1 y el WEEK() (sin numero), retornaba 0.

Creo que no es así, lo puse porque si no no cuadraba con la inserción que se estaba realizando. Si mal no recuerdo, es porque ese detecta que la primera semana es week 1 y el WEEK() (sin numero), retornaba 0.
guillermo marked this conversation as resolved
guillermo changed title from WIP: feat: refs #7126 Refactor and added columns in bs.waste table & proc to feat: refs #7126 Refactor and added columns in bs.waste table & proc 2024-06-03 05:22:11 +00:00
guillermo requested review from carlosap 2024-06-03 05:22:16 +00:00
guillermo added 1 commit 2024-06-03 05:22:19 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
carlosap approved these changes 2024-06-20 12:54:51 +00:00
Dismissed
guillermo added 1 commit 2024-07-09 09:40:27 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
769ee33ab2 fix: refs #7126 Added addressWaste type
guillermo added 1 commit 2024-07-09 09:43:18 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
c3051ebcfb fix: refs #7126 Fix
guillermo added 1 commit 2024-07-09 09:56:35 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f4e5f0205d fix: refs #7126 Fix
guillermo added 1 commit 2024-07-09 10:00:58 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
bb7002b702 fix: refs #7126 Minor change
guillermo added 1 commit 2024-07-09 10:02:17 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
guillermo added 1 commit 2024-07-09 10:04:11 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
b28ef09f3d Merge branch 'dev' into 7126-improvedWaste
guillermo requested review from carlosap 2024-07-09 10:17:51 +00:00
carlosap requested changes 2024-07-10 08:54:32 +00:00
Dismissed
db/routines/bs/procedures/waste_addSales.sql Outdated
@ -30,0 +41,4 @@
LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id
LEFT JOIN vn.component c ON c.id = sc.componentFk
WHERE w.isManaged
AND YEAR(t.shipped) = YEAR(util.VN_CURDATE())
carlosap commented 2024-07-10 08:52:29 +00:00
Member
Copy Link

Podemos evitar hacer uso de las funciones de YEAR/WEEK seteando los valores de inicio y fin en 2 variables y hacer un BETWEEN? Es posible que por hacer uso de las funciones estés obligando forzar el índice¿?

Podemos evitar hacer uso de las funciones de YEAR/WEEK seteando los valores de inicio y fin en 2 variables y hacer un BETWEEN? Es posible que por hacer uso de las funciones estés obligando forzar el índice¿?
guillermo marked this conversation as resolved
modules/item/back/methods/item/getWasteByItem.js
@ -52,0 +58,4 @@
JOIN vn.itemType it ON it.id = w.itemTypeFk
WHERE w.buyerFk = ? AND w.itemTypeFk = ?
AND w.year = YEAR(TIMESTAMPADD(WEEK, -1, ?))
AND w.week = WEEK(TIMESTAMPADD(WEEK, -1, ?), 1)
carlosap commented 2024-07-10 08:53:41 +00:00
Member
Copy Link

ver la posibilidad de pasar a un BETWEEN

ver la posibilidad de pasar a un BETWEEN
guillermo commented 2024-07-10 10:00:23 +00:00
Author
Member
Copy Link

En la tabla no hay un campo dated, solo se pone la semana y el año.

En la tabla no hay un campo dated, solo se pone la semana y el año.
guillermo marked this conversation as resolved
print/templates/email/buyer-week-waste/sql/wasteWeekly.sql
@ -9,1 +7,3 @@
GROUP BY buyer
JOIN account.user u ON u.id = w.buyerFk
JOIN vn.itemType it ON it.id = w.itemTypeFk
WHERE w.year = YEAR(util.VN_CURDATE() - INTERVAL 1 WEEK)
carlosap commented 2024-07-10 08:54:29 +00:00
Member
Copy Link

pasar a BETWEEN

pasar a BETWEEN
guillermo commented 2024-07-10 10:00:09 +00:00
Author
Member
Copy Link

En la tabla no hay un campo dated, solo se pone la semana y el año.

En la tabla no hay un campo dated, solo se pone la semana y el año.
guillermo marked this conversation as resolved
guillermo added 1 commit 2024-07-10 10:01:00 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
889982dd82 refactor: refs #7126 Requested changes
guillermo requested review from carlosap 2024-07-18 11:36:29 +00:00
carlosap approved these changes 2024-07-19 10:48:43 +00:00
guillermo closed this pull request 2024-07-19 11:18:16 +00:00
guillermo commented 2024-07-19 11:18:28 +00:00
Author
Member
Copy Link

Cierro el PR porque está bug

Cierro el PR porque está bug
All checks were successful
gitea/salix/pipeline/pr-dev This commit looks good
Required
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
carlosap
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#2436
No description provided.
Delete Branch "7126-improvedWaste"

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?