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

#7884 - Add new param to search days backward #2875

Open
jsegarra wants to merge 2 commits from 7884_daysBackward into dev
pull from: 7884_daysBackward
merge into: verdnatura:dev
Conversation 0 Commits 2 Files Changed 2 +22 -7
jsegarra commented 2024-08-21 13:24:35 +00:00
Member
Copy Link
No description provided.
jsegarra added 1 commit 2024-08-21 13:24:36 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
151b26ae8b feat(salix): #7884 add new param
jsegarra requested review from guillermo 2024-08-21 13:24:46 +00:00
jsegarra changed title from Add new param to search days backward to #7884 - Add new param to search days backward 2024-08-21 18:38:11 +00:00
jsegarra added 1 commit 2024-08-21 18:48:06 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
2aec9db824 test: refs #7884 change days by daysAfter
guillermo requested changes 2024-08-22 05:17:16 +00:00
Dismissed
modules/entry/back/methods/entry/filter.js
@ -215,3 +220,2 @@
sql: `
AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
AND t.shipped >= util.VN_CURDATE()
AND ((t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
guillermo commented 2024-08-22 05:16:36 +00:00
Member
Copy Link

Aquí por que no gastas un BETWEEN?

Aquí por que no gastas un BETWEEN?
jsegarra commented 2024-08-22 06:30:11 +00:00
Author
Member
Copy Link

Porque estarías obligando al usuario al introducir 2 valores siempre no?
Y porque no poner un valor por defecto, porque habría que gestionar/mantener ese valor en BD

Porque estarías obligando al usuario al introducir 2 valores siempre no? Y porque no poner un valor por defecto, porque habría que gestionar/mantener ese valor en BD
guillermo commented 2024-08-22 06:57:07 +00:00
Member
Copy Link

Tienes razón.

Tienes razón.
guillermo marked this conversation as resolved
modules/entry/back/methods/entry/filter.js
@ -222,0 +227,4 @@
if (ctx.args.daysBefore) {
stmt.merge({
sql: `
${ctx.args.daysAfter ? 'OR' : 'AND'} (t.shipped <= util.VN_CURDATE()
guillermo commented 2024-08-22 05:17:10 +00:00
Member
Copy Link

Esto creo que se puede unificar con lo de arriba, utilizando el INTERVAL

Esto creo que se puede unificar con lo de arriba, utilizando el INTERVAL
guillermo commented 2024-08-22 06:57:31 +00:00
Member
Copy Link

Si esto lo has probado y funciona bien, adelante

Si esto lo has probado y funciona bien, adelante
jsegarra commented 2024-08-22 07:11:56 +00:00
Author
Member
Copy Link

Los test no se han modificado por lo que debe ir bien.
Pero respondiendo a tu inquietud.
He modificado el travel 3 a 2000-12-30 y en daysBefore he puesto 2 y sólo me sale este resultado.

Si te parece y tienes tiempo, podemos probarlo antes de subirlo

Los test no se han modificado por lo que debe ir bien. Pero respondiendo a tu inquietud. He modificado el travel 3 a 2000-12-30 y en daysBefore he puesto 2 y sólo me sale este resultado. Si te parece y tienes tiempo, podemos probarlo antes de subirlo
guillermo approved these changes 2024-08-22 06:57:50 +00:00
All checks were successful
gitea/salix/pipeline/pr-dev This commit looks good
Required
Details
This pull request has changes conflicting with the target branch.
  • modules/entry/back/methods/entry/filter.js
  • modules/entry/back/methods/entry/specs/filter.spec.js
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#2875
No description provided.
Delete Branch "7884_daysBackward"

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?