@asd20/ui 3.2.952 → 3.2.954

package/package.json

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

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

@@ -38,11 +38,16 @@
             v-for="(event, index) in day.events"
             :key="index"
             :event="event"
-            :class="day.events.length > 1 ? 'small-dot' : ''"
+            :class="
+              day.events.length === 2
+                ? 'small-dot'
+                : day.events.length > 2
+                ? 'smaller-dot'
+                : ''
+            "
             @click.native="onEventClick(event)"
           />
         </div>
-
       </li>
     </ol>
     <asd20-viewport
@@ -318,7 +323,7 @@ $accent: var(--color__accent);
       flex-direction:column;
       align-items: flex-start;
       background-color: var(--website-page__alternate-background-t70);
-      min-height: 2rem;
+      min-height: 2.5rem;
       outline: 1px solid var(--color__tertiary);
       border: none;
       box-shadow: none;
@@ -356,20 +361,24 @@ $accent: var(--color__accent);
     .asd20-calendar__events {
       position: static;
       display: flex;
-      flex-direction: row;
+      flex-direction: column;
       width: 100%;
-      justify-content: center;
+      justify-content: stretch;
+      max-height: 2rem;
 
       &::v-deep .asd20-calendar-event-button {
         background: transparent;
         padding: 0;
-        width: space(0.375);
-        height: space(0.375);
+        // width: space(0.375);
+        // height: space(0.375);
+        width: max-content;
+        height: max-content;
         // margin-right: space(0.0625);
         .title::before {
-          width: 10px;
-          height: 10px;
+          width: 4rem;
+          height: 2rem;
           margin: 0;
+          border-radius: 0;
 
         }
         .title span {
@@ -377,12 +386,20 @@ $accent: var(--color__accent);
         }
       }
       &::v-deep .small-dot {
-        width: space(0.3);
-        height: space(0.3);
-        .title::before {
-          width: 8px;
-          height: 8px;
-        }
+        width: 4rem;
+        height: 50%;
+        // .title::before {
+        //   width: 12px;
+        //   height: 30px;
+        // }
+      }
+      &::v-deep .smaller-dot {
+        width: 4rem;
+        height: 33%;
+        // .title::before {
+        //   width: 12px;
+        //   height: 30px;
+        // }
       }
     }
     .outside {

package/src/helpers/expandEvents.js

@@ -89,10 +89,28 @@ export default function expandEvents(events, includePastEvents = false) {
         ae =>
           ae.summary === e.summary &&
           ae.start.getTime() === e.start.getTime() &&
-          ae.end.getTime() === e.end.getTime()
+          ae.end.getTime() === e.end.getTime() &&
+          ae.calendarId === e.calendarId
       )
       if (!hasDuplicate) acc.push(e)
       return acc
     }, [])
-    .sort((a, b) => a.start.getTime() - b.start.getTime())
+    .sort((a, b) => {
+      const timeDiff = a.start.getTime() - b.start.getTime()
+      if (timeDiff !== 0) return timeDiff
+
+      const aSummary = (a.summary || '').toLowerCase()
+      const bSummary = (b.summary || '').toLowerCase()
+
+      const isAHighPriority =
+        aSummary.includes('plc') || aSummary.includes('parent')
+      const isBHighPriority =
+        bSummary.includes('plc') || bSummary.includes('parent')
+
+      if (isAHighPriority && !isBHighPriority) return -1
+      if (!isAHighPriority && isBHighPriority) return 1
+
+      // Fall back to alphabetical order if both have same priority
+      return aSummary.localeCompare(bSummary)
+    })
 }