verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2021-01-19 13:06:10 +01:00
parent 5c4dd027d3
commit 8c8891f8e3
5 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/ticket/back/methods/ticket/filter.js
View File

@ -10,75 +10,75 @@ module.exports = Self => {
accepts: [
{
arg: 'ctx',
type: 'Object',
type: 'object',
http: {source: 'context'}
}, {
arg: 'filter',
type: 'Object',
type: 'object',
description: `Filter defining where, order, offset, and limit - must be a JSON-encoded string`
}, {
arg: 'search',
type: 'String',
description: `If it's and integer searchs by id, otherwise it searchs by nickname`
type: 'string',
description: `If it's and number searchs by id, otherwise it searchs by nickname`
}, {
arg: 'from',
type: 'Date',
type: 'date',
description: `The from date filter`
}, {
arg: 'to',
type: 'Date',
type: 'date',
description: `The to date filter`
}, {
arg: 'nickname',
type: 'String',
type: 'string',
description: `The nickname filter`
}, {
arg: 'id',
type: 'Integer',
type: 'number',
description: `The ticket id filter`
}, {
arg: 'clientFk',
type: 'Integer',
type: 'number',
description: `The client id filter`
}, {
arg: 'agencyModeFk',
type: 'Integer',
type: 'number',
description: `The agency mode id filter`
}, {
arg: 'warehouseFk',
type: 'Integer',
type: 'number',
description: `The warehouse id filter`
}, {
arg: 'salesPersonFk',
type: 'Integer',
type: 'number',
description: `The salesperson id filter`
}, {
arg: 'provinceFk',
type: 'Integer',
type: 'number',
description: `The province id filter`
}, {
arg: 'stateFk',
type: 'Number',
type: 'number',
description: `The state id filter`
}, {
arg: 'myTeam',
type: 'Boolean',
type: 'boolean',
description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)`
}, {
arg: 'problems',
type: 'Boolean',
type: 'boolean',
description: `Whether to show only tickets with problems`
}, {
arg: 'pending',
type: 'Boolean',
type: 'boolean',
description: `Whether to show only tickets with state 'Pending'`
}, {
arg: 'mine',
type: 'Boolean',
type: 'boolean',
description: `Whether to show only tickets for the current logged user`
}, {
arg: 'orderFk',
type: 'Number',
type: 'number',
description: `The order id filter`
}, {
arg: 'refFk',
@ -86,12 +86,12 @@ module.exports = Self => {
description: `The invoice reference filter`
}, {
arg: 'alertLevel',
type: 'Number',
type: 'number',
description: `The alert level of the tickets`
}
],
returns: {
type: ['Object'],
type: ['object'],
root: true
},
http: {

58
modules/travel/back/methods/travel/extraCommunityFilter.js
View File

@ -10,69 +10,58 @@ module.exports = Self => {
accepts: [
{
arg: 'filter',
type: 'Object',
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
http: {source: 'query'}
type: 'object',
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
},
{
arg: 'search',
type: 'String',
description: 'Searchs the travel by id',
http: {source: 'query'}
type: 'string',
description: 'Searchs the travel by id'
},
{
arg: 'id',
type: 'Integer',
description: 'The travel id',
http: {source: 'query'}
type: 'number',
description: 'The travel id'
},
{
arg: 'shippedFrom',
type: 'Date',
description: 'The shipped from date filter',
http: {source: 'query'}
type: 'date',
description: 'The shipped from date filter'
},
{
arg: 'shippedTo',
type: 'Date',
description: 'The shipped to date filter',
http: {source: 'query'}
type: 'date',
description: 'The shipped to date filter'
},
{
arg: 'landedFrom',
type: 'Date',
description: 'The landed from date filter',
http: {source: 'query'}
type: 'date',
description: 'The landed from date filter'
},
{
arg: 'landedTo',
type: 'Date',
description: 'The landed to date filter',
http: {source: 'query'}
type: 'date',
description: 'The landed to date filter'
},
{
arg: 'agencyFk',
type: 'Number',
description: 'The agencyModeFk id',
http: {source: 'query'}
type: 'number',
description: 'The agencyModeFk id'
},
{
arg: 'warehouseOutFk',
type: 'Number',
description: 'The warehouseOutFk filter',
http: {source: 'query'}
type: 'number',
description: 'The warehouseOutFk filter'
},
{
arg: 'warehouseInFk',
type: 'Number',
description: 'The warehouseInFk filter',
http: {source: 'query'}
type: 'number',
description: 'The warehouseInFk filter'
},
{
arg: 'totalEntries',
type: 'Number',
description: 'The totalEntries filter',
http: {source: 'query'}
type: 'number',
description: 'The totalEntries filter'
},
{
arg: 'ref',
@ -86,7 +75,7 @@ module.exports = Self => {
},
{
arg: 'cargoSupplierFk',
type: 'Number',
type: 'number',
description: 'The freighter supplier id'
},
],
@ -132,6 +121,7 @@ module.exports = Self => {
});
filter = mergeFilters(filter, {where});
console.log(JSON.stringify(filter.where));
let stmts = [];
let stmt;

3
modules/travel/front/extra-community/index.html
View File

@ -9,9 +9,10 @@
<vn-searchbar
vn-focus
panel="vn-extra-community-search-panel"
info="Search by travel id or reference"
placeholder="Search by extra community travel"
suggested-filter="$ctrl.defaultFilter"
filter="$ctrl.defaultFilter"
info="Search by travel id or reference"
auto-state="false"
model="model">
</vn-searchbar>

2
modules/travel/front/extra-community/index.js
View File

@ -15,7 +15,7 @@ class Controller extends Section {
event => this.dragEnd(event));
this.draggableElement = 'a[draggable]';
this.droppableElement = 'vn-table[vn-droppable]';
this.droppableElement = 'vn-tbody[vn-droppable]';
const scopeDays = 14;
const landedFrom = new Date();

3
modules/travel/front/extra-community/locale/es.yml
View File

@ -4,7 +4,8 @@ Freighter: Transitario
Bl. KG: KG Bloq.
Phy. KG: KG físico
Vol. KG: KG Vol.
Search by travel id or reference: Buscar por id travel o referencia
Search by travel id or reference: Buscar por id de travel o referencia
Search by extra community travel: Buscar por envío extra comunitario
Continent Out: Continente salida
W. Shipped: F. envío
W. Landed: F. llegada