Merge pull request #810 from abhishek-webkul/gli-927

Use datepicker plugin to format dates using $.datepicker.parseDate() wherever applicable
This commit is contained in:
Rohit Jain
2024-03-15 12:43:48 +05:30
committed by GitHub
6 changed files with 58 additions and 115 deletions

View File

@@ -1670,12 +1670,10 @@
{* open date picker for the date input of check-in checkout dates *}
$(document).on('focus', '.room_status_date', function() {
var dateFrom = $(this).closest('.room_status_info_form').find('[name="date_from"]').val();
dateFrom = dateFrom.split("-");
minDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(dateFrom[0], dateFrom[1] - 1, dateFrom[2])));
minDate = $.datepicker.parseDate('yy-mm-dd', dateFrom);
var dateTo = $(this).closest('.room_status_info_form').find('[name="date_to"]').val();
dateTo = dateTo.split("-");
maxDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(dateTo[0], dateTo[1] - 1, dateTo[2])));
maxDate = $.datepicker.parseDate('yy-mm-dd', dateTo);
$(this).datepicker({
dateFormat: 'dd-mm-yy',

View File

@@ -556,10 +556,10 @@
dateFormat: 'yy-mm-dd',
minDate: 0,
onSelect: function(selectedDate) {
var date_format = selectedDate.split('-');
selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[0], date_format[1] - 1, date_format[2])));
selectedDate.setDate(selectedDate.getDate() + 1);
$(this).closest('tr').find('.disabled_date_to').datepicker('option', 'minDate', selectedDate);
let objDateToMin = $.datepicker.parseDate('yy-mm-dd', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$(this).closest('tr').find('.disabled_date_to').datepicker('option', 'minDate', objDateToMin);
},
onClose: function(selectedDate) {
var dateTo = $(this).closest('tr').find('.disabled_date_to').val();
@@ -574,16 +574,17 @@
dateFormat: 'yy-mm-dd',
minDate: 0,
beforeShow: function (input, instance) {
var date_to = $(this).closest('tr').find('.disabled_date_from').val();
if (typeof date_to != 'undefined' && date_to != '') {
var date_format = date_to.split('-');
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[0], date_format[1] - 1, date_format[2])));
let dateFrom = $(this).closest('tr').find('.disabled_date_from').val();
let objDateToMin = null;
if (typeof dateFrom != 'undefined' && dateFrom != '') {
objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom);
} else {
var date_format = new Date();
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date()));
objDateToMin = new Date();
}
selectedDate.setDate(selectedDate.getDate()+1);
$(this).datepicker('option', 'minDate', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$(this).datepicker('option', 'minDate', objDateToMin);
},
});
});

View File

@@ -1498,11 +1498,11 @@ function initRoomEvents()
{
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[2], date_format[1] - 1, date_format[0])));
selectedDate.setDate(selectedDate.getDate() + 1);
$(".add_room_date_to").datepicker("option", "minDate", selectedDate);
onSelect: function(selectedDate) {
let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('.add_room_date_to').datepicker('option', 'minDate', objDateToMin);
},
});
@@ -1511,10 +1511,10 @@ function initRoomEvents()
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[2], date_format[1] - 1, date_format[0])));
selectedDate.setDate(selectedDate.getDate() - 1);
$(".add_room_date_from").datepicker("option", "maxDate", selectedDate);
let objDateFromMax = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateFromMax.setDate(objDateFromMax.getDate() - 1);
$('.add_room_date_from').datepicker('option', 'maxDate', objDateFromMax);
}
});
@@ -1523,10 +1523,10 @@ function initRoomEvents()
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[2], date_format[1] - 1, date_format[0])));
selectedDate.setDate(selectedDate.getDate() + 1);
$(".edit_product_date_to").datepicker("option", "minDate", selectedDate);
let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('.edit_product_date_to').datepicker('option', 'minDate', objDateToMin);
},
});
@@ -1535,10 +1535,10 @@ function initRoomEvents()
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[2], date_format[1] - 1, date_format[0])));
selectedDate.setDate(selectedDate.getDate() - 1);
$(".edit_product_date_from").datepicker("option", "maxDate", selectedDate);
let objDateFromMax = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateFromMax.setDate(objDateFromMax.getDate() - 1);
$('.edit_product_date_from').datepicker('option', 'maxDate', objDateFromMax);
}
});
/*End*/

View File

