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

6220-addressFilter #1886

Merged
carlossa merged 13 commits from 6220-addressFilter into dev 2023-12-18 11:45:12 +00:00
Conversation 0 Commits 13 Files Changed 1 +24 -7
carlossa commented 2023-12-11 13:51:22 +00:00
Member
Copy Link
No description provided.
carlossa added 2 commits 2023-12-11 13:51:23 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
c81ca94d2e refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
7e6f311a43 refs #6220 address filter
carlossa added 1 commit 2023-12-12 12:14:38 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
6cefc982e4 refs #6220 add filter address
carlossa requested review from jgallego 2023-12-12 12:15:47 +00:00
carlossa changed title from WIP: 6220-addressFilter to 6220-addressFilter 2023-12-12 12:19:42 +00:00
carlossa added 1 commit 2023-12-12 12:20:55 +00:00
gitea/salix/pipeline/head This commit looks good Details
78aa25d74f refs #6220 fix testback
carlossa added the
CR / Tests passed
 label 2023-12-12 12:21:04 +00:00
carlossa added 1 commit 2023-12-12 12:21:15 +00:00
gitea/salix/pipeline/head This commit looks good Details
16a76f0bbf Merge branch 'dev' into 6220-addressFilter
jgallego requested changes 2023-12-13 05:56:41 +00:00
modules/client/back/methods/client/filter.js Outdated
@ -114,0 +124,4 @@
case 'provinceFk':
return {or: [
{'p.name': {like: `%${value}`}},
{'a.provinceFk': {like: `%${value}`}}
jgallego commented 2023-12-13 05:55:43 +00:00
Owner
Copy Link

açò esta provat?

açò esta provat?
carlossa commented 2023-12-13 07:51:18 +00:00
Author
Member
Copy Link

Si, funciona

Si, funciona
jgallego approved these changes 2023-12-13 07:47:52 +00:00
Dismissed
carlossa requested review from jgallego 2023-12-13 07:51:00 +00:00
carlossa added 1 commit 2023-12-13 07:51:26 +00:00
gitea/salix/pipeline/head This commit looks good Details
371a202230 Merge branch 'dev' into 6220-addressFilter
carlossa added 2 commits 2023-12-13 14:05:30 +00:00
carlossa dismissed jgallego’s review 2023-12-13 14:05:30 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

carlossa added 1 commit 2023-12-13 14:05:53 +00:00
gitea/salix/pipeline/head This commit looks good Details
9a5536a3a3 Merge branch 'dev' into 6220-addressFilter
jgallego requested changes 2023-12-13 14:13:03 +00:00
jgallego left a comment
Owner
Copy Link

{'a.provinceFk': {like: %${value}}} esto es lo que hemos hablado que hay que quitar

{'a.provinceFk': {like: `%${value}`}} esto es lo que hemos hablado que hay que quitar
modules/client/back/methods/client/filter.js
@ -141,3 +154,3 @@
c.isActive,
c.isFreezed,
p.id AS provinceFk,
p.id AS provinceFk2,
jgallego commented 2023-12-13 12:38:10 +00:00
Owner
Copy Link

provinceClientFk

provinceClientFk
modules/client/back/methods/client/filter.js
@ -142,2 +155,3 @@
c.isFreezed,
p.id AS provinceFk,
p.id AS provinceFk2,
a.provinceFk,
jgallego commented 2023-12-13 12:38:01 +00:00
Owner
Copy Link

provinceAddressFk

provinceAddressFk
carlossa added 2 commits 2023-12-14 13:37:11 +00:00
carlossa added 1 commit 2023-12-14 13:51:12 +00:00
gitea/salix/pipeline/head This commit looks good Details
fe184156a1 Merge branch 'dev' into 6220-addressFilter
carlossa requested review from jgallego 2023-12-14 13:53:25 +00:00
jgallego approved these changes 2023-12-14 14:03:14 +00:00
carlossa added 1 commit 2023-12-18 11:17:04 +00:00
gitea/salix/pipeline/head This commit looks good Details
e4de704b4c Merge branch 'dev' into 6220-addressFilter
carlossa merged commit 6ff7edfada into dev 2023-12-18 11:45:12 +00:00
carlossa deleted branch 6220-addressFilter 2023-12-18 11:45:12 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
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#1886
No description provided.
Delete Branch "6220-addressFilter"

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?