From cd743e5c2c158655dc74ec5a734704d98d3bafe1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 8 Dec 2022 10:32:21 +0100 Subject: [PATCH] Call `resetSelectFilters` on page load + init start and end date with a method (will be re-used) --- .../controllers/line_items_controller.js.coffee | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index eed001210e..5f1d4923dd 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -3,8 +3,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.RequestMonitor = RequestMonitor $scope.line_items = LineItems.all $scope.confirmDelete = true - $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD') - $scope.endDate = moment().startOf('day').format('YYYY-MM-DD') $scope.previousDates = { startDate: $scope.startDate, endDate: $scope.endDate } $scope.datesChangedOnCancelEvent = false $scope.bulkActions = [ { name: t("admin.orders.bulk_management.actions_delete"), callback: 'deleteLineItems' } ] @@ -17,6 +15,10 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.confirmRefresh = -> LineItems.allSaved() || confirm(t("unsaved_changes_warning")) + $scope.initStartAndEnDate = -> + $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD') + $scope.endDate = moment().startOf('day').format('YYYY-MM-DD') + $scope.resetFilters = -> $scope.distributorFilter = '' $scope.supplierFilter = '' @@ -39,6 +41,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.startDate = $scope.previousDates.startDate $scope.endDate = $scope.previousDates.endDate # throw a flatpickr:change event to change the date back in the datepicker + $scope.initStartAndEnDate() event = new CustomEvent('flatpickr:change', { detail: { startDate: $scope.previousDates.startDate, @@ -277,5 +280,4 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, lineItem.final_weight_volume = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity $scope.weightAdjustedPrice(lineItem) - $scope.resetFilters() - $scope.refreshData() + $scope.resetSelectFilters()