Skip to content

refactor(manage-reservations): replace native date time input with fl… #1081

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 25, 2026
+8 −15
Merged

refactor(manage-reservations): replace native date time input with fl… #1081

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
6 changes: 3 additions & 3 deletions Web/scripts/admin/reservations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ function ReservationManagement(opts, approval) {

var elements = {
userFilter: $("#userFilter"),
startDate: $("#formattedStartDate"),
endDate: $("#formattedEndDate"),
startDate: document.getElementById('startDate'),
endDate: document.getElementById('endDate'),
userId: $("#userId"),
scheduleId: $("#scheduleId"),
resourceId: $("#resourceId"),
Expand Down Expand Up @@ -366,7 +366,7 @@ function ReservationManagement(opts, approval) {
return boolVal ? 1 : 0;
};

var filterQuery = 'sd=' + elements.startDate.val() + '&ed=' + elements.endDate.val() + '&sid=' + elements.scheduleId.val() + '&rid=' + elements.resourceId.val() + '&uid=' + elements.userId.val() + '&un=' + elements.userFilter.val() + '&rn=' + elements.referenceNumber.val() + '&rsid=' + elements.statusId.val() + '&rrsid=' + elements.resourceStatusIdFilter.val() + '&rrsrid=' + reasonId + '&rtitle=' + elements.title.val() + '&rdesc=' + elements.description.val() + '&in=' + toInt(elements.missedCheckin.is(':checked')) + '&out=' + toInt(elements.missedCheckout.is(':checked'));
var filterQuery = 'sd=' + elements.startDate.value + '&ed=' + elements.endDate.value + '&sid=' + elements.scheduleId.val() + '&rid=' + elements.resourceId.val() + '&uid=' + elements.userId.val() + '&un=' + elements.userFilter.val() + '&rn=' + elements.referenceNumber.val() + '&rsid=' + elements.statusId.val() + '&rrsid=' + elements.resourceStatusIdFilter.val() + '&rrsrid=' + reasonId + '&rtitle=' + elements.title.val() + '&rdesc=' + elements.description.val() + '&in=' + toInt(elements.missedCheckin.is(':checked')) + '&out=' + toInt(elements.missedCheckout.is(':checked'));

window.location = document.location.pathname + '?' + encodeURI(filterQuery) + attributeString;
}
Expand Down
17 changes: 5 additions & 12 deletions tpl/Admin/Reservations/manage_reservations.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,11 @@
class="form-group filter-dates {$groupClass} d-flex justify-content-between align-items-center">
<div>
<label for="startDate" class="fw-bold">{translate key='BeginDate'}</label>
<input id="startDate" type="date" class="form-control form-control-sm dateinput inline"
value="{formatdate date=$StartDate format='Y-m-d'}" />
<input id="formattedStartDate" type="hidden"
value="{formatdate date=$StartDate key=system}" />
<input id="startDate" type="text" class="form-control form-control-sm" />
</div>
<div>
<label for="endDate" class="fw-bold">{translate key='EndDate'}</label>
<input id="endDate" type="date" class="form-control form-control-sm dateinput inline"
value="{formatdate date=$EndDate format='Y-m-d'}" />
<input id="formattedEndDate" type="hidden"
value="{formatdate date=$EndDate key=system}" />
<input id="endDate" type="text" class="form-control form-control-sm" />
</div>
</div>
<div class="form-group filter-user {$groupClass}">
Expand Down Expand Up @@ -580,7 +574,7 @@
{datatable tableId=$tableId}
{jsfile src="ajax-helpers.js"}
{jsfile src="admin/reservations.js"}

{jsfile src="search-clear.js"}
{jsfile src="autocomplete.js"}
{jsfile src="reservationPopup.js"}
{jsfile src="approval.js"}
Expand Down Expand Up @@ -678,8 +672,8 @@
});
</script>

{control type="DatePickerSetupControl" ControlId="startDate" AltId="formattedStartDate"}
{control type="DatePickerSetupControl" ControlId="endDate" AltId="formattedEndDate"}
{control type="DatePickerSetupControl" ControlId="startDate" DefaultDate=$StartDate}
{control type="DatePickerSetupControl" ControlId="endDate" DefaultDate=$EndDate}

{csrf_token}

Expand All @@ -689,5 +683,4 @@
</div>

</div>
{jsfile src="search-clear.js"}
{include file='globalfooter.tpl'}