@dcrackel/hematournamentui 1.0.701 → 1.0.702

package/src/stories/Templates/EventManagement/EventAttendance/EventAttendance.vue

@@ -1,7 +1,13 @@
 <template>
   <section>
     <EditEventsTopMenu :currentTab="'Checkin'" :tabs="tabs(role, isMobile)" @tabMenuClick="handleTabMenuClick"/>
-    <AttendanceSummary :event="event"  :absent="absent" :present="present"/>
+    <AttendanceSummary
+        :event="event"
+        :absent="absent"
+        :present="present"
+        :activeCount="activeRosterCount"
+        :waitlistCount="waitlistCount"
+        :capacity="eventCapacity"/>
     <div class="w-full flex flex-row justify-center mt-1 md:mt-3">
       <section class="w-full">
         <div class="w-full flex flex-col justify-center items-center" style="text-align: center">
@@ -30,20 +36,38 @@
             </div>
           </section>
           <section v-if="!loading" class="w-full">
-            <div v-for="(person, index) in sortedPersons" :key="person.PersonId || person.Person?.PersonId || index">
+            <div v-if="activeRosterCount > 0" class="mb-2 flex items-center justify-between">
+              <BaseText text="Active Roster" size="md" color="quaternary" weight="bold"/>
+              <BaseText :text="activeRosterSummary" size="sm" color="quinary"/>
+            </div>
+            <div v-for="(person, index) in sortedActivePersons" :key="person.PersonId || person.Person?.PersonId || index">
             <FencerCard :person="person" class="mb-4"
-                        :isLast="index === sortedPersons.length - 1"
+                        :isLast="index === sortedActivePersons.length - 1"
                         :isEdit="event.Status === 'planning' || event.Status === 'preparation'"
-                        @forward:toProfile="handleForwardToProfile"
-                        @update:status="handleStatus"
+                        @forward:toProfile="handleForwardToProfile"
+                        @update:status="handleStatus"
                         @remove:fencer="handleRemoveFencer"
                         @update:moveUp="handleMoveUp"
                         @update:moveDown="handleMoveDown"
                         @request:weaver-sign="openWeaverModal"
             />
             </div>
+            <section v-if="waitlistCount > 0" class="mt-6 w-full">
+              <div class="mb-2 flex items-center justify-between">
+                <BaseText text="Waitlist" size="md" color="quaternary" weight="bold"/>
+                <BaseText :text="waitlistSummary" size="sm" color="quinary"/>
+              </div>
+              <div v-for="(person, index) in sortedWaitlistedPersons" :key="person.PersonId || person.Person?.PersonId || index" class="mb-3">
+                <WaitlistFencerCard
+                    :person="person"
+                    :queuePosition="index + 1"
+                    @forward:toProfile="handleForwardToProfile"
+                    @move:active="handleMoveWaitlistToActive"
+                    @remove:fencer="handleRemoveWaitlistFencer"/>
+              </div>
+            </section>
           </section>
-          <div v-if="!loading && personsInTournament.length === 0" class="mb-10">
+          <div v-if="!loading && personsInTournament.length === 0" class="mb-10">
             <div class="flex items-center border border-dropdownSelect rounded-lg shadow-lg bg-poolBox">
               <BaseText text="Remember to assign staff to your event!" size="lg" color="quaternary" weight="bold" class="w-full text-center py-2 px-8"/>
             </div>
@@ -74,7 +98,8 @@
 <script>
 import BaseText from "../../../Atoms/Text/BaseText.vue";
 import emptyDesertIcon from '../../../../assets/empty_desert_icon.png';
-import FencerCard from "../../../Organisms/Cards/FencerCard/FencerCard.vue";
+import FencerCard from "../../../Organisms/Cards/FencerCard/FencerCard.vue";
+import WaitlistFencerCard from "../../../Organisms/Cards/WaitlistFencerCard/WaitlistFencerCard.vue";
 import EditEventsTopMenu from "../../Menus/EditEventsTopMenu/EditEventsTopMenu.vue";
 import DropDownMenu from "../../../Organisms/ComplexInputs/DropDown/DropDownMenu.vue";
 import FindOrAddPerson from "../../../Organisms/ComplexInputs/FindOrAddPerson/FindOrAddPerson.vue";
@@ -98,10 +123,27 @@ const personSorters = {
   }
 };
 
