From 6a6b37d5e77ed416dc0ed1d1f86f400552e79b16 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Thu, 1 Jun 2023 10:59:13 -0400 Subject: [PATCH] CSR-886: remove superfluous data elements, change date from object to string --- .../date-picker/date-picker.vue | 29 +++++++------------ src/layouts/schedule/schedule.vue | 15 +--------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index e63349c67..384f5f697 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -31,8 +31,8 @@
SaturdayS
date.dateString === dateString - ) > -1 + this.selectableDatesData.findIndex((date) => date.date === dateString) > -1 ? true : false, }; @@ -555,8 +547,8 @@ export default { if (monthToShow) { // make new API call with this month's start and end dates await this.updateSelectableDates( - monthToShow.dates[monthStartDateNum].inputValue.dateString, - monthToShow.dates[monthToShow.dates.length - 1].inputValue.dateString + monthToShow.dates[monthStartDateNum].inputValue, + monthToShow.dates[monthToShow.dates.length - 1].inputValue ); this.isLoading = false; this.hideSomeDaysForInitialView = false; // if hid days on initial partial view, this will reveal those days @@ -576,13 +568,13 @@ export default { ); moreSelectableDates.days.forEach((selectableDate) => { const index = this.selectableDatesData.findIndex( - (obj) => obj.dateString === selectableDate.dateString + (dateObj) => dateObj.date === selectableDate.date ); - if (index === -1) this.selectableDatesData.push(selectableDate); + if (index === -1) this.selectableDatesData.push(selectableDate.date); this.months.forEach((month) => { - // TODO: avoid checking all calendar date; maybe only ones between monthStart and monthEnd as defined above? + // TODO: avoid checking all calendar dates; maybe only ones between monthStart and monthEnd as defined above? month.dates.forEach((date) => { - if (date.inputValue.dateString === selectableDate.dateString) { + if (date.inputValue === selectableDate.date) { date["isSelectable"] = true; } }); @@ -853,7 +845,6 @@ export default { .btn-link { font-weight: 500; text-underline-offset: 4px; - box-shadow: none !important; // TODO: FIX THIS position: absolute; top: 90%; } diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index db17d966f..e5282203e 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -107,20 +107,7 @@ const getAvailableDates = async (startDate, endDate, appointmentType, providerNu ); } - const newShopTimeSlots = newTimeSlotsResponse.data; - return convertApiResponse(newShopTimeSlots); -}; -const convertApiResponse = (responseData) => { - // DATA CONVERSION - responseData?.days.forEach((date) => { - const dateString = date.date; - date.dateString = dateString; - const dateStringPieces = dateString.split("-"); - date.year = Number(dateStringPieces[0]); - date.month = Number(dateStringPieces[1]); - date.date = Number(dateStringPieces[2]); - }); - return responseData; + return newTimeSlotsResponse.data; }; export default {