Skip to content

refactor(manage-schedules): replace native date inputs with flatpickr #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnVillalovos merged 1 commit into from
Feb 23, 2026
Merged

refactor(manage-schedules): replace native date inputs with flatpickr #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 55 additions & 30 deletions Web/scripts/admin/schedule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@ function ScheduleManagement(opts) {
deletePeakTimesButton: $('#deletePeakBtn'),
deletePeakTimes: $('#deletePeakTimes'),

availabilityDialog: $('#availabilityDialog'),
availableStartDateTextbox: $('#availabilityStartDate'),
availableStartDate: $('#formattedBeginDate'),
availableEndDateTextbox: $('#availabilityEndDate'),
availableEndDate: $('#formattedEndDate'),
availableAllYear: $('#availableAllYear'),
availabilityDialog: document.getElementById('availabilityDialog'),
availableStartDate: document.getElementById('availabilityStartDate'),
availableEndDate: document.getElementById('availabilityEndDate'),
availableAllYear: document.getElementById('availableAllYear'),
availabilityForm: $('#availabilityForm'),

concurrentForm: $('#concurrentForm'),
Expand Down Expand Up @@ -200,14 +198,24 @@ function ScheduleManagement(opts) {
elements.deletePeakTimes.val('1');
});

elements.availableAllYear.on('click', function (e) {
if ($(e.target).is(':checked')) {
elements.availableStartDateTextbox.prop('disabled', true);
elements.availableEndDateTextbox.prop('disabled', true);
}
else {
elements.availableStartDateTextbox.prop('disabled', false);
elements.availableEndDateTextbox.prop('disabled', false);
elements.availableAllYear.addEventListener('change', function (e) {
var fpStart = elements.availableStartDate?._flatpickr;
var fpEnd = elements.availableEndDate?._flatpickr;

if (e.target.checked) {
if (fpStart) {
fpStart.altInput.disabled = true;
}
if (fpEnd) {
fpEnd.altInput.disabled = true;
}
} else {
if (fpStart) {
fpStart.altInput.disabled = false;
}
if (fpEnd) {
fpEnd.altInput.disabled = false;
}
}
});

Expand Down Expand Up @@ -571,26 +579,43 @@ function ScheduleManagement(opts) {
};

var showAvailabilityDialog = function (scheduleId) {
var placeholder = $('[data-schedule-id=' + scheduleId + ']').find('.availabilityPlaceHolder');
var dates = placeholder.find('.availableDates');
var startDate = dates.attr('data-start-date');
var endDate = dates.attr('data-end-date');
var hasAvailability = dates.data('has-availability') == '1';

//elements.availableAllYear.prop('checked', !hasAvailability);
elements.availableStartDateTextbox.val(startDate).trigger('change');
elements.availableEndDateTextbox.val(endDate).trigger('change');

if (!hasAvailability) {
elements.availableAllYear.trigger('click');
}

elements.availabilityDialog.modal('show');
var placeholder = document.querySelector('[data-schedule-id="' + scheduleId + '"] .availabilityPlaceHolder');
var dates = placeholder.querySelector('.availableDates');
var startDate = dates.getAttribute('data-start-date');
var endDate = dates.getAttribute('data-end-date');
var hasAvailability = dates.getAttribute('data-has-availability') == '1';

elements.availableAllYear.checked = !hasAvailability;

elements.availabilityDialog.addEventListener('shown.bs.modal', function () {

var fpStart = elements.availableStartDate?._flatpickr;
var fpEnd = elements.availableEndDate?._flatpickr;

if (fpStart) fpStart.setDate(startDate || null, false);
else elements.availableStartDate.value = startDate || '';

if (fpEnd) fpEnd.setDate(endDate || null, false);
else elements.availableEndDate.value = endDate || '';

elements.availableAllYear.dispatchEvent(
new Event('change', { bubbles: true })
);

}, { once: true });

var modal = bootstrap.Modal.getOrCreateInstance(elements.availabilityDialog);
modal.show();
};

var refreshAvailability = function (resultHtml) {
$('[data-schedule-id=' + getActiveScheduleId() + ']').find('.availabilityContent').html(resultHtml);
elements.availabilityDialog.modal('hide');
var scheduleEl = document.querySelector('[data-schedule-id="' + getActiveScheduleId() + '"]');
scheduleEl.querySelector('.availabilityContent').innerHTML = resultHtml;
var modalInstance = bootstrap.Modal.getInstance(elements.availabilityDialog);
if (modalInstance) {
modalInstance.hide();
}
};

var toggleConcurrentReservations = function (scheduleId, toggle, container) {
Expand Down
16 changes: 7 additions & 9 deletions tpl/Admin/Schedules/manage_schedules.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,13 +685,11 @@
<div id="availableDates" class="d-flex align-items-center gap-1">
<label for="availabilityStartDate">{translate key=AvailableBetween}</label>
<label for="availabilityEndDate" class="visually-hidden">Available End Date</label>
<input type="date" id="availabilityStartDate"
class="form-control form-control-sm inline-block dateinput" />
<input type="hidden" id="formattedBeginDate" {formname key=AVAILABLE_BEGIN_DATE} />
-
<input type="date" id="availabilityEndDate"
class="form-control form-control-sm inline-block dateinput" />
<input type="hidden" id="formattedEndDate" {formname key=AVAILABLE_END_DATE} />
<input type="text" id="availabilityStartDate" {formname key=AVAILABLE_BEGIN_DATE}
class="form-control form-control-sm w-auto" required />
<div class='mx-1'>-</div>
<input type="text" id="availabilityEndDate" {formname key=AVAILABLE_END_DATE}
class="form-control form-control-sm w-auto" />
</div>
</div>
</div>
Expand Down Expand Up @@ -841,8 +839,8 @@
</form>
</div>

{control type="DatePickerSetupControl" ControlId="availabilityStartDate" AltId="formattedBeginDate" DefaultDate=$StartDate}
{control type="DatePickerSetupControl" ControlId="availabilityEndDate" AltId="formattedEndDate" DefaultDate=$EndDate}
{control type="DatePickerSetupControl" ControlId="availabilityStartDate" DefaultDate=$StartDate}
{control type="DatePickerSetupControl" ControlId="availabilityEndDate" DefaultDate=$EndDate}

{csrf_token}
{include file="javascript-includes.tpl" InlineEdit=true Fullcalendar=true DataTable=true}
Expand Down