diff --git a/Web/scripts/admin/reservations.js b/Web/scripts/admin/reservations.js index e0eee9d94..55b9076ce 100644 --- a/Web/scripts/admin/reservations.js +++ b/Web/scripts/admin/reservations.js @@ -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"), @@ -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; } diff --git a/tpl/Admin/Reservations/manage_reservations.tpl b/tpl/Admin/Reservations/manage_reservations.tpl index 88599b625..48219a3b9 100644 --- a/tpl/Admin/Reservations/manage_reservations.tpl +++ b/tpl/Admin/Reservations/manage_reservations.tpl @@ -62,17 +62,11 @@ class="form-group filter-dates {$groupClass} d-flex justify-content-between align-items-center">
- - +
- - +
@@ -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"} @@ -678,8 +672,8 @@ }); - {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} @@ -689,5 +683,4 @@
-{jsfile src="search-clear.js"} {include file='globalfooter.tpl'}