@asd20/ui 3.2.881 → 3.2.882

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/data/events/district-events.json +36 -36
  3. package/src/helpers/expandEvents.js +41 -24
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "*.scss",
6
6
  "*.vue"
7
7
  ],
8
- "version": "3.2.881",
8
+ "version": "3.2.882",
9
9
  "private": false,
10
10
  "license": "MIT",
11
11
  "repository": {
package/src/data/events/district-events.json CHANGED
@@ -29,9 +29,9 @@
29
29
  "summary": "Winter Break - No School",
30
30
  "description": "No School",
31
31
  "location": "AAHS",
32
- "start": "2022-12-19T07:00:00Z",
33
- "end": "2023-01-05T07:00:00Z",
34
- "dtstamp": "2022-12-19T07:00:00Z",
32
+ "start": "2024-12-19T07:00:00Z",
33
+ "end": "2025-01-05T07:00:00Z",
34
+ "dtstamp": "2024-12-19T07:00:00Z",
35
35
  "class": "",
36
36
  "priority": "",
37
37
  "transparency": "",
@@ -56,9 +56,9 @@
56
56
  "summary": "Winter Break - Break",
57
57
  "description": "",
58
58
  "location": "AAHS",
59
- "start": "2022-12-25T17:00:00Z",
60
- "end": "2022-12-25T17:30:00Z",
61
- "dtstamp": "2022-12-25T17:00:00Z",
59
+ "start": "2024-12-25T17:00:00Z",
60
+ "end": "2024-12-25T17:30:00Z",
61
+ "dtstamp": "2024-12-25T17:00:00Z",
62
62
  "class": "",
63
63
  "priority": "",
64
64
  "transparency": "",
@@ -83,9 +83,9 @@
83
83
  "summary": "All State Choir",
84
84
  "description": "",
85
85
  "location": "Denver Center for the Performing Arts (1101 13th St, Denver, CO 80204, United States)",
86
- "start": "2023-01-09T17:00:00Z",
87
- "end": "2023-01-11T17:30:00Z",
88
- "dtstamp": "2023-01-09T17:00:00Z",
86
+ "start": "2025-01-09T17:00:00Z",
87
+ "end": "2025-01-11T17:30:00Z",
88
+ "dtstamp": "2025-01-09T17:00:00Z",
89
89
  "class": "",
90
90
  "priority": "",
91
91
  "transparency": "",
@@ -110,9 +110,9 @@
110
110
  "summary": "First day of second semester",
111
111
  "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>",
112
112
  "location": "AAHS",
113
- "start": "2023-01-05T07:00:00Z",
114
- "end": "2023-01-06T07:00:00Z",
115
- "dtstamp": "2023-01-05T07:00:00Z",
113
+ "start": "2025-01-05T07:00:00Z",
114
+ "end": "2025-01-06T07:00:00Z",
115
+ "dtstamp": "2025-01-05T07:00:00Z",
116
116
  "class": "",
117
117
  "priority": "",
118
118
  "transparency": "",
@@ -137,9 +137,9 @@
137
137
  "summary": "Boys Varsity vs. CoronadoDohertyLibertyMullenPalmer RidgePine CreekPueblo WestRampartRock CanyonThunderRidge'>Multiple Schools (Home)",
138
138
  "description": "Type: Kadet Kickoff Tournament Opponent: CoronadoDohertyLibertyMullenPalmer RidgePine CreekPueblo WestRampartRock CanyonThunderRidge'>Multiple Schools Comments: Confirmed",
139
139
  "location": "AAHS Media Center",
140
- "start": "2023-01-19T08:20:00Z",
141
- "end": "2023-01-19T08:20:00Z",
142
- "dtstamp": "2023-01-19T20:20:00Z",
140
+ "start": "2025-01-19T08:20:00Z",
141
+ "end": "2025-01-19T08:20:00Z",
142
+ "dtstamp": "2025-01-19T20:20:00Z",
143
143
  "class": "",
144
144
  "priority": "",
145
145
  "transparency": "",
@@ -164,9 +164,9 @@
164
164
  "summary": "Choice Night",
165
165
  "description": "",
166
166
  "location": "AAHS Media Center",
167
- "start": "2023-01-20T01:00:00Z",
168
- "end": "2023-01-20T03:00:00Z",
169
- "dtstamp": "2023-01-20T01:00:00Z",
167
+ "start": "2025-01-20T01:00:00Z",
168
+ "end": "2025-01-20T03:00:00Z",
169
+ "dtstamp": "2025-01-20T01:00:00Z",
170
170
  "class": "",
171
171
  "priority": "",
172
172
  "transparency": "",
@@ -191,9 +191,9 @@
191
191
  "summary": "8th Grade Information Night",
192
192
  "description": "",
193
193
  "location": "AAHS Gyms",
194
- "start": "2023-02-10T01:00:00Z",
195
- "end": "2023-02-10T03:00:00Z",
196
- "dtstamp": "2023-02-10T01:00:00Z",
194
+ "start": "2025-02-10T01:00:00Z",
195
+ "end": "2025-02-10T03:00:00Z",
196
+ "dtstamp": "2025-02-10T01:00:00Z",
197
197
  "class": "",
198
198
  "priority": "",
199
199
  "transparency": "",
@@ -218,9 +218,9 @@
218
218
  "summary": "Parent-teacher Conferences",
219
219
  "description": "",
220
220
  "location": "",
221
- "start": "2023-03-22T21:30:00Z",
222
- "end": "2023-03-23T01:30:00Z",
223
- "dtstamp": "2023-03-22T21:30:00Z",
221
+ "start": "2025-03-22T21:30:00Z",
222
+ "end": "2025-03-23T01:30:00Z",
223
+ "dtstamp": "2025-03-22T21:30:00Z",
224
224
  "class": "",
225
225
  "priority": "",
226
226
  "transparency": "",
@@ -245,9 +245,9 @@
245
245
  "summary": "Parent-Teacher Conferences",
246
246
  "description": "",
247
247
  "location": "",
248
- "start": "2023-03-23T22:00:00Z",
249
- "end": "2023-03-24T01:00:00Z",
250
- "dtstamp": "2023-03-23T22:00:00Z",
248
+ "start": "2025-03-23T22:00:00Z",
249
+ "end": "2025-03-24T01:00:00Z",
250
+ "dtstamp": "2025-03-23T22:00:00Z",
251
251
  "class": "",
252
252
  "priority": "",
253
253
  "transparency": "",
@@ -272,9 +272,9 @@
272
272
  "summary": "No school",
273
273
  "description": "",
274
274
  "location": "",
275
- "start": "2023-03-24T06:00:00Z",
276
- "end": "2023-03-25T06:00:00Z",
277
- "dtstamp": "2023-03-24T06:00:00Z",
275
+ "start": "2025-03-24T06:00:00Z",
276
+ "end": "2025-03-25T06:00:00Z",
277
+ "dtstamp": "2025-03-24T06:00:00Z",
278
278
  "class": "",
279
279
  "priority": "",
280
280
  "transparency": "",
@@ -299,9 +299,9 @@
299
299
  "summary": "No school - Spring Break",
300
300
  "description": "",
301
301
  "location": "",
302
- "start": "2023-03-27T06:00:00Z",
303
- "end": "2023-03-28T06:00:00Z",
304
- "dtstamp": "2023-03-27T06:00:00Z",
302
+ "start": "2025-03-27T06:00:00Z",
303
+ "end": "2025-03-28T06:00:00Z",
304
+ "dtstamp": "2025-03-27T06:00:00Z",
305
305
  "class": "",
306
306
  "priority": "",
307
307
  "transparency": "",
@@ -326,9 +326,9 @@
326
326
  "summary": "No school - Spring Break",
327
327
  "description": "",
328
328
  "location": "",
329
- "start": "2023-03-28T06:00:00Z",
330
- "end": "2023-03-29T06:00:00Z",
331
- "dtstamp": "2023-03-28T06:00:00Z",
329
+ "start": "2025-03-28T06:00:00Z",
330
+ "end": "2025-03-29T06:00:00Z",
331
+ "dtstamp": "2025-03-28T06:00:00Z",
332
332
  "class": "",
333
333
  "priority": "",
334
334
  "transparency": "",
package/src/helpers/expandEvents.js CHANGED
@@ -18,6 +18,11 @@ export default function expandEvents(events) {
18
18
  const start = parse(event.start)
19
19
  const end = event.end ? parse(event.end) : start
20
20
 
21
+ // Normalize today's date to ignore time
22
+ const today = new Date()
23
+ today.setHours(0, 0, 0, 0)
24
+ console.log('Today:', today)
25
+
21
26
  const diffTime = Math.abs(end.getTime() - start.getTime())
22
27
  const diffHours = Math.ceil(diffTime / (1000 * 60 * 60))
23
28
  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
@@ -29,37 +34,49 @@ export default function expandEvents(events) {
29
34
  // Expand multi-day events
30
35
  for (let d = 0; d < diffDays; d++) {
31
36
  const newStart = addDays(start, d)
37
+ // Normalize newStart to ignore time
38
+ newStart.setHours(0, 0, 0, 0)
39
+ console.log('newStart:', newStart)
40
+
41
+ if (newStart >= today) {
42
+ a.push({
43
+ ...event,
44
+ start: newStart,
45
+ end: end,
46
+ originalStart: start,
47
+ allDay: start.getHours() === 0,
48
+ endTimeUndetermined,
49
+ multiDay,
50
+ weekday: format(newStart, 'dddd'),
51
+ day: format(newStart, 'DD'),
52
+ number: format(newStart, 'D'),
53
+ month: format(newStart, 'MMMM'),
54
+ year: format(newStart, 'YYYY'),
55
+ })
56
+ }
57
+ }
58
+ } else {
59
+ // Normalize start date for single-day events
60
+ const normalizedStart = new Date(start)
61
+ normalizedStart.setHours(0, 0, 0, 0)
62
+ console.log('normailizedStart:', normalizedStart)
63
+
64
+ if (normalizedStart >= today) {
32
65
  a.push({
33
66
  ...event,
34
- start: newStart,
67
+ start: start,
35
68
  end: end,
36
- originalStart: start,
37
- allDay: start.getHours() === 0,
69
+ originalStart: null,
70
+ allDay,
38
71
  endTimeUndetermined,
39
72
  multiDay,
40
- weekday: format(newStart, 'dddd'),
41
- day: format(newStart, 'DD'),
42
- number: format(newStart, 'D'),
43
- month: format(newStart, 'MMMM'),
44
- year: format(newStart, 'YYYY'),
73
+ weekday: format(start, 'dddd'),
74
+ day: format(start, 'DD'),
75
+ number: format(start, 'D'),
76
+ month: format(start, 'MMMM'),
77
+ year: format(start, 'YYYY'),
45
78
  })
46
79
  }
47
- } else {
48
- // Add single-day events
49
- a.push({
50
- ...event,
51
- start: start,
52
- end: end,
53
- originalStart: null,
54
- allDay,
55
- endTimeUndetermined,
56
- multiDay,
57
- weekday: format(start, 'dddd'),
58
- day: format(start, 'DD'),
59
- number: format(start, 'D'),
60
- month: format(start, 'MMMM'),
61
- year: format(start, 'YYYY'),
62
- })
63
80
  }
64
81
  return a
65
82
  }, [])