@asd20/ui 3.2.880 → 3.2.882

package/package.json

@@ -5,7 +5,7 @@
     "*.scss",
     "*.vue"
   ],
-  "version": "3.2.880",
+  "version": "3.2.882",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/components/organisms/Asd20SiteSearch/index.vue

@@ -106,7 +106,7 @@ import mapFilesToListItems from '../../../helpers/mapFilesToListItems'
 import globalPropMixinFactory from '../../../mixins/globalPropMixinFactory.js'
 
 export default {
-  name: 'Asd20SearchMenu',
+  name: 'Asd20SiteSearch',
 
   mixins: [
     globalPropMixinFactory(

package/src/data/events/district-events.json

@@ -29,9 +29,9 @@
       "summary": "Winter Break - No School",
       "description": "No School",
       "location": "AAHS",
-      "start": "2022-12-19T07:00:00Z",
-      "end": "2023-01-05T07:00:00Z",
-      "dtstamp": "2022-12-19T07:00:00Z",
+      "start": "2024-12-19T07:00:00Z",
+      "end": "2025-01-05T07:00:00Z",
+      "dtstamp": "2024-12-19T07:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -48,6 +48,33 @@
       "calendarFormat": "ical",
       "calendarColor": "#213f94"
     },
+    {
+      "@search.score": 1,
+      "id": null,
+      "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMERFRTE5NzcxNThBQ0RBMDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDBFOEVBMjc5NkM0MDI3RjRGODFFNzY1QzQ0M0VGMDA0Mw==",
+      "type": "event",
+      "summary": "Winter Break - Break",
+      "description": "",
+      "location": "AAHS",
+      "start": "2024-12-25T17:00:00Z",
+      "end": "2024-12-25T17:30:00Z",
+      "dtstamp": "2024-12-25T17:00:00Z",
+      "class": "",
+      "priority": "",
+      "transparency": "",
+      "status": "",
+      "sequence": "",
+      "url": null,
+      "calendarId": "a0c92470-27a0-11ec-a6e3-c76d885e64a4",
+      "calendarName": "Choir",
+      "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
+      "calendarOrganizationTitle": "Air Academy High School",
+      "calendarCategories": [],
+      "calendarKeywords": [],
+      "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/93eb354f1a6b446bb533e2f40613f8a310360980508845501669/calendar.ics",
+      "calendarFormat": "ical",
+      "calendarColor": "#eb28c7"
+    },
     {
       "@search.score": 1,
       "id": null,
@@ -56,9 +83,9 @@
       "summary": "All State Choir",
       "description": "",
       "location": "Denver Center for the Performing Arts (1101 13th St, Denver, CO 80204, United States)",
-      "start": "2023-01-09T17:00:00Z",
-      "end": "2023-01-11T17:30:00Z",
-      "dtstamp": "2023-01-09T17:00:00Z",
+      "start": "2025-01-09T17:00:00Z",
+      "end": "2025-01-11T17:30:00Z",
+      "dtstamp": "2025-01-09T17:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -83,9 +110,9 @@
       "summary": "First day of second semester",
       "description": "<ul><li>In-person attendance is limited to boardroom capacity of 70 audience members per the Colorado Springs Fire Marshall.</li><li>Note, those who attend in person may be captured on camera during the live feed and recorded versions of the meeting.</li><li>The meeting link will be available the week of the meeting.</li></ul><br/>We invite public comment at our meetings.<br/><br/><ul><li>You must sign-up to speak between 7 a.m. and 1 p.m., the day of the board meeting by completing our Public <a href=\"https://forms.office.com/r/4nRw9yhyeS\" target=\"_blank\">Comment Form</a>.</li><li>You must be present and available to speak in-person at the podium when called upon.</li><li>You cannot provide virtual public comment.</li><li>If you cannot attend in-person, we invite you to submit your comments in writing via the Public <a href=\"https://forms.office.com/r/4nRw9yhyeS\" target=\"_blank\">Comment Form</a>. Written comments submitted through the Public Comment Form will not be read publicly at the board meeting, but they will be included as part of the public record in the minutes for the meeting.</li></ul>",
       "location": "AAHS",
-      "start": "2023-01-05T07:00:00Z",
-      "end": "2023-01-06T07:00:00Z",
-      "dtstamp": "2023-01-05T07:00:00Z",
+      "start": "2025-01-05T07:00:00Z",
+      "end": "2025-01-06T07:00:00Z",
+      "dtstamp": "2025-01-05T07:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -110,9 +137,9 @@
       "summary": "Boys Varsity  vs. CoronadoDohertyLibertyMullenPalmer RidgePine CreekPueblo WestRampartRock CanyonThunderRidge'>Multiple Schools (Home)",
       "description": "Type: Kadet Kickoff Tournament Opponent: CoronadoDohertyLibertyMullenPalmer RidgePine CreekPueblo WestRampartRock CanyonThunderRidge'>Multiple Schools Comments: Confirmed",
       "location": "AAHS Media Center",
-      "start": "2023-01-19T08:20:00Z",
-      "end": "2023-01-19T08:20:00Z",
-      "dtstamp": "2023-01-19T20:20:00Z",
+      "start": "2025-01-19T08:20:00Z",
+      "end": "2025-01-19T08:20:00Z",
+      "dtstamp": "2025-01-19T20:20:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -137,9 +164,9 @@
       "summary": "Choice Night",
       "description": "",
       "location": "AAHS Media Center",
-      "start": "2023-01-20T01:00:00Z",
-      "end": "2023-01-20T03:00:00Z",
-      "dtstamp": "2023-01-20T01:00:00Z",
+      "start": "2025-01-20T01:00:00Z",
+      "end": "2025-01-20T03:00:00Z",
+      "dtstamp": "2025-01-20T01:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -164,9 +191,9 @@
       "summary": "8th Grade Information Night",
       "description": "",
       "location": "AAHS Gyms",
-      "start": "2023-02-10T01:00:00Z",
-      "end": "2023-02-10T03:00:00Z",
-      "dtstamp": "2023-02-10T01:00:00Z",
+      "start": "2025-02-10T01:00:00Z",
+      "end": "2025-02-10T03:00:00Z",
+      "dtstamp": "2025-02-10T01:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -191,9 +218,9 @@
       "summary": "Parent-teacher Conferences",
       "description": "",
       "location": "",
-      "start": "2023-03-22T21:30:00Z",
-      "end": "2023-03-23T01:30:00Z",
-      "dtstamp": "2023-03-22T21:30:00Z",
+      "start": "2025-03-22T21:30:00Z",
+      "end": "2025-03-23T01:30:00Z",
+      "dtstamp": "2025-03-22T21:30:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -218,9 +245,9 @@
       "summary": "Parent-Teacher Conferences",
       "description": "",
       "location": "",
-      "start": "2023-03-23T22:00:00Z",
-      "end": "2023-03-24T01:00:00Z",
-      "dtstamp": "2023-03-23T22:00:00Z",
+      "start": "2025-03-23T22:00:00Z",
+      "end": "2025-03-24T01:00:00Z",
+      "dtstamp": "2025-03-23T22:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -245,9 +272,9 @@
       "summary": "No school",
       "description": "",
       "location": "",
-      "start": "2023-03-24T06:00:00Z",
-      "end": "2023-03-25T06:00:00Z",
-      "dtstamp": "2023-03-24T06:00:00Z",
+      "start": "2025-03-24T06:00:00Z",
+      "end": "2025-03-25T06:00:00Z",
+      "dtstamp": "2025-03-24T06:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -272,9 +299,9 @@
       "summary": "No school - Spring Break",
       "description": "",
       "location": "",
-      "start": "2023-03-27T06:00:00Z",
-      "end": "2023-03-28T06:00:00Z",
-      "dtstamp": "2023-03-27T06:00:00Z",
+      "start": "2025-03-27T06:00:00Z",
+      "end": "2025-03-28T06:00:00Z",
+      "dtstamp": "2025-03-27T06:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",
@@ -299,9 +326,9 @@
       "summary": "No school - Spring Break",
       "description": "",
       "location": "",
-      "start": "2023-03-28T06:00:00Z",
-      "end": "2023-03-29T06:00:00Z",
-      "dtstamp": "2023-03-28T06:00:00Z",
+      "start": "2025-03-28T06:00:00Z",
+      "end": "2025-03-29T06:00:00Z",
+      "dtstamp": "2025-03-28T06:00:00Z",
       "class": "",
       "priority": "",
       "transparency": "",

package/src/helpers/expandEvents.js

@@ -14,65 +14,82 @@ import isSameDay from 'date-fns/is_same_day'
 export default function expandEvents(events) {
   return events
     .reduce((a, event) => {
-      // Handle multi-day events
-      const diffTime = Math.abs(
-        parse(event.end || event.start).getTime() - parse(event.start).getTime()
-      )
+      // Parse the event start and end times
+      const start = parse(event.start)
+      const end = event.end ? parse(event.end) : start
+
+      // Normalize today's date to ignore time
+      const today = new Date()
+      today.setHours(0, 0, 0, 0)
+      console.log('Today:', today)
+
+      const diffTime = Math.abs(end.getTime() - start.getTime())
       const diffHours = Math.ceil(diffTime / (1000 * 60 * 60))
       const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
-      const multiDay = !isSameDay(event.start, event.end)
+      const multiDay = !isSameDay(start, end)
       const allDay = !event.end || (diffHours > 23 && diffHours < 25)
       const endTimeUndetermined = event.end && event.end === event.start
 
       if (multiDay && !allDay) {
+        // Expand multi-day events
         for (let d = 0; d < diffDays; d++) {
-          const today = new Date()
-          today.setDate(today.getDate() - 1)
-          const newStart = addDays(event.start, d)
-          if (newStart > today) {
-            a.push(
-              Object.assign({}, event, {
-                start: newStart,
-                end: event.end ? event.end : null,
-                originalStart: event.start,
-                allDay: parse(event.start).getHours() === 0,
-                endTimeUndetermined,
-                multiDay,
-                weekday: format(parse(newStart), 'dddd'),
-                day: format(parse(newStart), 'DD'),
-                number: format(parse(newStart), 'D'),
-                month: format(parse(newStart), 'MMMM'),
-                year: format(parse(newStart), 'YYYY'),
-              })
-            )
+          const newStart = addDays(start, d)
+          // Normalize newStart to ignore time
+          newStart.setHours(0, 0, 0, 0)
+          console.log('newStart:', newStart)
+
+          if (newStart >= today) {
+            a.push({
+              ...event,
+              start: newStart,
+              end: end,
+              originalStart: start,
+              allDay: start.getHours() === 0,
+              endTimeUndetermined,
+              multiDay,
+              weekday: format(newStart, 'dddd'),
+              day: format(newStart, 'DD'),
+              number: format(newStart, 'D'),
+              month: format(newStart, 'MMMM'),
+              year: format(newStart, 'YYYY'),
+            })
           }
         }
       } else {
-        a.push(
-          Object.assign({}, event, {
-            start: event.start,
-            end: event.end ? event.end : null,
+        // Normalize start date for single-day events
+        const normalizedStart = new Date(start)
+        normalizedStart.setHours(0, 0, 0, 0)
+        console.log('normailizedStart:', normalizedStart)
+
+        if (normalizedStart >= today) {
+          a.push({
+            ...event,
+            start: start,
+            end: end,
             originalStart: null,
             allDay,
             endTimeUndetermined,
             multiDay,
-            weekday: format(parse(event.start), 'dddd'),
-            day: format(parse(event.start), 'DD'),
-            number: format(parse(event.start), 'D'),
-            month: format(parse(event.start), 'MMMM'),
-            year: format(parse(event.start), 'YYYY'),
+            weekday: format(start, 'dddd'),
+            day: format(start, 'DD'),
+            number: format(start, 'D'),
+            month: format(start, 'MMMM'),
+            year: format(start, 'YYYY'),
           })
-        )
+        }
       }
       return a
     }, [])
     .reduce((a, e) => {
-      const hasDuplicate =
-        a.filter(
-          ae =>
-            ae.summary === e.summary && ae.start === e.start && ae.end === e.end
-        ).length > 0
+      // Remove duplicates
+      const hasDuplicate = a.some(
+        ae => ae.summary === e.summary && ae.start.getTime() === e.start.getTime() && ae.end.getTime() === e.end.getTime()
+      )
       if (!hasDuplicate) a.push(e)
       return a
     }, [])
+    .sort((a, b) => {
+      // Sort events by start date
+      return a.start.getTime() - b.start.getTime()
+    })
 }