@dcrackel/hematournamentui 1.0.696 → 1.0.698

package/src/stories/Templates/Assignment/Assignment.vue

@@ -53,12 +53,47 @@
 
 <script>
 import BaseButton from "../../Molecules/Buttons/BaseButton/BaseButton.vue";
-import BaseText from "../../Atoms/Text/BaseText.vue";
-import defaultImage from "../../../assets/default-tournament_old.png"
-import BaseIcon from "../../Atoms/Icon/BaseIcon.vue";
-
-export default {
+import BaseText from "../../Atoms/Text/BaseText.vue";
+import defaultImage from "../../../assets/default-tournament_old.png"
+import BaseIcon from "../../Atoms/Icon/BaseIcon.vue";
+
+const roleIcons = {
+  Director: 'fa-referee',
+  'List Table': 'fa-laptop',
+  'Line Judge': 'fa-flag-pennant'
+};
+
+const roleIconStyles = {
+  Director: 'fa-kit'
+};
+
+const daySuffixes = {
+  1: 'st',
+  2: 'nd',
+  3: 'rd'
+};
+
+const statusIcons = {
+  planning: 'fa-hourglass',
+  preparation: 'fa-hourglass-start',
+  live: 'fa-play',
+  results: 'fa-pause',
+  de: 'fa-circle-play',
+  completed: 'fa-trophy'
+};
+
+const statusIconClasses = {
+  planning: 'mt-1 pl-1',
+  preparation: 'mt-1 pl-1',
+  live: 'mt-1 pl-0',
+  results: 'mt-1 pl-1',
+  de: 'mt-1 pl-0',
+  completed: 'mt-0.5'
+};
+
+export default {
   name: "TournamentAssignments",
+  emits: ['forwardToEvent', 'refreshAssignments'],
   components: {BaseIcon, BaseText, BaseButton},
   props: {
     assignments: {
@@ -90,26 +125,12 @@ export default {
       const eventDate = new Date(`${date}T${time}`);
       const options = {weekday: 'long', hour: 'numeric', minute: '2-digit', hour12: true};
       return eventDate.toLocaleDateString('en-US', options);
-    },
-    getRoleIcon(event) {
-      switch (event.Role) {
-        case "Director":
-          return "fa-referee";
-        case "List Table":
-          return "fa-laptop";
-        case "Line Judge":
-          return "fa-flag-pennant";
-        default:
-          return "fa-circle-question";
-      }
-    },
-    getIconStyle(event) {
-      switch (event.Role) {
-        case "Director":
-          return "fa-kit";
-        default:
-          return "fa-solid";
-      }
+    },
+    getRoleIcon(event) {
+      return roleIcons[event.Role] || 'fa-circle-question';
+    },
+    getIconStyle(event) {
+      return roleIconStyles[event.Role] || 'fa-solid';
     },
     shouldShowButton(event) {
       const eventStatus = event.Status.toLowerCase();
@@ -135,51 +156,16 @@ export default {
 
       return `${formatDate(startDate, includeYear)} to ${formatDate(endDate, includeYear)}`;
     },
-    getDaySuffix(day) {
-      if (day > 3 && day < 21) return 'th'; // General rule
-      switch (day % 10) {
-        case 1: return 'st';
-        case 2: return 'nd';
-        case 3: return 'rd';
-        default: return 'th';
-      }
-    },
-    getStatusIcon(event) {
-      switch (event.Status) {
-        case "planning":
-          return "fa-hourglass";
-        case "preparation":
-          return "fa-hourglass-start";
-        case "live":
-          return "fa-play";
-        case "results":
-          return "fa-pause";
-        case "de":
-          return "fa-circle-play";
-        case "completed":
-          return "fa-trophy";
-        default:
-          return "fa-circle-question";
-      }
-    },
-    getIconClass(event) {
-      switch (event.Status) {
-        case "planning":
-          return "mt-1 pl-1";
-        case "preparation":
-          return "mt-1 pl-1";
-        case "live":
-          return "mt-1 pl-0";
-        case "results":
-          return "mt-1 pl-1";
-        case "de":
-          return "mt-1 pl-0";
-        case "completed":
-          return "mt-0.5";
-        default:
-          return "";
-      }
-    },
+    getDaySuffix(day) {
+      if (day > 3 && day < 21) return 'th'; // General rule
+      return daySuffixes[day % 10] || 'th';
+    },
+    getStatusIcon(event) {
+      return statusIcons[event.Status] || 'fa-circle-question';
+    },
+    getIconClass(event) {
+      return statusIconClasses[event.Status] || '';
+    },
     forwardToEvent(event) {
       this.$emit('forwardToEvent', event);
     },

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

@@ -81,6 +81,7 @@ import { tabs } from '../../../Util/tabs.js';
 import AssignDirectorModal from "../../../Molecules/Modals/AssignDirectorModal/AssignDirectorModal.vue";
 
 export default {
+  emits: ['penalty:add', 'penalty:remove', 'penalty:update', 'submit:bout', 'tab:menu-click', 'update:bout', 'update:directing-bout'],
   components: {
     AssignDirectorModal,
     ServerConnected,

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

@@ -21,6 +21,7 @@ import EditEventWizard from "../../../Organisms/Wizards/EditEventWizard/EditEven
 import { tabs } from '../../../Util/tabs.js';
 
 export default {
+  emits: ['tab:menu-click', 'update:submit'],
   components: {
     EditEventWizard,
     ToggleHeader,

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

@@ -78,10 +78,26 @@ import DropDownMenu from "../../../Organisms/ComplexInputs/DropDown/DropDownMenu
 import FindOrAddPerson from "../../../Organisms/ComplexInputs/FindOrAddPerson/FindOrAddPerson.vue";
 import AttendanceSummary from "../../../Organisms/Headers/AttendanceSummary/AttendanceSummary.vue";
 import FencerCardSkeleton from "../../../Organisms/Skeletons/FencerCard/FencerCardSkeleton.vue";
-import BaseModal from "../../../Molecules/Modals/BaseModal/BaseModal.vue";
-import { tabs } from '../../../Util/tabs.js';
-
-export default {
+import BaseModal from "../../../Molecules/Modals/BaseModal/BaseModal.vue";
+import { tabs } from '../../../Util/tabs.js';
+
+const personSorters = {
+  Seed: (a, b) => (a.Seed || 0) - (b.Seed || 0),
+  FullName: (a, b) => a.Person.DisplayName.localeCompare(b.Person.DisplayName),
+  HEMARating: (a, b) => {
+    const ratingA = a.Person.HEMARatings?.[0]?.Rating || 0;
+    const ratingB = b.Person.HEMARatings?.[0]?.Rating || 0;
+    return ratingB - ratingA;
+  },
+  M2Rating: (a, b) => {
+    const m2RatingA = a.Person.M2Ratings?.[0]?.Rating || 'U00';
+    const m2RatingB = b.Person.M2Ratings?.[0]?.Rating || 'U00';
+    return m2RatingA.localeCompare(m2RatingB);
+  }
+};
+
+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,
     AttendanceSummary,
@@ -164,28 +180,12 @@ export default {
           return 0;
         }
 
-        switch (this.localSelectedItem.link) {
-          case "Seed":
-            return (a.Seed || 0) - (b.Seed || 0);
-
-          case "FullName":
-            return a.Person.DisplayName.localeCompare(b.Person.DisplayName);
-
-          case "HEMARating":
-            const ratingA = a.Person.HEMARatings?.[0]?.Rating || 0; // Fix: Ensure safe access
-            const ratingB = b.Person.HEMARatings?.[0]?.Rating || 0;
-            return ratingB - ratingA; // Descending order (higher rating first)
-
-          case "M2Rating":
-            const m2RatingA = a.Person.M2Ratings?.[0]?.Rating || "U00"; // Fix: Handle missing data
-            const m2RatingB = b.Person.M2Ratings?.[0]?.Rating || "U00";
-            return m2RatingA.localeCompare(m2RatingB);
-
-          default:
-            console.warn("Unknown sorting key:", this.localSelectedItem.link);
-            return 0;
-        }
-      });
+        const sortPersons = personSorters[this.localSelectedItem.link];
+        if (sortPersons) return sortPersons(a, b);
+
+        console.warn("Unknown sorting key:", this.localSelectedItem.link);
+        return 0;
+      });
       return sortedArray;
     },
     absent() {

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

@@ -26,6 +26,7 @@ import { tabs } from '../../../Util/tabs.js';
 
 export default {
   name: 'EventFinalResult',
+  emits: ['export:HemaRatings', 'tab:menu-click'],
   components: {BaseText, EventFinalResultsHeader, FinalResultsTable, EditEventsTopMenu},
   props: {
     event: {

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

@@ -420,8 +420,6 @@ export default {
         const updatedBout = this.localBouts.find(b => b.BoutId === bout.BoutId);
         if (updatedBout) {
           updatedBout.Status = 'Scheduled';
-          updatedBout.Score1 = 0;
-          updatedBout.Score2 = 0;
         }
         this.$emit('update:bout', updatedBout);
       }

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

@@ -58,6 +58,7 @@ import { tabs } from '../../../Util/tabs.js';
 
 export default {
   name: 'PoolManagement',
+  emits: ['fencer:poolChanged', 'goLive:pool', 'remove:fencer', 'reset:pool', 'select:pool', 'start:pool', 'tab:menu-click', 'update:director', 'update:numberOfRings', 'update:poolSize', 'update:swapFencers'],
   components: {
     BaseText,
     BaseButton,
@@ -127,6 +128,7 @@ export default {
         return Array.from({ length: 2 }).map((_, index) => ({
           PoolId: `skeleton-${index}`,
           Name: 'Loading...',
+  emits: ['fencer:poolChanged', 'goLive:pool', 'remove:fencer', 'reset:pool', 'select:pool', 'start:pool', 'tab:menu-click', 'update:director', 'update:numberOfRings', 'update:poolSize', 'update:swapFencers'],
           RingName: 'Loading...',
           poolStrengthInd: 0,
           BoutsLeft: 0,

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

@@ -52,6 +52,7 @@ import { tabs } from '../../../Util/tabs.js';
 
 export default {
   name: 'PoolResults',
+  emits: ['tab:menu-click', 'update:moveFencerDESeedDown', 'update:moveFencerDESeedUp', 'update:withdraw'],
   components: {BaseModal, PoolResultsTable, PoolGrid, PoolResultsHeader, EditEventsTopMenu, PoolSummary},
   props: {
     event: {

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

@@ -60,6 +60,7 @@ import ToggleHeader from "../../../Organisms/Headers/ToggleHeader/ToggleHeader.v
 import { tabs } from '../../../Util/tabs.js';
 
 export default {
+  emits: ['add:existing-person', 'add:person', 'remove:staff', 'tab:menu-click', 'update:assignment'],
   components: {
     ToggleHeader,
     FindOrAddPerson,

package/src/stories/Templates/PersonManagement/Attendance/Attendance.vue

@@ -34,10 +34,26 @@
 </template>
 
 <script>
-import BaseText from "../../../Atoms/Text/BaseText.vue";
-import BaseIcon from "../../..//Atoms/Icon/BaseIcon.vue";
-
-export default {
+import BaseText from "../../../Atoms/Text/BaseText.vue";
+import BaseIcon from "../../..//Atoms/Icon/BaseIcon.vue";
+
+const weaponIcons = {
+  Longsword: 'fa-longsword',
+  'Military Saber': 'fa-saber',
+  'Rapier & Dagger': 'fa-rapier',
+  'Single Rapier': 'fa-rapier',
+  Messer: 'fa-messer',
+  'Sword & Buckler': 'fa-swordandbuckler',
+  Sidesword: 'fa-sidesword'
+};
+
+const daySuffixes = {
+  1: 'st',
+  2: 'nd',
+  3: 'rd'
+};
+
+export default {
   name: "Attendance",
   components: {BaseIcon, BaseText },
   props: {
@@ -53,26 +69,9 @@ export default {
   },
   computed: {
   },
-  methods: {
-    getWeaponIcon(weapon){
-      switch (weapon) {
-        case "Longsword":
-          return "fa-longsword";
-        case "Military Saber":
-          return "fa-saber";
-        case "Rapier & Dagger":
-          return "fa-rapier";
-        case "Single Rapier":
-          return "fa-rapier";
-        case "Messer":
-          return "fa-messer";
-        case "Sword & Buckler":
-          return "fa-swordandbuckler";
-        case "Sidesword":
-          return "fa-sidesword"
-        default:
-          return "fa-longsword";
-      }
+  methods: {
+    getWeaponIcon(weapon){
+      return weaponIcons[weapon] || 'fa-longsword';
     },
     formatEventDate(date, time) {
       const eventDate = new Date(`${date}T${time}`);
@@ -99,15 +98,10 @@ export default {
 
       return `${formatDate(startDate, includeYear)} to ${formatDate(endDate, includeYear)}`;
     },
-    getDaySuffix(day) {
-      if (day > 3 && day < 21) return 'th';
-      switch (day % 10) {
-        case 1: return 'st';
-        case 2: return 'nd';
-        case 3: return 'rd';
-        default: return 'th';
-      }
-    },
+    getDaySuffix(day) {
+      if (day > 3 && day < 21) return 'th';
+      return daySuffixes[day % 10] || 'th';
+    },
   }
 };
 </script>

package/src/stories/Templates/TournamentManagement/TournamentManagement.vue

@@ -21,6 +21,7 @@
                        :tournament="localTournament"
                        :isNewTournament="isNewTournament"
                        @update:tournament="updateTournament"
+                       @go:results-import="handleTab('ResultsImport')"
     />
 
     <div v-if="isNewTournament" class="flex flex-row justify-center h-12 mt-4">

package/src/stories/Templates/TournamentManagement/TournamentPageTwo/TouranmentPageTwo.vue

@@ -33,7 +33,7 @@
                 size="sm"
                 type="square"
                 :selected="!!tournament.HostedOnM2"
-                @buttonClick="emitUpdate('HostedOnM2', true)"
+                @buttonClick="handleHostedChoice(true)"
             />
             <BaseButton
                 class="w-1/2 ml-1"
@@ -42,11 +42,75 @@
                 size="sm"
                 type="square"
                 :selected="!tournament.HostedOnM2"
-                @buttonClick="emitUpdate('HostedOnM2', false)"
+                @buttonClick="handleHostedChoice(false)"
             />
           </div>
         </section>
 
+        <!-- Results Import (only when NOT hosted) -->
+        <div v-if="!tournament.HostedOnM2" class="flex flex-col pb-4 mt-10">
+          <BaseText
+              :color="'primaryHighlight'"
+              :size="'xl'"
+              :text="'Publish final results on MeyerSquared?'"
+              :weight="'normal'"
+              class="mb-2 border-b border-dropdownSelect"
+              data-testid="text-results-publish"
+          />
+          <BaseText
+              :color="'quaternary'"
+              :size="'sm'"
+              :text="resultsDescription"
+              :weight="'normal'"
+              data-testid="text-results-description"
+          />
+
+          <section class="flex w-full justify-center mt-6">
+            <div class="flex flex-row justify-center w-3/4">
+              <BaseButton
+                  class="w-1/2 mr-1"
+                  color="neutral"
+                  label="Not now"
+                  size="sm"
+                  type="square"
+                  :selected="!tournament.ResultsEnabled"
+                  @buttonClick="emitUpdate('ResultsEnabled', false)"
+              />
+              <BaseButton
+                  class="w-1/2 ml-1"
+                  color="neutral"
+                  label="Yes, I’ll upload results"
+                  size="sm"
+                  type="square"
+                  :selected="!!tournament.ResultsEnabled"
+                  @buttonClick="emitUpdate('ResultsEnabled', true)"
+              />
+            </div>
+          </section>
+
+          <div v-if="tournament.ResultsEnabled" class="w-full flex flex-col items-center mt-6">
+            <BaseText
+                :color="'quaternary'"
+                :size="'sm'"
+                :text="'You can upload results any time from the tournament edit page (Results Import tab).'"
+                :weight="'normal'"
+                class="text-center mb-3"
+                data-testid="text-results-anytime"
+            />
+
+            <!-- This does not navigate by itself; it just emits an intent.
+                 Parent can switch to a "Results Import" tab/screen. -->
+            <BaseButton
+                class="w-3/4"
+                color="neutral"
+                label="Go to Results Import"
+                size="sm"
+                type="primary"
+                @buttonClick="$emit('go:results-import')"
+            />
+          </div>
+        </div>
+
         <!-- Visibility (only when hosted) -->
         <div v-if="tournament.HostedOnM2" class="flex flex-col pb-4 mt-10">
           <BaseText
@@ -158,6 +222,7 @@ import BaseRadioGroup from "../../../Atoms/RadioGroup/BaseRadioGroup.vue";
 export default {
   name: 'TournamentPageTwo',
   components: { BaseRadioGroup, BaseInput, BaseButton, BaseText },
+  emits: ['update:tournament', 'go:results-import'],
   props: {
     tournament: { type: Object, required: true },
     isNewTournament: { type: Boolean, default: true }
@@ -182,14 +247,25 @@ export default {
   },
   computed: {
     hostingDescription() {
-      return `If you select 'No', your tournament will be featured on our main calendar with a direct link to your tournament's webpage.\n\n`
-          + `By selecting 'Yes', you'll gain access to our comprehensive MeyerSquared platform, allowing you to manage and conduct your tournament directly.`;
+      return `If you select 'No', your tournament will be featured on our main calendar and you can link out to your registration page.\n\n`
+          + `You can also publish final results on MeyerSquared later (any time) to support ratings and historical records.\n\n`
+          + `By selecting 'Yes', you'll gain access to the full MeyerSquared platform to run pools, brackets, and live scoring.`;
+    },
+    resultsDescription() {
+      return `Choose 'Yes' if you want MeyerSquared to display final placements for your events.\n\n`
+          + `You can upload results now, or come back after the tournament and upload them later.`;
     }
   },
   methods: {
     emitUpdate(field, value) {
       this.$emit('update:tournament', { [field]: value });
     },
+    handleHostedChoice(isHosted) {
+      this.emitUpdate('HostedOnM2', isHosted);
+
+      // If they switch to Hosted, results import doesn't apply. Clear it to avoid confusion.
+      if (isHosted) this.emitUpdate('ResultsEnabled', false);
+    }
   }
 };
 </script>

package/src/stories/Util/tabs.js

@@ -80,5 +80,6 @@ export const tournamentTabs = () => {
         {id: 'Basic', label: 'Basic', color: 'primaryHighlight', icon: 'fa-info-circle'},
         {id: 'Hosting', label: 'Hosting', color: 'primaryHighlight', icon: 'fa-globe-pointer'},
         {id: 'Events', label: 'Events', color: 'primaryHighlight', icon: 'fa-swords'},
+        {id: 'ResultsImport', label: 'Results', color: 'primaryHighlight', icon: 'fa-swords'},
     ]
 }

package/tailwind/tailwind.css

@@ -1,9 +1,8 @@
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
-@import '@fontsource/inter/200.css';
-@import '@fontsource/inter/400.css';
-@import '@fontsource/inter/500.css';
+@config '../tailwind.config.js';
+@import 'tailwindcss';
+@import '@fontsource/inter/200.css';
+@import '@fontsource/inter/400.css';
+@import '@fontsource/inter/500.css';
 @import '@fontsource/inter/600.css';
 @import '@fontsource/inter/700.css';
 @import '@fontsource/roboto-mono/index.css';