@@ -673,10 +673,10 @@ $(document).ready(function() {
return highlightDateBorder($("#feature_plan_date_from").val(), date);
},
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date(date_format[2], date_format[1] - 1, date_format[0]);
selectedDate.setDate(selectedDate.getDate() + 1);
$("#feature_plan_date_to").datepicker("option", "minDate", selectedDate);
let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('#feature_plan_date_to').datepicker('option', 'minDate', objDateToMin);
},
});
@@ -689,47 +689,36 @@ $(document).ready(function() {
$("#feature_plan_date_to").datepicker({
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
beforeShow: function (input, instance) {
var date_to = $('#feature_plan_date_from').val();
if (typeof date_to != 'undefined' && date_to != '') {
var date_format = date_to.split("-");
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[2], date_format[1] - 1, date_format[0])));
selectedDate.setDate(selectedDate.getDate()+1);
$("#feature_plan_date_to").datepicker("option", "minDate", selectedDate);
beforeShow: function () {
let dateFrom = $('#feature_plan_date_from').val();
let objDateToMin = null;
if (typeof dateFrom != 'undefined' && dateFrom != '') {
objDateToMin = $.datepicker.parseDate('dd-mm-yy', dateFrom);
} else {
var date_format = new Date();
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date()));
selectedDate.setDate(selectedDate.getDate()+1);
$("#feature_plan_date_to").datepicker("option", "minDate", selectedDate);
objDateToMin = new Date();
}
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('#feature_plan_date_to').datepicker('option', 'minDate', objDateToMin);
},
//for calender Css
beforeShowDay: function (date) {
return highlightDateBorder($("#feature_plan_date_to").val(), date);
},
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date(date_format[2], date_format[1] - 1, date_format[0]);
selectedDate.setDate(selectedDate.getDate() - 1);
$("#feature_plan_date_from").datepicker("option", "maxDate", selectedDate);
let objDateFromMax = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateFromMax.setDate(objDateFromMax.getDate() - 1);
$('#feature_plan_date_from').datepicker('option', 'maxDate', objDateFromMax);
}
});
function highlightDateBorder(elementVal, date)
{
if (elementVal) {
var currentDate = date.getDate();
var currentMonth = date.getMonth()+1;
if (currentMonth < 10) {
currentMonth = '0' + currentMonth;
}
if (currentDate < 10) {
currentDate = '0' + currentDate;
}
dmy = date.getFullYear() + "-" + currentMonth + "-" + currentDate;
var date_format = elementVal.split("-");
var check_in_time = (date_format[2]) + '-' + (date_format[1]) + '-' + (date_format[0]);
if (dmy == check_in_time) {
let selectedDate = $.datepicker.formatDate('dd-mm-yy', date);
if (selectedDate == elementVal) {
return [true, "selectedCheckedDate", "Check-In date"];
} else {
return [true, ""];

View File

@@ -234,10 +234,10 @@ $(document).ready(function() {
return highlightDateBorder($("#from_date").val(), date);
},
onSelect: function(selectedDate) {
var date_format = selectedDate.split("-");
var selectedDate = new Date($.datepicker.formatDate('yy-mm-dd', new Date(date_format[2], date_format[1] - 1, date_format[0])));
selectedDate.setDate(selectedDate.getDate() + 1);
$("#to_date").datepicker("option", "minDate", selectedDate);
let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('#to_date').datepicker('option', 'minDate', objDateToMin);
},
});
@@ -948,18 +948,8 @@ $(document).ready(function() {
function highlightDateBorder(elementVal, date)
{
if (elementVal) {
var currentDate = date.getDate();
var currentMonth = date.getMonth()+1;
if (currentMonth < 10) {
currentMonth = '0' + currentMonth;
}
if (currentDate < 10) {
currentDate = '0' + currentDate;
}
dmy = date.getFullYear() + "-" + currentMonth + "-" + currentDate;
var date_format = elementVal.split("-");
var check_in_time = (date_format[2]) + '-' + (date_format[1]) + '-' + (date_format[0]);
if (dmy == check_in_time) {
let selectedDate = $.datepicker.formatDate('dd-mm-yy', date);
if (selectedDate == elementVal) {
return [true, "selectedCheckedDate", "Check-In date"];
} else {
return [true, ""];

View File

@@ -494,38 +494,3 @@ function showErrorMessage(msg) {
function showNoticeMessage(msg) {
$.growl.notice({ title: "", message:msg});
}
// highlight dates of the selected date range
function highlightSelectedDateRange(date, checkIn, checkOut)
{
if (checkIn || checkOut) {
// Lets make the date in the required format
var currentDate = date.getDate();
var currentMonth = date.getMonth()+1;
if (currentMonth < 10) {
currentMonth = '0' + currentMonth;
}
if (currentDate < 10) {
currentDate = '0' + currentDate;
}
dmy = date.getFullYear() + "-" + currentMonth + "-" + currentDate;
if (checkIn) {
checkIn = checkIn.split("-");
checkIn = (checkIn[2]) + '-' + (checkIn[1]) + '-' + (checkIn[0]);
}
if (checkOut) {
checkOut = checkOut.split("-");
checkOut = (checkOut[2]) + '-' + (checkOut[1]) + '-' + (checkOut[0]);
}
if (dmy == checkIn || dmy == checkOut) {
return [true, 'selectedCheckedDate', ''];
} else if ((checkIn && checkOut) && (dmy >= checkIn && dmy <= checkOut)) {
return [true, 'in-select-date-range', ''];
}
}
return [true, ''];
}