This commit is contained in:
2023-09-23 18:01:19 +03:00
parent 57f5392203
commit cba94595f1
5 changed files with 144 additions and 51 deletions

View File

@@ -468,8 +468,13 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
position: relative; position: relative;
bottom: 6px;
display: inline-block; display: inline-block;
margin-bottom: 0;
bottom: 6px;
}
.attach-file-btn-message.loader{
top: 10px;
bottom: 0;
} }
.send-message{ .send-message{

View File

@@ -19,13 +19,16 @@ function play_required_beep (data,beep) {
function loader_show_message (data) { function loader_show_message (data) {
let loader = document.querySelector(".loader_show_message"); let loader = document.querySelector(".loader_show_message");
let send_btn = document.querySelector(".send-message") let send_btn = document.querySelector(".send-message")
let at = document.querySelector(".attach-file-btn-message")
if (loader){ if (loader){
if (loader.classList.contains("show")){ if (loader.classList.contains("show")){
send_btn.classList.remove("hide") send_btn.classList.remove("hide")
loader.classList.remove("show") loader.classList.remove("show")
at.classList.remove("loader")
} else { } else {
send_btn.classList.add("hide") send_btn.classList.add("hide")
loader.classList.add("show") loader.classList.add("show")
at.classList.add("loader")
} }
} else { } else {

View File

@@ -44,55 +44,68 @@
// } // }
// }); // });
$(function() { $(function () {
let onl_param = ""
if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
onl_param = "singleDatePicker: true"
}
let place_1 = document.querySelector("#id_arrival_DT") let place_1 = document.querySelector("#id_arrival_DT")
$(place_1).daterangepicker({ if (place_1) {
"autoapply": true, $(place_1).daterangepicker({
"linkedCalendars": false, "autoapply": true,
}, "linkedCalendars": false,
function(start, end, label) {
// $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD')); },
$('#id_arrival_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY')) function (start, end, label) {
});
$(`${place_1.id} .drp-calendar.right`).hide(); // $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
$(`${place_1.id} .drp-calendar.left`).addClass('single'); $('#id_arrival_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
});
$(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function() { $(`${place_1.id} .drp-calendar.right`).hide();
var el = $(`${place_1.id} .prev.available`).parent().children().last(); $(`${place_1.id} .drp-calendar.left`).addClass('single');
if (el.hasClass('next available')) {
return; $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function () {
} var el = $(`${place_1.id} .prev.available`).parent().children().last();
el.addClass('next available'); if (el.hasClass('next available')) {
el.append('<span></span>'); return;
}); }
el.addClass('next available');
el.append('<span></span>');
});
}
}); });
$(function() { $(function() {
let place_1 = document.querySelector("#id_departure_DT") let place_1 = document.querySelector("#id_departure_DT")
$(place_1).daterangepicker({ let onl_param = ""
"autoapply": true, if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
"linkedCalendars": false, onl_param = "singleDatePicker: true"
}, }
function(start, end, label) { if (place_1) {
// $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD')); $(place_1).daterangepicker({
// $('#regervation')[0].dataset['departure_DT'] = start.format('YYYY-MM-DD'); "autoapply": true,
// $('#regervation')[0].dataset['arrival_DT'] = end.format('YYYY-MM-DD'); "linkedCalendars": false,
$('#id_departure_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY')) onl_param
},
function(start, end, label) {
// $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
// $('#regervation')[0].dataset['departure_DT'] = start.format('YYYY-MM-DD');
// $('#regervation')[0].dataset['arrival_DT'] = end.format('YYYY-MM-DD');
$('#id_departure_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
}); });
$(`${place_1.id} .drp-calendar.right`).hide(); $(`${place_1.id} .drp-calendar.right`).hide();
$(`${place_1.id} .drp-calendar.left`).addClass('single'); $(`${place_1.id} .drp-calendar.left`).addClass('single');
$(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function() {
var el = $(`${place_1.id} .prev.available`).parent().children().last();
if (el.hasClass('next available')) {
return;
}
el.addClass('next available');
el.append('<span></span>');
});
$(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function() {
var el = $(`${place_1.id} .prev.available`).parent().children().last();
if (el.hasClass('next available')) {
return;
}
el.addClass('next available');
el.append('<span></span>');
});
}
}); });

View File

@@ -572,7 +572,71 @@ function OnSelectionChange(el) {
// checkbox_width.classList.add('width') // checkbox_width.classList.add('width')
// } // }
sliderInit(); sliderInit();
$(function () {
let onl_param = ""
if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
onl_param = "singleDatePicker: true"
}
let place_1 = document.querySelector("#id_arrival_DT")
if (place_1) {
$(place_1).daterangepicker({
"autoapply": true,
"linkedCalendars": false,
},
function (start, end, label) {
// $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
$('#id_arrival_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
});
$(`${place_1.id} .drp-calendar.right`).hide();
$(`${place_1.id} .drp-calendar.left`).addClass('single');
$(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function () {
var el = $(`${place_1.id} .prev.available`).parent().children().last();
if (el.hasClass('next available')) {
return;
}
el.addClass('next available');
el.append('<span></span>');
});
}
});
$(function() {
let place_1 = document.querySelector("#id_departure_DT")
let onl_param = ""
if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
onl_param = "singleDatePicker: true"
}
if (place_1) {
$(place_1).daterangepicker({
"autoapply": true,
"linkedCalendars": false,
onl_param
},
function(start, end, label) {
// $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
// $('#regervation')[0].dataset['departure_DT'] = start.format('YYYY-MM-DD');
// $('#regervation')[0].dataset['arrival_DT'] = end.format('YYYY-MM-DD');
$('#id_departure_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
});
$(`${place_1.id} .drp-calendar.right`).hide();
$(`${place_1.id} .drp-calendar.left`).addClass('single');
$(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function() {
var el = $(`${place_1.id} .prev.available`).parent().children().last();
if (el.hasClass('next available')) {
return;
}
el.addClass('next available');
el.append('<span></span>');
});
}
});
} }
}); });

