From 95ded9f36678c9a7fb8e1471ada07f7781cd18f0 Mon Sep 17 00:00:00 2001 From: alilaherty Date: Wed, 25 Oct 2023 13:38:20 +1000 Subject: [PATCH 1/4] 90 minute minimum --- .../components/widgets/SuggestedTimeWidget.js | 57 +++++++++++++------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js b/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js index de998ad..d42e0cb 100644 --- a/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js +++ b/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js @@ -44,7 +44,7 @@ export default function SuggestedTimeWidget() { const interval = setInterval(()=>{ fetchData(); //fetchTime(); - },5000); + },50000); /* DEFAULT BEHAVIOUR: GET SINGLE RECOMMENDATION OF NEXT NEAREST TIME */ const fetchData = async () => { console.log('data fetched'); @@ -64,25 +64,50 @@ export default function SuggestedTimeWidget() { (Constants.DAY_POSITIONS[timeSlot.day] > Constants.DAY_POSITIONS[dayName]) || (Constants.DAY_POSITIONS[timeSlot.day] === Constants.DAY_POSITIONS[dayName] && timeSlot.slot_num > currentToTimeSlotNum())); - setSuggestedTime(dayAndTimeToDate(timeSlots[0]['day'], - timeSlots[0]['time'])); - setLoading(false); - } - }; + console.log(timeSlots); - /* - const fetchTime = async () => { - const time = await fetch("../../../time_change.txt"); - const data = time; + let recommendation = timeSlots[0]; + let recommendations = []; + let currentSlot = timeSlots[0]; + let numberChecked = 0; + //console.log("recommendation", recommendations) + + let consecutiveSlots = 0; + while (consecutiveSlots < 3) { + //console.log("day", Constants.DAY_POSITIONS[currentSlot.day]); + const nextSlot = timeSlots.filter(timeSlot => + (Constants.DAY_POSITIONS[timeSlot.day] === Constants.DAY_POSITIONS[currentSlot.day]) && (timeSlot.slot_num === currentSlot.slot_num + 1) + ); + //console.log("nextSlot", nextSlot); + if (nextSlot && nextSlot.length > 0) { + console.log("next", nextSlot); + //recommendations.push(currentSlot); + if (consecutiveSlots == 0) { + recommendation = currentSlot; + } + currentSlot = nextSlot[0]; + consecutiveSlots++; + } else { + consecutiveSlots = 0; + if (numberChecked < timeSlots.length) { + currentSlot = timeSlots[++numberChecked]; + } else { + console.log("no consecutive times found :("); + break; + } + } + } - if (data) { - const delta = data.text(); - console.log("delta", delta); - setTimeDelta(delta); - } + //console.log(recommendation); - }*/ + if (recommendation) { + setSuggestedTime(dayAndTimeToDate(recommendation['day'], + recommendation['time'])); + setLoading(false); + } + } + }; return () => clearInterval(interval); //fetchData(); From d6cf2296232682e5847d48cdc84f415e68326dad Mon Sep 17 00:00:00 2001 From: Lucas Hicks Date: Wed, 25 Oct 2023 14:56:42 +1000 Subject: [PATCH 2/4] Inverts figurines endpoint. --- db-handler/app/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db-handler/app/constants.py b/db-handler/app/constants.py index 425334b..be15b6f 100644 --- a/db-handler/app/constants.py +++ b/db-handler/app/constants.py @@ -25,5 +25,5 @@ LOGGER_TIME_FORMAT = '%I:%M:%S %p' # Values for microcontroller and servos/actuators -FREE = 0 # 0 is sent to the microcontroller if user is not busy -BUSY = 1 # 1 is sent to the microcontroller if user is busy +FREE = 1 # 1 is sent to the microcontroller if user is not busy +BUSY = 0 # 0 is sent to the microcontroller if user is busy From bebf8c9a8cf3fc92eaf11a205d767dd259618a50 Mon Sep 17 00:00:00 2001 From: alilaherty Date: Wed, 25 Oct 2023 15:20:40 +1000 Subject: [PATCH 3/4] upcoming event --- .../components/widgets/SuggestedTimeWidget.js | 41 +++++++++++++++++-- .../src/components/widgets/Widgets.css | 19 +++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js b/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js index d42e0cb..9e4c5b1 100644 --- a/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js +++ b/ui-display/frontend-app/src/components/widgets/SuggestedTimeWidget.js @@ -35,7 +35,7 @@ export default function SuggestedTimeWidget() { } const [suggestedTime, setSuggestedTime] = useState(""); - const [timeDelta, setTimeDelta] = useState(0); + const [upcomingEvent, setUpcomingEvent] = useState(null); const [loading, setLoading] = useState(true); const baseURL = 'https://localhost:8000/display/'; @@ -43,8 +43,8 @@ export default function SuggestedTimeWidget() { useEffect(() => { const interval = setInterval(()=>{ fetchData(); - //fetchTime(); - },50000); + fetchEvents(); + },5000); /* DEFAULT BEHAVIOUR: GET SINGLE RECOMMENDATION OF NEXT NEAREST TIME */ const fetchData = async () => { console.log('data fetched'); @@ -108,6 +108,33 @@ export default function SuggestedTimeWidget() { } }; + const fetchEvents = async () => { + const response = await fetch("http://localhost:8000/display/family-timeslots"); + const data = await response.json(); + if (data && data.body) { + const timeSlotsAllWeek = Array.from(data.body); + console.log("events:", timeSlotsAllWeek); + // filter out any days already passed + // TODO what do we do when the week is nearly over? + const trueNow = new Date(); + const dayName = Constants.DAYS[addSeconds(trueNow, Constants.TIME_DELTA).getDay()]; + + const timeSlots = timeSlotsAllWeek.filter(timeSlot => + (Constants.DAY_POSITIONS[timeSlot.day] > Constants.DAY_POSITIONS[dayName]) + || (Constants.DAY_POSITIONS[timeSlot.day] === Constants.DAY_POSITIONS[dayName] + && timeSlot.slot_num > currentToTimeSlotNum())); + console.log("events filtered", timeSlots); + + if (timeSlots && timeSlots.length > 0) { + console.log("upcoming", timeSlots[0]); + setUpcomingEvent(timeSlots[0]); + } else { + console.log("no upcoming events"); + setUpcomingEvent(null); + } + + } + }; return () => clearInterval(interval); //fetchData(); @@ -122,6 +149,14 @@ export default function SuggestedTimeWidget() { <>

Suggested Time 🪩

Everybody is next free {suggestedTime}.

+ {upcomingEvent ? +

And good news! 🥳 You've got + {(upcomingEvent.data && upcomingEvent.data.length > 1) ? ` ${upcomingEvent.data} ` : " something "} + coming up {dayAndTimeToDate(upcomingEvent['day'], upcomingEvent['time'])} 💗 +

+ : +

Maybe pencil something in!

+ } } diff --git a/ui-display/frontend-app/src/components/widgets/Widgets.css b/ui-display/frontend-app/src/components/widgets/Widgets.css index 929b41c..cfdabf6 100644 --- a/ui-display/frontend-app/src/components/widgets/Widgets.css +++ b/ui-display/frontend-app/src/components/widgets/Widgets.css @@ -34,6 +34,25 @@ color: var(--darkgrey); } +.SuggestedTime-box h3, p { + padding: 0; + margin: 0; +} +.SuggestedTime-box h3 { + padding-bottom: 0.1em; + font-size: 1em; +} + +.SuggestedTime-box h1 { + margin-top: 0.2em; + font-size: 1.75em; +} + +.SuggestedTime-box p { + font-size: 0.75em; + margin-bottom: 0.5em; +} + .Weather-box { font-family: Nightingale; font-size: 30px; From 393e187297fd9a9c98a6086c382b8f6ca2a4bb21 Mon Sep 17 00:00:00 2001 From: alexvillr <73649305+alexvillr@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:40:25 +1000 Subject: [PATCH 4/4] pushing new availabilities for all family members --- vision/make_availabilities.py | 53 +++-- vision/premade/Jimmy.json | 392 ++++++++++++++++++++++++++++------ vision/premade/Kimmy.json | 224 +++++++++---------- vision/premade/Timmy.json | 302 ++++++++++++++++---------- vision/premade/Timmy_Jr.json | 244 ++++++++------------- 5 files changed, 747 insertions(+), 468 deletions(-) diff --git a/vision/make_availabilities.py b/vision/make_availabilities.py index 73282bf..a4cc3af 100644 --- a/vision/make_availabilities.py +++ b/vision/make_availabilities.py @@ -9,47 +9,44 @@ 'Timmy_Jr': [], } timmy_time_slots = { - 'monday': [0, 1, 2, 3, 4, 5, 6, 7], - 'tuesday': [0, 1, 2, 3, 4, 5, 6, 7], - 'wednesday': [0, 1, 2, 3, 4, 5, 6, 7], - 'thursday': [0, 1, 2, 3, 4, 5, 6, 7], - 'friday': [0, 1, 2, 3, 4, 5, 6, 7], - 'saturday': [0, 1, 2, 3, 4, 5, 6, 7], - 'sunday': [0, 1, 2, 3, 4, 5, 6, 7], + 'monday': [8, 9, 10, 11, 12, 13, 14, 15, 20, 21, 22, 23, 24, 25], + 'tuesday': [8, 9, 10, 11, 12, 13, 14, 15, 20, 21, 22, 23, 24, 25, 28, 29, 30, 31, 32, 33], + 'wednesday': [8, 9, 10, 11, 12, 13, 14, 15, 18], + 'thursday': [8, 9, 10, 11, 12, 13, 14, 15], + 'friday': [8, 9, 10, 11, 12, 13, 14, 15, 20, 21, 22, 23, 24, 25], + 'saturday': [12, 13, 14, 15], } timmj_time_slots = { - 'monday': [0, 1, 2, 3, 4, 5, 6, 7], - 'tuesday': [0, 1, 2, 3, 4, 5, 6, 7], - 'wednesday': [0, 1, 2, 3, 4, 5, 6, 7], - 'thursday': [0, 1, 2, 3, 4, 5, 6, 7], - 'friday': [0, 1, 2, 3, 4, 5, 6, 7], - 'saturday': [0, 1, 2, 3, 4, 5, 6, 7], - 'sunday': [0, 1, 2, 3, 4, 5, 6, 7], + 'monday': [24, 25, 26, 27, 28, 29], + 'wednesday': [22, 23, 24, 25, 26], + 'thursday': [24, 25, 26, 27, 28, 29, 30, 31, 32, 33], + 'saturday': [21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33], + 'sunday': [22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33], } jimmy_time_slots = { - 'monday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - 'tuesday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - 'wednesday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], + 'monday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22], + 'tuesday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19], + 'wednesday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 19, 20, 21, 24, 25, 26, 27, 28], 'thursday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - 'friday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - 'saturday': [0, 1, 2, 3, 4, 5, 6, 7], - 'sunday': [0, 1, 2, 3, 4, 5, 6, 7], + 'friday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 16, 17, 18, 19], + 'saturday': [18, 19, 20, 21, 22, 23, 24, 25, 26, 27], + 'sunday': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], } kimmy_time_slots = { - 'monday': [0, 1, 2, 3, 4, 5, 6, 7], - 'tuesday': [0, 1, 2, 3, 4, 5, 6, 7], - 'wednesday': [0, 1, 2, 3, 4, 5, 6, 7], - 'thursday': [0, 1, 2, 3, 4, 5, 6, 7], - 'friday': [0, 1, 2, 3, 4, 5, 6, 7], - 'saturday': [0, 1, 2, 3, 4, 5, 6, 7], - 'sunday': [0, 1, 2, 3, 4, 5, 6, 7], + 'monday': [10, 11, 12, 13, 15, 16, 17, 18, 27, 30, 31, 32, 33], + 'tuesday': [16, 24, 25, 26, 27], + 'wednesday': [16, 17, 20, 21, 22, 23], + 'thursday': [16, 17, 18, 19, 20, 21, 22, 23, 24], + 'friday': [18, 19, 20, 21, 22, 23, 24, 25, 26, 27], + 'saturday': [0, 1, 2, 3, 4, 5, 14, 15, 16], + 'sunday': [16, 17, 18, 19], } def make_json(person): result = [] for day in person: - for time in day: + for time in person.get(day): result.append( {'day': day, 'time_slot': time, 'data': '', 'colour': 'black'} ) diff --git a/vision/premade/Jimmy.json b/vision/premade/Jimmy.json index 5b2a8ac..fd877b6 100644 --- a/vision/premade/Jimmy.json +++ b/vision/premade/Jimmy.json @@ -1,338 +1,602 @@ [ { - "day": 0, + "day": "monday", "time_slot": 0, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 1, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 2, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 3, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 4, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 5, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 6, "data": "", "colour": "black" }, { - "day": 0, + "day": "monday", "time_slot": 7, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 0, + "day": "monday", + "time_slot": 8, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 1, + "day": "monday", + "time_slot": 9, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 2, + "day": "monday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 3, + "day": "monday", + "time_slot": 17, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 4, + "day": "monday", + "time_slot": 18, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 5, + "day": "monday", + "time_slot": 19, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 6, + "day": "monday", + "time_slot": 20, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 7, + "day": "monday", + "time_slot": 21, + "data": "", + "colour": "black" + }, + { + "day": "monday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 0, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 1, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 2, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 3, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 4, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 5, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 6, "data": "", "colour": "black" }, { - "day": 2, + "day": "tuesday", "time_slot": 7, "data": "", "colour": "black" }, { - "day": 3, + "day": "tuesday", + "time_slot": 8, + "data": "", + "colour": "black" + }, + { + "day": "tuesday", + "time_slot": 9, + "data": "", + "colour": "black" + }, + { + "day": "tuesday", + "time_slot": 16, + "data": "", + "colour": "black" + }, + { + "day": "tuesday", + "time_slot": 17, + "data": "", + "colour": "black" + }, + { + "day": "tuesday", + "time_slot": 18, + "data": "", + "colour": "black" + }, + { + "day": "tuesday", + "time_slot": 19, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", "time_slot": 0, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 1, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 2, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 3, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 4, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 5, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 6, "data": "", "colour": "black" }, { - "day": 3, + "day": "wednesday", "time_slot": 7, "data": "", "colour": "black" }, { - "day": 4, + "day": "wednesday", + "time_slot": 8, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 9, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 19, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 20, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 21, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 24, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 25, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 26, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 27, + "data": "", + "colour": "black" + }, + { + "day": "wednesday", + "time_slot": 28, + "data": "", + "colour": "black" + }, + { + "day": "thursday", "time_slot": 0, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 1, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 2, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 3, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 4, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 5, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 6, "data": "", "colour": "black" }, { - "day": 4, + "day": "thursday", "time_slot": 7, "data": "", "colour": "black" }, { - "day": 5, + "day": "thursday", + "time_slot": 8, + "data": "", + "colour": "black" + }, + { + "day": "thursday", + "time_slot": 9, + "data": "", + "colour": "black" + }, + { + "day": "friday", "time_slot": 0, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 1, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 2, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 3, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 4, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 5, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 6, "data": "", "colour": "black" }, { - "day": 5, + "day": "friday", "time_slot": 7, "data": "", "colour": "black" }, { - "day": 6, + "day": "friday", + "time_slot": 8, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 9, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 15, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 16, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 17, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 18, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 19, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 18, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 19, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 20, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 21, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 22, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 23, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 24, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 25, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 26, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 27, + "data": "", + "colour": "black" + }, + { + "day": "sunday", "time_slot": 0, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 1, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 2, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 3, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 4, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 5, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 6, "data": "", "colour": "black" }, { - "day": 6, + "day": "sunday", "time_slot": 7, "data": "", "colour": "black" + }, + { + "day": "sunday", + "time_slot": 8, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 9, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 10, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 11, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 12, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 13, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 14, + "data": "", + "colour": "black" + }, + { + "day": "sunday", + "time_slot": 15, + "data": "", + "colour": "black" } ] \ No newline at end of file diff --git a/vision/premade/Kimmy.json b/vision/premade/Kimmy.json index 5b2a8ac..afe4c48 100644 --- a/vision/premade/Kimmy.json +++ b/vision/premade/Kimmy.json @@ -1,337 +1,337 @@ [ { - "day": 0, - "time_slot": 0, + "day": "monday", + "time_slot": 10, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 1, + "day": "monday", + "time_slot": 11, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 2, + "day": "monday", + "time_slot": 12, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 3, + "day": "monday", + "time_slot": 13, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 4, + "day": "monday", + "time_slot": 15, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 5, + "day": "monday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 6, + "day": "monday", + "time_slot": 17, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 7, + "day": "monday", + "time_slot": 18, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 0, + "day": "monday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 1, + "day": "monday", + "time_slot": 30, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 2, + "day": "monday", + "time_slot": 31, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 3, + "day": "monday", + "time_slot": 32, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 4, + "day": "monday", + "time_slot": 33, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 5, + "day": "tuesday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 6, + "day": "tuesday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 7, + "day": "tuesday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 0, + "day": "tuesday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 1, + "day": "tuesday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 2, + "day": "wednesday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 3, + "day": "wednesday", + "time_slot": 17, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 4, + "day": "wednesday", + "time_slot": 20, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 5, + "day": "wednesday", + "time_slot": 21, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 6, + "day": "wednesday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 7, + "day": "wednesday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 0, + "day": "thursday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 1, + "day": "thursday", + "time_slot": 17, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 2, + "day": "thursday", + "time_slot": 18, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 3, + "day": "thursday", + "time_slot": 19, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 4, + "day": "thursday", + "time_slot": 20, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 5, + "day": "thursday", + "time_slot": 21, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 6, + "day": "thursday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 7, + "day": "thursday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 0, + "day": "thursday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 1, + "day": "friday", + "time_slot": 18, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 2, + "day": "friday", + "time_slot": 19, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 3, + "day": "friday", + "time_slot": 20, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 4, + "day": "friday", + "time_slot": 21, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 5, + "day": "friday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 6, + "day": "friday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 7, + "day": "friday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 0, + "day": "friday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 1, + "day": "friday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 2, + "day": "friday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 3, + "day": "saturday", + "time_slot": 0, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 4, + "day": "saturday", + "time_slot": 1, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 5, + "day": "saturday", + "time_slot": 2, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 6, + "day": "saturday", + "time_slot": 3, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 7, + "day": "saturday", + "time_slot": 4, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 0, + "day": "saturday", + "time_slot": 5, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 1, + "day": "saturday", + "time_slot": 14, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 2, + "day": "saturday", + "time_slot": 15, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 3, + "day": "saturday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 4, + "day": "sunday", + "time_slot": 16, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 5, + "day": "sunday", + "time_slot": 17, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 6, + "day": "sunday", + "time_slot": 18, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 7, + "day": "sunday", + "time_slot": 19, "data": "", "colour": "black" } diff --git a/vision/premade/Timmy.json b/vision/premade/Timmy.json index 5b2a8ac..beec609 100644 --- a/vision/premade/Timmy.json +++ b/vision/premade/Timmy.json @@ -1,337 +1,415 @@ [ { - "day": 0, - "time_slot": 0, + "day": "monday", + "time_slot": 8, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 1, + "day": "monday", + "time_slot": 9, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 2, + "day": "monday", + "time_slot": 10, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 3, + "day": "monday", + "time_slot": 11, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 4, + "day": "monday", + "time_slot": 12, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 5, + "day": "monday", + "time_slot": 13, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 6, + "day": "monday", + "time_slot": 14, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 7, + "day": "monday", + "time_slot": 15, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 0, + "day": "monday", + "time_slot": 20, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 1, + "day": "monday", + "time_slot": 21, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 2, + "day": "monday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 3, + "day": "monday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 4, + "day": "monday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 5, + "day": "monday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 6, + "day": "tuesday", + "time_slot": 8, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 7, + "day": "tuesday", + "time_slot": 9, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 0, + "day": "tuesday", + "time_slot": 10, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 1, + "day": "tuesday", + "time_slot": 11, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 2, + "day": "tuesday", + "time_slot": 12, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 3, + "day": "tuesday", + "time_slot": 13, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 4, + "day": "tuesday", + "time_slot": 14, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 5, + "day": "tuesday", + "time_slot": 15, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 6, + "day": "tuesday", + "time_slot": 20, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 7, + "day": "tuesday", + "time_slot": 21, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 0, + "day": "tuesday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 1, + "day": "tuesday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 2, + "day": "tuesday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 3, + "day": "tuesday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 4, + "day": "tuesday", + "time_slot": 28, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 5, + "day": "tuesday", + "time_slot": 29, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 6, + "day": "tuesday", + "time_slot": 30, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 7, + "day": "tuesday", + "time_slot": 31, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 0, + "day": "tuesday", + "time_slot": 32, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 1, + "day": "tuesday", + "time_slot": 33, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 2, + "day": "wednesday", + "time_slot": 8, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 3, + "day": "wednesday", + "time_slot": 9, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 4, + "day": "wednesday", + "time_slot": 10, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 5, + "day": "wednesday", + "time_slot": 11, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 6, + "day": "wednesday", + "time_slot": 12, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 7, + "day": "wednesday", + "time_slot": 13, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 0, + "day": "wednesday", + "time_slot": 14, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 1, + "day": "wednesday", + "time_slot": 15, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 2, + "day": "wednesday", + "time_slot": 18, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 3, + "day": "thursday", + "time_slot": 8, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 4, + "day": "thursday", + "time_slot": 9, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 5, + "day": "thursday", + "time_slot": 10, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 6, + "day": "thursday", + "time_slot": 11, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 7, + "day": "thursday", + "time_slot": 12, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 0, + "day": "thursday", + "time_slot": 13, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 1, + "day": "thursday", + "time_slot": 14, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 2, + "day": "thursday", + "time_slot": 15, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 3, + "day": "friday", + "time_slot": 8, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 4, + "day": "friday", + "time_slot": 9, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 5, + "day": "friday", + "time_slot": 10, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 6, + "day": "friday", + "time_slot": 11, "data": "", "colour": "black" }, { - "day": 6, - "time_slot": 7, + "day": "friday", + "time_slot": 12, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 13, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 14, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 15, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 20, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 21, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 22, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 23, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 24, + "data": "", + "colour": "black" + }, + { + "day": "friday", + "time_slot": 25, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 12, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 13, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 14, + "data": "", + "colour": "black" + }, + { + "day": "saturday", + "time_slot": 15, "data": "", "colour": "black" } diff --git a/vision/premade/Timmy_Jr.json b/vision/premade/Timmy_Jr.json index 5b2a8ac..77dfa97 100644 --- a/vision/premade/Timmy_Jr.json +++ b/vision/premade/Timmy_Jr.json @@ -1,337 +1,277 @@ [ { - "day": 0, - "time_slot": 0, + "day": "monday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 1, + "day": "monday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 2, + "day": "monday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 3, + "day": "monday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 4, + "day": "monday", + "time_slot": 28, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 5, + "day": "monday", + "time_slot": 29, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 6, + "day": "wednesday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 0, - "time_slot": 7, + "day": "wednesday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 0, + "day": "wednesday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 1, + "day": "wednesday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 2, + "day": "wednesday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 3, + "day": "thursday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 4, + "day": "thursday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 5, + "day": "thursday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 6, + "day": "thursday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 1, - "time_slot": 7, + "day": "thursday", + "time_slot": 28, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 0, + "day": "thursday", + "time_slot": 29, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 1, + "day": "thursday", + "time_slot": 30, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 2, + "day": "thursday", + "time_slot": 31, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 3, + "day": "thursday", + "time_slot": 32, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 4, + "day": "thursday", + "time_slot": 33, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 5, + "day": "saturday", + "time_slot": 21, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 6, + "day": "saturday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 2, - "time_slot": 7, + "day": "saturday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 0, + "day": "saturday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 1, + "day": "saturday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 2, + "day": "saturday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 3, + "day": "saturday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 4, + "day": "saturday", + "time_slot": 28, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 5, + "day": "saturday", + "time_slot": 29, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 6, + "day": "saturday", + "time_slot": 30, "data": "", "colour": "black" }, { - "day": 3, - "time_slot": 7, + "day": "saturday", + "time_slot": 31, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 0, + "day": "saturday", + "time_slot": 32, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 1, + "day": "saturday", + "time_slot": 33, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 2, + "day": "sunday", + "time_slot": 22, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 3, + "day": "sunday", + "time_slot": 23, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 4, + "day": "sunday", + "time_slot": 24, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 5, + "day": "sunday", + "time_slot": 25, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 6, + "day": "sunday", + "time_slot": 26, "data": "", "colour": "black" }, { - "day": 4, - "time_slot": 7, + "day": "sunday", + "time_slot": 27, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 0, + "day": "sunday", + "time_slot": 28, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 1, + "day": "sunday", + "time_slot": 29, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 2, + "day": "sunday", + "time_slot": 30, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 3, + "day": "sunday", + "time_slot": 31, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 4, + "day": "sunday", + "time_slot": 32, "data": "", "colour": "black" }, { - "day": 5, - "time_slot": 5, - "data": "", - "colour": "black" - }, - { - "day": 5, - "time_slot": 6, - "data": "", - "colour": "black" - }, - { - "day": 5, - "time_slot": 7, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 0, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 1, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 2, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 3, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 4, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 5, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 6, - "data": "", - "colour": "black" - }, - { - "day": 6, - "time_slot": 7, + "day": "sunday", + "time_slot": 33, "data": "", "colour": "black" }