Merge pull request #2227 from mike-esokia/PHRAS-1516_port_PHRAS-1339

PHRAS-1516 Port PHRAS-1339
This commit is contained in:
Nicolas Maillat
2017-11-14 14:05:10 +01:00
committed by GitHub
4 changed files with 87 additions and 78 deletions

View File

@@ -37,41 +37,45 @@
</form>
<script type="text/javascript">
datePicker();
function datePicker()
{
var dates = $('.dmin, .dmax');
$('.dmin').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
$(document).ready(function () {
$.datepicker.setDefaults(datepickerLang);
datePicker();
});
function datePicker()
{
var dates = $('.dmin, .dmax');
$('.dmin').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
}
});
$('.dmax').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
}
});
{% if datas.limited_to %}
var instance = $('.dmin').data("datepicker");
$('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
{% endif %}
{% if datas.limited_from %}
var instance = $('.dmax').data("datepicker");
$('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
{% endif %}
}
});
$('.dmax').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
}
});
{% if datas.limited_to %}
var instance = $('.dmin').data("datepicker");
$('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
{% endif %}
{% if datas.limited_from %}
var instance = $('.dmax').data("datepicker");
$('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
{% endif %}
}
</script>

View File

@@ -33,45 +33,48 @@
</form>
<script type="text/javascript">
datePicker();
function datePicker()
{
var dates = $('.dmin, .dmax');
$('.dmin').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
$(document).ready(function () {
$.datepicker.setDefaults(datepickerLang);
datePicker();
});
function datePicker()
{
var dates = $('.dmin, .dmax');
$('.dmin').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
}
});
$('.dmax').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
}
});
{% if datas.limited_to %}
var instance = $('.dmin').data("ui-datepicker");
if (instance) {
$('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
}
{% endif %}
{% if datas.limited_from %}
var instance = $('.dmax').data("ui-datepicker");
if (instance) {
$('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
}
{% endif %}
}
});
$('.dmax').datepicker({
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat:'yy-mm-dd',
numberOfMonths: 3,
onSelect: function(selectedDate, instance) {
var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
$(dates).not(':hidden').not(this).datepicker("option", option, date);
}
});
{% if datas.limited_to %}
var instance = $('.dmin').data("ui-datepicker");
if (instance) {
$('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
}
{% endif %}
{% if datas.limited_from %}
var instance = $('.dmax').data("ui-datepicker");
if (instance) {
$('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
}
{% endif %}
}
</script>