raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear date on custom event flatpickr_clear

Browse Source
This commit is contained in:
Jean-Baptiste Bellet
2022-08-05 16:44:51 +02:00
committed by Konrad
parent ddfbcacd83
commit 8942d3d17b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
View File

@@ -29,6 +29,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
$scope.q = {
completed_at_not_null: true
}
e = new CustomEvent("flatpickr_clear");
window.dispatchEvent(e)
$scope.clearFilters = () ->
KeyValueMapStore.clearKeyValueMap()

4
app/views/spree/admin/orders/_filters.html.haml
View File

@@ -4,10 +4,10 @@
.date-range-filter.field
= label_tag nil, t(:date_range)
.date-range-fields
= text_field_tag "q[completed_at_gteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_gteq', :placeholder => t(:start), data: { controller: "flatpickr" }
= text_field_tag "q[completed_at_gteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_gteq', :placeholder => t(:start), data: { controller: "flatpickr", action: "flatpickr_clear@window->flatpickr#clear" }
%span.range-divider
%i.icon-arrow-right
= text_field_tag "q[completed_at_lteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_lteq', :placeholder => t(:stop), data: { controller: "flatpickr" }
= text_field_tag "q[completed_at_lteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_lteq', :placeholder => t(:stop), data: { controller: "flatpickr", action: "flatpickr_clear@window->flatpickr#clear" }
.field
= label_tag nil, t(:status)
%select2-watch-ng-model{'ng-model': 'q.state_eq'}

4
app/webpacker/controllers/flatpickr_controller.js
View File

@@ -66,6 +66,10 @@ export default class extends Flatpickr {
};
}
clear(e) {
this.fp.setDate(null);
}
// private
onClickButtons = (index, fp) => {