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

4846-claim.search-panel #1174

Merged
vicent merged 18 commits from 4846-claim.search-panel into dev 2023-01-10 13:09:23 +00:00
Conversation 1 Commits 18 Files Changed 5 +131 -33
vicent commented 2022-11-23 13:29:37 +00:00
Contributor
Copy Link
No description provided.
vicent added 2 commits 2022-11-23 13:29:38 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
1c6a5164d4 feat: buscar por itemFk y claimResponsibleFk
gitea/salix/pipeline/head This commit looks good Details
14eba75a8e feat: backTest
vicent commented 2022-11-23 13:30:01 +00:00
Author
Contributor
Copy Link

En Feedback, esperando revisión.

En Feedback, esperando revisión.
vicent requested review from joan 2022-11-24 13:30:02 +00:00
vicent added 1 commit 2022-11-25 07:24:42 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d023ec0a13 update fixtures
vicent added 82 commits 2022-11-25 13:21:46 +00:00
gitea/salix/pipeline/head This commit looks good Details
4f25961988 Created checkbox and logic, package-lock
gitea/salix/pipeline/head There was a failure building this commit Details
0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head This commit looks good Details
d6a0580203 feat: traducciones modelo Ticket
gitea/salix/pipeline/head There was a failure building this commit Details
9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
60d12826e4 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
284837083c feat: coge el idioma local
gitea/salix/pipeline/head This commit looks good Details
dd8117b6a4 feat: añadidas traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
46c7aa24b8 fix: corregidas traducciones
gitea/salix/pipeline/head This commit looks good Details
0089b821cf fix: corregido test intermitente
gitea/salix/pipeline/head This commit looks good Details
3d352fa0fd fix: locale no puede ser undefined
gitea/salix/pipeline/head This commit looks good Details
a733bc8c2f refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head There was a failure building this commit Details
813cf78128 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
3fde11c3ed Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
0099b42fe3 requested changes
gitea/salix/pipeline/head This commit looks good Details
40398da48d refs #4789 @30m tested the requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
8876bc2b68 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
cac8879ec7 fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index
gitea/salix/pipeline/head There was a failure building this commit Details
c51354b13f refs #3949 textfield, edit and create dialog added
gitea/salix/pipeline/head There was a failure building this commit Details
89141419c1 fix: merge filter
gitea/salix/pipeline/head This commit looks good Details
e148284332 jenkins test
gitea/salix/pipeline/head This commit looks good Details
d5521adb6b working on tests
gitea/salix/pipeline/head This commit looks good Details
5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
8613b196d8 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head There was a failure building this commit Details
bb640da8f0 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
83ed79569a refs #4844
gitea/salix/pipeline/head There was a failure building this commit Details
ccce6af021 fix: add translations
gitea/salix/pipeline/head There was a failure building this commit Details
a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
9a47b2fea4 Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
164b797ab8 front and e2e tests done
gitea/salix/pipeline/head There was a failure building this commit Details
7f89899d6c fix: closeTicket
gitea/salix/pipeline/head There was a failure building this commit Details
7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
23cf2d9aaf Merge branch 'dev' into 3949-invoiceIn-add-docFk
gitea/salix/pipeline/head There was a failure building this commit Details
e3831cc1e3 Merge pull request 'fixes #3949 invoiceIn basic-data añadir campo docFk' (!1172) from 3949-invoiceIn-add-docFk into dev 
Reviewed-on: #1172
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head There was a failure building this commit Details
a2e08c5907 Merge pull request 'fixes #4547 check compensation and tests' (!1161) from 4547-fix-compensation into dev 
Reviewed-on: #1161
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
c17435f6c4 Merge pull request 'closes #4789 hasInvoice on ticket searchbar' (!1153) from 4789-search-ticket-without-invoice into dev 
Reviewed-on: #1153
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b8c6734798 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
8e6d0bd6b0 Merge pull request 'fixes #4457 hasInvoiceElectronic-para-cliente' (!1116) from 4457-hasInvoiceElectronic-para-cliente into dev 
Reviewed-on: #1116
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
8e74ddf267 Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev 
Reviewed-on: #1148
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
20d0d053ac Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head There was a failure building this commit Details
9517063853 Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev 
Reviewed-on: #1164
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d233286a3f Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head There was a failure building this commit Details
0f40aa3e27 Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev 
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
e34fb3e4db Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
82cc2b1208 Merge pull request 'DEV_fix_closeTicket' (!1173) from DEV_fix_closeTicket into dev 
Reviewed-on: #1173
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
4e7ef47b88 SQL fixes
gitea/salix/pipeline/head There was a failure building this commit Details
92557ea22d Added version 10510
gitea/salix/pipeline/head This commit looks good Details
866ee4d565 fix(rocketchat): Replace invalid link characters
gitea/salix/pipeline/head This commit looks good Details
db64ba48fc fix(rocketchat): Removed parenthesis
gitea/salix/pipeline/head This commit looks good Details
7ea4d9c2e1 fix(rocketchat): Regex fix
gitea/salix/pipeline/head There was a failure building this commit Details
c4643c3a01 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
joan changed title from 4846-claim.search-panel to WIP: 4846-claim.search-panel 2022-11-29 07:15:11 +00:00
jgallego requested changes 2022-11-30 11:19:21 +00:00
modules/claim/back/methods/claim/filter.js Outdated
@ -24,3 +24,3 @@
arg: 'search',
type: 'string',
description: `If it's and integer searchs by id, otherwise it searchs by client name`,
description: `If it's and number searchs by id, otherwise it searchs by client name`,
jgallego commented 2022-11-30 10:45:04 +00:00
Owner
Copy Link

