From 4d2d57d64662ace1e03049401d115bfef33c648b Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 26 May 2020 08:08:09 +0200 Subject: [PATCH 1/5] 2265 Changes to filter --- modules/item/front/request/index.html | 13 +++++++------ .../ticket/back/methods/ticket-request/filter.js | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html index 85d44818d6..22ad6e6973 100644 --- a/modules/item/front/request/index.html +++ b/modules/item/front/request/index.html @@ -3,7 +3,7 @@ url="TicketRequests/filter" limit="20" data="requests" - order="shipped DESC, isOk ASC" + order="shipped DESC, isOk DESC" auto-load="true"> @@ -11,6 +11,7 @@ panel="vn-request-search-panel" suggested-filter="$ctrl.filter.where" info="Search request by id or alias" + filter="$ctrl.filter" model="model" auto-state="false"> @@ -21,8 +22,8 @@ Ticket ID - Shipped - Description + Shipped + Description Requested Price Atender @@ -40,7 +41,7 @@ {{request.ticketFk}} - + {{::request.shipped | date: 'dd/MM/yyyy'}} @@ -53,7 +54,7 @@ - {{::request.atenderNickname}} + {{::request.attenderName}} @@ -81,7 +82,7 @@ {{request.itemDescription}} - {{$ctrl.getState(request.isOk)}} + {{$ctrl.getState(request.isOk)}} {{request.isOk}} { t.clientFk, w.name AS warehouse, u.nickname AS salesPersonNickname, - ua.nickname AS atenderNickname, + ua.name AS attenderName, c.salesPersonFk FROM ticketRequest tr LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk From 44160d2f3c473b5ee87b6e4d7dbeb4491498a7ef Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 26 May 2020 08:11:36 +0200 Subject: [PATCH 2/5] Changed order --- modules/item/front/request/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html index 22ad6e6973..73f8cfdc80 100644 --- a/modules/item/front/request/index.html +++ b/modules/item/front/request/index.html @@ -3,7 +3,7 @@ url="TicketRequests/filter" limit="20" data="requests" - order="shipped DESC, isOk DESC" + order="shipped DESC, isOk ASC" auto-load="true"> From 16d7186829e19dd63c3dc173024412e001461889 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 2 Jun 2020 14:42:58 +0200 Subject: [PATCH 3/5] Fixed initial filters --- front/core/components/searchbar/searchbar.js | 2 +- modules/item/front/request-search-panel/index.html | 7 +++++-- .../item/front/request-search-panel/locale/es.yml | 3 ++- modules/item/front/request/index.html | 9 +++++---- modules/item/front/request/index.js | 12 +++++------- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js index d1d8a57f3b..287db07757 100644 --- a/front/core/components/searchbar/searchbar.js +++ b/front/core/components/searchbar/searchbar.js @@ -78,7 +78,7 @@ export default class Searchbar extends Component { } fetchStateFilter(autoLoad) { - let filter = null; + let filter = this.filter ? this.filter : null; if (this.$state.is(this.searchState)) { if (this.$params.q) { diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html index 4f95abf772..453f3105b5 100644 --- a/modules/item/front/request-search-panel/index.html +++ b/modules/item/front/request-search-panel/index.html @@ -51,8 +51,11 @@ - - + + - + Ticket ID @@ -82,7 +83,7 @@ {{request.itemDescription}} - {{$ctrl.getState(request.isOk)}} {{request.isOk}} + {{$ctrl.getState(request.isOk)}} Date: Wed, 3 Jun 2020 11:58:53 +0200 Subject: [PATCH 4/5] Removed isOk param --- modules/item/front/request/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js index f329d604c9..b9ef6c868e 100644 --- a/modules/item/front/request/index.js +++ b/modules/item/front/request/index.js @@ -15,7 +15,6 @@ export default class Controller extends Section { lastWeek.setDate(lastWeek.getDate() - 7); this.filterParams = { - isOk: null, mine: true, from: lastWeek, to: today From 613937dc8dce74529924096f1519091d190363e4 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 3 Jun 2020 12:21:03 +0200 Subject: [PATCH 5/5] Fixed order --- modules/item/front/request/index.html | 2 +- modules/item/front/request/index.js | 12 ++++++------ modules/ticket/back/methods/ticket-request/filter.js | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html index 51216af13f..a677d0754d 100644 --- a/modules/item/front/request/index.html +++ b/modules/item/front/request/index.html @@ -4,7 +4,7 @@ user-params="::$ctrl.filterParams" limit="20" data="requests" - order="shipped DESC, isOk ASC" + order="shippedDate ASC, isOk ASC" auto-load="true"> diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js index b9ef6c868e..a5f030e78e 100644 --- a/modules/item/front/request/index.js +++ b/modules/item/front/request/index.js @@ -8,16 +8,16 @@ export default class Controller extends Section { if (!this.$state.q) { const today = new Date(); - today.setHours(23, 59, 59, 59); + today.setHours(0, 0, 0, 0); - const lastWeek = new Date(); - lastWeek.setHours(0, 0, 0, 0); - lastWeek.setDate(lastWeek.getDate() - 7); + const nextWeek = new Date(); + nextWeek.setHours(23, 59, 59, 59); + nextWeek.setDate(nextWeek.getDate() + 7); this.filterParams = { mine: true, - from: lastWeek, - to: today + from: today, + to: nextWeek }; } } diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js index 2e3bd07cc5..ecd88caeb4 100644 --- a/modules/ticket/back/methods/ticket-request/filter.js +++ b/modules/ticket/back/methods/ticket-request/filter.js @@ -115,6 +115,7 @@ module.exports = Self => { s.itemFk, i.name AS itemDescription, t.shipped, + DATE(t.shipped) AS shippedDate, t.nickname, t.warehouseFk, t.clientFk,