View File

@@ -71,6 +71,10 @@
placeholder="Выберите дату и время" placeholder="Выберите дату и время"
{% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %} {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}
/> />
{# boris change input #}
<input class="el_form_find_route" type="text" id="id_departure_DT" name="departure_DT" placeholder="" {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %}/>
<div id="displayRegervation"></div>
{# end #}
{% if not errors_off and form.errors and form.errors.departure_DT %} {% if not errors_off and form.errors and form.errors.departure_DT %}
<span>{{ form.errors.departure_DT }}</span> <span>{{ form.errors.departure_DT }}</span>
@@ -79,16 +83,20 @@
</div> </div>
<div id="arrival_div"> <div id="arrival_div">
<label for="id_arrival_DT">{{ form.fields.arrival_DT.label }}</label> <label for="id_arrival_DT">{{ form.fields.arrival_DT.label }}</label>
<input {# <input#}
type="datetime-local" {# type="datetime-local"#}
min= {% now "Y-m-d" %}T{% now "H:i" %} {# min= {% now "Y-m-d" %}T{% now "H:i" %}#}
name="arrival_DT" {# name="arrival_DT"#}
onchange="checkDate()" {# onchange="checkDate()"#}
{% if form.fields.arrival_DT.required %} required{% endif %} {# {% if form.fields.arrival_DT.required %} required{% endif %}#}
id="id_arrival_DT" {# id="id_arrival_DT"#}
class="el_form_b_new_route" {# class="el_form_b_new_route"#}
{% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %} {# {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
/> {# />#}
{# boris change input #}
<input class="el_form_find_route" type="text" id="id_arrival_DT" name="arrival_DT" placeholder="" {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %}/>
<div id="displayRegervation"></div>
{# end #}
{% if not errors_off and form.errors and form.errors.arrival_DT %} {% if not errors_off and form.errors and form.errors.arrival_DT %}
<span>{{ form.errors.arrival_DT }}</span> <span>{{ form.errors.arrival_DT }}</span>
{% endif %} {% endif %}