If it's a number

If it's a number
vicent marked this conversation as resolved
vicent added 1 commit 2022-11-30 11:49:34 +00:00
vicent added 2 commits 2022-12-01 06:25:25 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
4c0effc48a refacor: description actualizada
vicent added 1 commit 2022-12-12 11:09:09 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9bcef08397 feat: buscar por responsibleFk sin afectar a la consulta principal
vicent requested review from jgallego 2022-12-12 11:15:37 +00:00
vicent changed title from WIP: 4846-claim.search-panel to 4846-claim.search-panel 2022-12-12 11:16:17 +00:00
vicent added 1 commit 2022-12-12 11:17:38 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
2e14e04ed0 Merge branch 'dev' into 4846-claim.search-panel
vicent changed title from 4846-claim.search-panel to WIP: 4846-claim.search-panel 2022-12-12 11:21:12 +00:00
joan refused to review 2022-12-13 07:24:28 +00:00
joan removed review request for jgallego 2022-12-13 07:24:37 +00:00
jgallego requested changes 2022-12-21 08:43:35 +00:00
modules/claim/back/methods/claim/filter.js
@ -145,1 +160,4 @@
if (args.claimResponsibleFk) {
query = `SELECT cd.claimFk
FROM claimDevelopment cd
jgallego commented 2022-12-21 08:39:16 +00:00
Owner
Copy Link

usar loopback

usar loopback
vicent marked this conversation as resolved
vicent added 1 commit 2022-12-23 11:35:40 +00:00
vicent added 1 commit 2022-12-28 07:43:54 +00:00
gitea/salix/pipeline/head This commit looks good Details
eb4cb318ed refactor: evitar join innecesarios en el filter general
vicent added 1 commit 2022-12-28 07:52:30 +00:00
gitea/salix/pipeline/head This commit looks good Details
eed6d05e23 delete console.log
vicent added 1 commit 2022-12-28 10:57:26 +00:00
gitea/salix/pipeline/head This commit looks good Details
ba7e5d6a91 refator: se usa loopback cuando se puede
vicent changed title from WIP: 4846-claim.search-panel to 4846-claim.search-panel 2023-01-03 08:05:46 +00:00
vicent requested review from jgallego 2023-01-03 08:07:16 +00:00
vicent added 1 commit 2023-01-03 08:07:41 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
fe7f388f3d Merge branch 'dev' into 4846-claim.search-panel
jgallego requested changes 2023-01-04 06:33:01 +00:00
modules/claim/back/methods/claim/filter.js Outdated
@ -144,0 +170,4 @@
cl.created
FROM claim cl
LEFT JOIN client c ON c.id = cl.clientFk
LEFT JOIN worker w ON w.id = cl.workerFk
jgallego commented 2023-01-04 06:28:45 +00:00
Owner
Copy Link

worker no es necesaria, directament en user.

worker no es necesaria, directament en user.
vicent marked this conversation as resolved
jgallego requested review from juan 2023-01-04 06:33:16 +00:00
vicent added 2 commits 2023-01-05 10:42:31 +00:00
gitea/salix/pipeline/head This commit looks good Details
1aa21c16b5 refactor: borrado join a worker
vicent requested review from jgallego 2023-01-05 12:58:15 +00:00
jgallego requested changes 2023-01-10 06:27:54 +00:00
modules/claim/back/methods/claim/filter.js
@ -99,3 +133,3 @@
};
case 'clientName':
return {'cl.clientName': {like: `%${value}%`}};
return {'c.name': {like: `%${value}%`}};
jgallego commented 2023-01-10 06:26:20 +00:00
Owner
Copy Link

revisar si falla, parece que deberia ser c.clientName

revisar si falla, parece que deberia ser c.clientName
vicent commented 2023-01-10 06:40:51 +00:00
Author
Contributor
Copy Link

Sí que funciona

Sí que funciona
vicent marked this conversation as resolved
modules/claim/back/methods/claim/filter.js
@ -105,3 +138,4 @@
case 'claimStateFk':
case 'priority':
return {[`cl.${param}`]: value};
case 'itemFk':
jgallego commented 2023-01-10 06:27:49 +00:00
Owner
Copy Link

revisar si llamando a itemFk y claimResponsibleFk construye los dos

revisar si llamando a itemFk y claimResponsibleFk construye los dos
vicent commented 2023-01-10 06:40:27 +00:00
Author
Contributor
Copy Link

Construye los dos, con un and:
{ and: [ { 'cl.id': [Object] }, { 'cl.id': [Object] } ] }

Construye los dos, con un and: { and: [ { 'cl.id': [Object] }, { 'cl.id': [Object] } ] }
vicent marked this conversation as resolved
vicent requested review from jgallego 2023-01-10 06:42:20 +00:00
jgallego approved these changes 2023-01-10 10:21:59 +00:00
vicent added 1 commit 2023-01-10 11:58:09 +00:00
gitea/salix/pipeline/head This commit looks good Details
984a3294f9 Merge branch 'dev' into 4846-claim.search-panel
joan removed review request for juan 2023-01-10 13:08:52 +00:00
vicent merged commit ef40c15a4e into dev 2023-01-10 13:09:23 +00:00
vicent deleted branch 4846-claim.search-panel 2023-01-10 13:09:23 +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#1174
No description provided.
Delete Branch "4846-claim.search-panel"

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?