KumiSystems/JourneyJoker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent pointless date selections in calendar

Browse source 
Fixing #30
This commit is contained in:
Kumi 2021-05-31 08:08:11 +02:00
parent a3d31c5cc3
commit a94549f4c5
4 changed files with 49 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
frontend/templatetags/datecalc.py Normal file
View file

@ -0,0 +1,30 @@
from django import template
from django.utils import timezone
from datetime import timedelta
register = template.Library()
@register.simple_tag
def seconds_from_date(date, seconds):
return date + timedelta(seconds=seconds)
@register.simple_tag
def hours_from_date(date, hours):
return date + timedelta(hours=hours)
@register.simple_tag
def days_from_date(date, days):
return date + timedelta(days=days)
@register.simple_tag
def seconds_from_now(seconds):
return seconds_from_date(timezone.now(), seconds)
@register.simple_tag
def hours_from_now(hours):
return hours_from_date(timezone.now(), hours)
@register.simple_tag
def days_from_now(days):
return days_from_date(timezone.now(), days)

36
static/frontend/js/custom-date-picker.js
View file

@ -2,45 +2,23 @@
"use strict";
// Cache Selectors
var date1 =$('.dpd1'),
date2 =$('.dpd2'),
date3 =$('.dpd3');
$('.dpd1').each(function() {
var mindate = new Date($(this).attr("data-mindate"));
mindate = new Date(mindate.getFullYear(), mindate.getMonth(), mindate.getDate(), 0, 0, 0, 0)
//Date Picker//
var nowTemp = new Date();
var now = new Date(nowTemp.getFullYear(), nowTemp.getMonth(), nowTemp.getDate(), 0, 0, 0, 0);
var maxdate = new Date($(this).attr("data-maxdate"));
maxdate = new Date(maxdate.getFullYear(), maxdate.getMonth(), maxdate.getDate(), 0, 0, 0, 0)
var checkin = date1.datepicker({
var checkin = $(this).datepicker({
format: 'dd.mm.yyyy',
onRender: function(date) {
return date.valueOf() < now.valueOf() ? 'disabled' : '';
return ((date.valueOf() < mindate.valueOf()) || (date.valueOf() > maxdate.valueOf())) ? 'disabled' : '';
}
}).on('changeDate', function(ev) {
if (ev.date.valueOf() > checkout.date.valueOf()) {
var newDate = new Date(ev.date)
newDate.setDate(newDate.getDate() + 1);
checkout.setValue(newDate);
}
checkin.hide();
date2[0].focus();
}).data('datepicker');
var checkout = date2.datepicker({
format: 'dd.mm.yyyy',
onRender: function(date) {
return date.valueOf() <= checkin.date.valueOf() ? 'disabled' : '';
}
}).on('changeDate', function(ev) {
checkout.hide();
}).data('datepicker');
date3.datepicker({
format: 'dd.mm.yyyy'
});
})(jQuery);

3
templates/auction/offer_create.html
View file

@ -4,6 +4,7 @@
{% load mapimage %}
{% load dbsetting %}
{% load mathfilters %}
{% load datecalc %}
{% block "content" %}
<!--================== PAGE-COVER ================-->
<section class="page-cover" id="cover-hotel-booking">
@ -130,7 +131,7 @@
<div class="form-group left-icon">
<label>{% trans "Abreise" %}</label>
<i class="fa fa-calendar"></i>
<input id="id_departure" name="departure" type="text" class="form-control dpd1" required placeholder="{% trans "Abreise" %}" >
<input id="id_departure" data-mindate="{% days_from_date inquiry.arrival 1 %}" name="departure" type="text" class="form-control dpd1" required placeholder="{% trans "Abreise" %}" >
</div>
</div><!-- end columns -->
</div><!-- end row -->

3
templates/frontend/index.html
View file

@ -4,6 +4,7 @@
{% load testimonials %}
{% load dbsetting %}
{% load offeroptions %}
{% load datecalc %}
{% block "styles" %}
<link rel="stylesheet" href="{% static "vendor/css/jquery-ui.css" %}">
{% endblock %}
@ -79,7 +80,7 @@
<div class="col-6 col-md-6 col-lg-6">
<div class="form-group left-icon">
<input id="id_arrival" name="arrival" type="text" class="form-control dpd1" required placeholder="{% trans "Anreise" %}" >
<input id="id_arrival" data-mindate="{% hours_from_now 24 %}" name="arrival" type="text" class="form-control dpd1" required placeholder="{% trans "Anreise" %}" >
<i class="fa fa-calendar"></i>
</div>
</div><!-- end columns -->