Skip to content
Snippets Groups Projects
Commit 8bbedd1a authored by Reinder Kraaij's avatar Reinder Kraaij :eye:
Browse files

Add End/Start Time

parent 1f9e5386
No related branches found
No related tags found
2 merge requests!1213Resolve TMSS-2717 "Refactor details summary + ui tweaks",!1212Resolve TMSS-2717 "Refactor details summary + ui tweaks"
...@@ -14,7 +14,7 @@ import moment from "moment"; ...@@ -14,7 +14,7 @@ import moment from "moment";
import { ProgressSpinner } from 'primereact/progressspinner'; import { ProgressSpinner } from 'primereact/progressspinner';
import { fetchAllOptionsForMultiSelects } from "../../data/filters.data"; import { fetchAllOptionsForMultiSelects } from "../../data/filters.data";
const isDebugLoggingOn = false
function Toggle(props) { //TODO: extract to separate class function Toggle(props) { //TODO: extract to separate class
const { const {
labelName, labelName,
...@@ -36,8 +36,8 @@ function Toggle(props) { //TODO: extract to separate class ...@@ -36,8 +36,8 @@ function Toggle(props) { //TODO: extract to separate class
</div> </div>
} }
function filterReservations(reservations, visibleStartTime, reservationFilter, projectFilter) { function filterReservations(reservations, visibleStartTime, reservationFilter, projectFilter,endTime,startTime) {
let reservationItems = reservations.flatMap(reservation => splitObjectIfSpanIsMultipleDays(reservation, false)) let reservationItems = reservations.flatMap(reservation => splitObjectIfSpanIsMultipleDays(reservation, false,startTime,endTime))
.map((reservation, index) => getReservationItem(reservation, index, moment(visibleStartTime).format(UIConstants.CALENDAR_DEFAULTDATE_FORMAT))) .map((reservation, index) => getReservationItem(reservation, index, moment(visibleStartTime).format(UIConstants.CALENDAR_DEFAULTDATE_FORMAT)))
.filter(reservationItem => reservationFilter.includes(reservationItem.reason)) .filter(reservationItem => reservationFilter.includes(reservationItem.reason))
...@@ -75,6 +75,8 @@ function filterSchedulingUnits(schedulingUnits, visibleStartTime, onSkyToggle, s ...@@ -75,6 +75,8 @@ function filterSchedulingUnits(schedulingUnits, visibleStartTime, onSkyToggle, s
export default function Filters(props) { export default function Filters(props) {
const { const {
visibleStartTime, visibleStartTime,
endTime,
startTime,
setItems, setItems,
data, data,
setRefetchToggle, setRefetchToggle,
...@@ -159,7 +161,9 @@ export default function Filters(props) { ...@@ -159,7 +161,9 @@ export default function Filters(props) {
let reservationsItems = [] let reservationsItems = []
if (reservationsToggle) { if (reservationsToggle) {
reservationsItems = filterReservations(data.reservations, visibleStartTime, reservationFilter, projectFilter); if(isDebugLoggingOn) console.log("Gather Reservations for ",visibleStartTime,endTime,startTime);
reservationsItems = filterReservations(data.reservations, visibleStartTime, reservationFilter, projectFilter,endTime,startTime);
if (isDebugLoggingOn) console.log("Reservation sais",reservationsItems)
} }
setItems(prevState => ({ setItems(prevState => ({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment