Merge pull request 'ticket filter pending uses isNotValidated now' (#1016) from 4262-ticket_state_notValidated into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #1016
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-06-29 11:34:00 +00:00
commit f15c37d5e1
2 changed files with 2 additions and 17 deletions

View File

@ -200,22 +200,7 @@ module.exports = Self => {
return {'t.routeFk': {neq: null}}; return {'t.routeFk': {neq: null}};
return {'t.routeFk': null}; return {'t.routeFk': null};
case 'pending': case 'pending':
if (value) { return {'st.isNotValidated': value};
return {and: [
{'st.alertLevel': 0},
{'st.code': {nin: [
'OK',
'BOARDING',
'PRINTED',
'PRINTED_AUTO',
'PICKER_DESIGNED'
]}}
]};
} else {
return {and: [
{'st.alertLevel': {gt: 0}}
]};
}
case 'id': case 'id':
case 'clientFk': case 'clientFk':
case 'agencyModeFk': case 'agencyModeFk':

View File

@ -153,7 +153,7 @@ describe('ticket filter()', () => {
const secondRow = result[1]; const secondRow = result[1];
const thirdRow = result[2]; const thirdRow = result[2];
expect(result.length).toEqual(12); expect(result.length).toEqual(17);
expect(firstRow.state).toEqual('Entregado'); expect(firstRow.state).toEqual('Entregado');
expect(secondRow.state).toEqual('Entregado'); expect(secondRow.state).toEqual('Entregado');
expect(thirdRow.state).toEqual('Entregado'); expect(thirdRow.state).toEqual('Entregado');