sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-08-17 14:32:11 +03:00
parent 5c3bffdda4 dd8551c0c6
commit 7dc7ead417
7 changed files with 240 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
static/css/styles(boris).css
View File

@@ -6,7 +6,9 @@
width: 100% !important;
}
.disp-none{
display: none !important;
}
.text-align-center{
text-align: center;
@@ -689,6 +691,7 @@
flex-grow: 1;
flex-shrink: 1;
flex-basis: 0;
position: relative;
}
@@ -706,17 +709,58 @@
}
.inp_form_find_route_w_abbreviation.first{
/*.inp_form_find_route_w_abbreviation.first{*/
/* border-top: 1px solid #E6E6E6;*/
/* border-right: 0;*/
/* border-bottom: 1px solid #E6E6E6;*/
/* border-left: 1px solid #E6E6E6;*/
/* display: block;*/
/* height: 97%;*/
/* width: 73%;*/
/* border-radius: 10px 0 0 10px;*/
/* float: left;*/
/*}*/
.from_address_point_txt.find_route.first{
border-top: 1px solid #E6E6E6;
border-right: 0;
border-bottom: 1px solid #E6E6E6;
border-left: 1px solid #E6E6E6;
display: block;
height: 31%;
width: 58%;
float: left;
background-image: none !important;
margin-top: 0;
padding: 10% 6%;
border-radius: 10px 0 0 10px;
}
.to_address_point_txt.find_route{
border-top: 1px solid #E6E6E6;
border-right: 0;
border-bottom: 1px solid #E6E6E6;
border-left: 1px solid #E6E6E6;
display: block;
height: 97%;
width: 73%;
border-radius: 10px 0 0 10px;
height: 31%;
width: 58%;
border-radius: 0;
float: left;
background-image: none !important;
margin-top: 0;
padding: 10% 6%;
}
.input_list.find_route{
width: 100%;
/* display: block; */
border-radius: 0 10px;
top: 61px;
z-index: 12;
}
.input_list.find_route.show{
display: block;
}
.container_inp_w_abr{
@@ -781,7 +825,7 @@
.abbreviation_airport_in_search{
display: inline-block;
float: right;
width: 26%;
width: 29%;
height: 97%;
border-top: 1px solid #E6E6E6;
border-right: 1px solid #E6E6E6;
@@ -791,7 +835,7 @@
.abbreviation_airport_in_search > text{
margin-top: 43%;
margin-top: 39%;
display: block;
font-size: 16px;
color: #27242499;
@@ -1341,4 +1385,10 @@
}
.insert-airports-place.show{
display: block;
}
/* styles to-from-addres point*/
.from_address_point_txt.find_route{
}

55
static/js/chat_sockets.js
View File

@@ -85,6 +85,34 @@ chatSocket.onmessage = function (e) {
}
}
}
if (data.tickets_w_manager_html) {
if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html
if (el_tab !== null){
document.querySelector(".tab_user_messanger.select").classList.remove("select")
let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`)
if (old_insert_tab) {
old_insert_tab.classList.add("select")
old_insert_tab.scrollIntoView({behavior: "smooth"});
}
}
let container_messenger = document.querySelector(".container-messages")
if (container_messenger){
let dataset_cont_mes = container_messenger.dataset
if (dataset_cont_mes){
let ticket_id = dataset_cont_mes["ticketId"]
if (ticket_id !== ""){
let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`)
if (!ticket){
let chat = document.querySelector(".block-chat").innerHTML = ""
}
}
}
}
}
}
if (data.tickets_wo_manager_html) {
if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
document.querySelector(".list_unlinked_tickets").innerHTML = data.tickets_wo_manager_html
@@ -98,24 +126,25 @@ chatSocket.onmessage = function (e) {
old_insert_tab.classList.add("select")
old_insert_tab.scrollIntoView({behavior: "smooth"});
}
}
}
}
if (data.tickets_w_manager_html) {
if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html
if (el_tab !== null){
document.querySelector(".tab_user_messanger.select").classList.remove("select")
let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`)
if (old_insert_tab) {
old_insert_tab.classList.add("select")
old_insert_tab.scrollIntoView({behavior: "smooth"});
}
let container_messenger = document.querySelector(".container-messages")
if (container_messenger){
let dataset_cont_mes = container_messenger.dataset
if (dataset_cont_mes){
let ticket_id = dataset_cont_mes["ticketId"]
if (ticket_id !== ""){
let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`)
if (!ticket){
let chat = document.querySelector(".block-chat").innerHTML = ""
}
}
}
}
}
} else {
}
else {
let list_of_users = document.querySelector(".block-list-of-users")
if (list_of_users !== null){
if (data.users_list_html){

58
static/js/range_slider_double.js Normal file
View File

@@ -0,0 +1,58 @@
var $range = $(".js-range-slider"),
$inputFrom = $(".js-input-from"),
$inputTo = $(".js-input-to"),
instance,
min = 0,
max = 1000,
from = 0,
to = 0;
$range.ionRangeSlider({
skin: "round",
type: "double",
min: min,
max: max,
from: 200,
to: 800,
onStart: updateInputs,
onChange: updateInputs
});
instance = $range.data("ionRangeSlider");
function updateInputs (data) {
from = data.from;
to = data.to;
$inputFrom.prop("value", from);
$inputTo.prop("value", to);
}
$inputFrom.on("input", function () {
var val = $(this).prop("value");
// validate
if (val < min) {
val = min;
} else if (val > to) {
val = to;
}
instance.update({
from: val
});
});
$inputTo.on("input", function () {
var val = $(this).prop("value");
// validate
if (val < from) {
val = from;
} else if (val > max) {
val = max;
}
instance.update({
to: val
});
});