From 8e6111dfb1eece91b195a7f0a3c3d49b96fe7082 Mon Sep 17 00:00:00 2001 From: SBD Date: Mon, 17 Feb 2025 15:18:16 +0300 Subject: [PATCH] 0.0.155 routes --- static/v2/js/widgets/w_daterangepicker.js | 11 ++++++----- static/v2/js/widgets/w_route_card.js | 1 + templates/v2/blocks/b_search_routes.html | 2 +- templates/v2/forms/f_create_customer_route.html | 2 +- templates/v2/forms/f_create_mover_route.html | 4 ++-- templates/v2/widgets/w_daterangepicker.html | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/static/v2/js/widgets/w_daterangepicker.js b/static/v2/js/widgets/w_daterangepicker.js index 0f1e9f6..c74dcac 100644 --- a/static/v2/js/widgets/w_daterangepicker.js +++ b/static/v2/js/widgets/w_daterangepicker.js @@ -36,10 +36,11 @@ function datarangepickerinitAll(){ } function daterangepickerInit(el, callback, date) { - let $datarangepicker = el.querySelector('input') - let min_date = moment() - if (date){ - min_date = moment(date); + let $datarangepicker = el.querySelector('input'); + + let min_date = moment(date) + if ($datarangepicker.dataset.set_min_date === 'false' || $datarangepicker.dataset.set_min_date === false) { + min_date = moment('1900-01-01'); } $($datarangepicker).daterangepicker({ "autoapply": true, @@ -47,7 +48,7 @@ function daterangepickerInit(el, callback, date) { "singleDatePicker": !!el.dataset.range, "timePicker": false, "timePicker24Hour": false, - "minDate": moment(date), + "minDate": min_date, "locale": setLocalSets(), }, function (start, end, label) { let $parent = el.closest('.w_daterangepicker') diff --git a/static/v2/js/widgets/w_route_card.js b/static/v2/js/widgets/w_route_card.js index 0c1fa6e..1901924 100644 --- a/static/v2/js/widgets/w_route_card.js +++ b/static/v2/js/widgets/w_route_card.js @@ -14,6 +14,7 @@ function changeRoute(el) { success: (res) => { if (!res.html) return; $(".info_profile")[0].innerHTML = res.html; + datarangepickerinitAll() }, error: (res) => { } diff --git a/templates/v2/blocks/b_search_routes.html b/templates/v2/blocks/b_search_routes.html index c122a03..04decfb 100644 --- a/templates/v2/blocks/b_search_routes.html +++ b/templates/v2/blocks/b_search_routes.html @@ -28,7 +28,7 @@
- {% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' range='true' initial=form.initial.arrival_DT %} + {% include 'v2/widgets/w_daterangepicker.html' with set_min_date='false' name='arrival_DT' range='true' initial=form.initial.arrival_DT %} {% if form.errors.arrival_DT %}
{{ form.errors.arrival_DT.0 }}
{% endif %}
diff --git a/templates/v2/forms/f_create_customer_route.html b/templates/v2/forms/f_create_customer_route.html index 93bd960..da31321 100644 --- a/templates/v2/forms/f_create_customer_route.html +++ b/templates/v2/forms/f_create_customer_route.html @@ -35,7 +35,7 @@
- {% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' initial=form.initial.arrival_DT %} + {% include 'v2/widgets/w_daterangepicker.html' with set_min_date='true' name='arrival_DT' initial=form.initial.arrival_DT %} {% if form.errors.arrival_DT %}
{{ form.errors.arrival_DT.0 }}
{% endif %}
diff --git a/templates/v2/forms/f_create_mover_route.html b/templates/v2/forms/f_create_mover_route.html index 57f54f1..dfaa793 100644 --- a/templates/v2/forms/f_create_mover_route.html +++ b/templates/v2/forms/f_create_mover_route.html @@ -28,12 +28,12 @@
- {% include 'v2/widgets/w_daterangepicker.html' with name='departure_DT' initial=form.initial.departure_DT %} + {% include 'v2/widgets/w_daterangepicker.html' with set_min_date='true' name='departure_DT' initial=form.initial.departure_DT %} {% if form.errors.departure_DT %}
{{ form.errors.departure_DT.0 }}
{% endif %}
- {% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' initial=form.initial.arrival_DT %} + {% include 'v2/widgets/w_daterangepicker.html' with set_min_date='true' name='arrival_DT' initial=form.initial.arrival_DT %} {% if form.errors.arrival_DT %}
{{ form.errors.arrival_DT.0 }}
{% endif %}
diff --git a/templates/v2/widgets/w_daterangepicker.html b/templates/v2/widgets/w_daterangepicker.html index d2e8fcb..a84dc37 100644 --- a/templates/v2/widgets/w_daterangepicker.html +++ b/templates/v2/widgets/w_daterangepicker.html @@ -3,7 +3,7 @@
- +
\ No newline at end of file