+const waitlistStatuses = new Set(['waitlist', 'waitlisted', 'waitinglist']);
+
+const normalizeStatus = (status) => String(status || '').toLocaleLowerCase().replace(/[\s_-]/g, '');
+
+const isWaitlistedPerson = (person) => waitlistStatuses.has(normalizeStatus(person?.Status));
+
+const getEventRuleValue = (event, ruleName) => {
+  const rule = event?.EventRules?.find(eventRule => eventRule?.Rules?.RuleName === ruleName);
+  return rule?.RuleValue;
+};
+
+const getWaitlistOrderValue = (person) => {
+  const order = person?.WaitlistPosition ?? person?.WaitlistOrder ?? person?.CreatedAt ?? person?.Seed ?? person?.PoolPosition ?? 0;
+  return Number.isNaN(Number(order)) ? order : Number(order);
+};
+
 export default {
-  emits: ['add:existing-person', 'add:person', 'forward:toProfile', 'remove:fencer', 'tab:menu-click', 'update:moveDown', 'update:moveUp', 'update:person', 'weaver:sign'],
-  components: {
-    FencerCardSkeleton,
+  emits: ['add:existing-person', 'add:person', 'forward:toProfile', 'move:waitlist-to-active', 'remove:fencer', 'remove:waitlist-fencer', 'tab:menu-click', 'update:moveDown', 'update:moveUp', 'update:person', 'weaver:sign'],
+  components: {
+    WaitlistFencerCard,
+    FencerCardSkeleton,
     AttendanceSummary,
     FindOrAddPerson,
     DropDownMenu,
@@ -166,15 +208,28 @@ export default {
     isMobile() {
       return this.windowWidth <= 748;
     },
-    sortedPersons() {
-      if (!Array.isArray(this.personsInTournament) || this.personsInTournament.length === 0) {
-        console.warn("personsInTournament is empty or not an array");
-        return [];
-      }
-
-      let sortedArray = [...this.personsInTournament]; // Clone array to prevent modifying props
-
-      sortedArray.sort((a, b) => {
+    activePersons() {
+      if (!Array.isArray(this.personsInTournament) || this.personsInTournament.length === 0) {
+        return [];
+      }
+
+      return this.personsInTournament.filter(person => !isWaitlistedPerson(person));
+    },
+    waitlistedPersons() {
+      if (!Array.isArray(this.personsInTournament) || this.personsInTournament.length === 0) {
+        return [];
+      }
+
+      return this.personsInTournament.filter(isWaitlistedPerson);
+    },
+    sortedActivePersons() {
+      if (this.activePersons.length === 0) {
+        return [];
+      }
+
+      let sortedArray = [...this.activePersons]; // Clone array to prevent modifying props
+
+      sortedArray.sort((a, b) => {
         if (!a || !b || !a.Person || !b.Person) {
           console.warn("Undefined person object detected:", a, b);
           return 0;
@@ -186,14 +241,50 @@ export default {
         console.warn("Unknown sorting key:", this.localSelectedItem.link);
         return 0;
       });
-      return sortedArray;
-    },
-    absent() {
-      return this.personsInTournament.filter(person => person.Status === 'Absent').length;
-    },
-    present() {
-      return this.personsInTournament.filter(person => person.Status === 'Present').length;
-    },
+      return sortedArray;
+    },
+    sortedWaitlistedPersons() {
+      return [...this.waitlistedPersons].sort((a, b) => {
+        const orderA = getWaitlistOrderValue(a);
+        const orderB = getWaitlistOrderValue(b);
+
+        if (typeof orderA === 'number' && typeof orderB === 'number') {
+          return orderA - orderB;
+        }
+
+        return String(orderA).localeCompare(String(orderB));
+      });
+    },
+    activeRosterCount() {
+      return this.activePersons.length;
+    },
+    waitlistCount() {
+      return this.waitlistedPersons.length;
+    },
+    eventCapacity() {
+      const capacity = this.event?.CutOffNumber ?? this.event?.MaxFencers ?? getEventRuleValue(this.event, 'CutOffNumber');
+      if (capacity === 0 || capacity === '0') {
+        return 'Unlimited';
+      }
+
+      return capacity || '';
+    },
+    activeRosterSummary() {
+      if (!this.eventCapacity) {
+        return `${this.activeRosterCount} active`;
+      }
+
+      return `${this.activeRosterCount} / ${this.eventCapacity}`;
+    },
+    waitlistSummary() {
+      return `${this.waitlistCount} waiting`;
+    },
+    absent() {
+      return this.activePersons.filter(person => person.Status === 'Absent').length;
+    },
+    present() {
+      return this.activePersons.filter(person => person.Status === 'Present').length;
+    },
   },
   methods: {
     openWeaverModal(person) {
@@ -226,6 +317,12 @@ export default {
     handleRemoveFencer(value) {
       this.$emit('remove:fencer', value);
     },
+    handleMoveWaitlistToActive(person) {
+      this.$emit('move:waitlist-to-active', person);
+    },
+    handleRemoveWaitlistFencer(person) {
+      this.$emit('remove:waitlist-fencer', person);
+    },
     handleMoveUp(person){
       this.$emit('update:moveUp', person);
     },

package/src/stories/Templates/EventManagement/KioskDisplay/KioskDisplay.vue

@@ -5,9 +5,10 @@
         :displays="localDisplays"
         :eventDropDown="eventDropDown"
         :staffDropDown="staffDropDown"
-        :userRole="role"
-        @remove:kiosk="handleRemove"
-        @update:ringChange="handleRingChange"
+        :userRole="role"
+        @remove:kiosk="handleRemove"
+        @test:scoreboard="handleScoreboardTest"
+        @update:ringChange="handleRingChange"
         @update:selectedStaff="handleAssignmentStaff"
         @update:selectedEvent="handleAssignmentEvent"
         @update:selectedType="handleSelectedType"
@@ -30,7 +31,7 @@ export default {
     EditEventsTopMenu
 
   },
-  emits: ['remove:kiosk', 'update:selectedStaff', 'update:selectedEvent', 'update:selectedType', 'update:ringChange', 'submit:kiosk', 'update:assignToMe','tab:menu-click'],
+  emits: ['remove:kiosk', 'test:scoreboard', 'update:selectedStaff', 'update:selectedEvent', 'update:selectedType', 'update:ringChange', 'submit:kiosk', 'update:assignToMe','tab:menu-click'],
   props: {
     displays: {
       type: Array,
@@ -75,8 +76,11 @@ export default {
       return this.windowWidth <= 748;
     },
   },
-  methods: {
-    handleTabMenuClick(value) {
+  methods: {
+    handleScoreboardTest(display) {
+      this.$emit('test:scoreboard', display);
+    },
+    handleTabMenuClick(value) {
       this.$emit('tab:menu-click', value);
     },
     handleRingChange(item){