@dcrackel/hematournamentui 1.0.694 → 1.0.696

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcrackel/hematournamentui",
   "private": false,
-  "version": "1.0.694",
+  "version": "1.0.696",
   "type": "module",
   "main": "dist/HemaTournamentUI-lib.umd.js",
   "module": "dist/HemaTournamentUI-lib.es.js",

package/src/mocks/tournamentMock.js

@@ -2,9 +2,9 @@ const mockTournaments = [
     {
         "TournamentId": 93,
         "Name": "CombatCon 2021",
-        "StartDate": "2021-07-22",
-        "EndDate": "2021-01-31",
-        "RegistrationCutOff": "2021-07-22",
+        "StartDate": "2026-07-01",
+        "EndDate": "2026-01-31",
+        "RegistrationCutOff": "2026-07-01",
         "Description": "<p>Combat Con 2021</p><p><br>Longsword </p>",
         "HostedOnM2": true,
         "Visibility": "Open",

package/src/stories/Molecules/Boxes/BoutBoxes/ScoreBox/ScoreBox.vue

@@ -18,7 +18,8 @@
           <BaseText :text="fencer1 ? bout.Person1.DisplayName : bout.Person2.DisplayName" size="xl" weight="bold"
                     color="primaryHighlight"/>
         </div>
-        <div class="text-quaternary text-sm pr-3 pt-0.5" @click="$emit('open-report')">
+        <div class="text-quaternary text-sm pr-3 pt-0.5 flex" @click="$emit('open-report')">
+          <i class="fa-solid fa-cards-blank pr-2" @click="openPenaltyModal"></i>
           <i class="fa-solid fa-chevron-right" @click="openPenaltyModal"></i>
         </div>
       </div>

package/src/stories/Molecules/Modals/DirectorModal/DirectorModal.vue

@@ -12,7 +12,8 @@
         <div class="flex w-full justify-end mt-1">
           <BaseIcon icon-name="fa-circle-xmark" size="lg" color="quaternary" hover="alarm" @click="close"/>
         </div>
-        <DirectorCard :eventRules="eventRules"
+        <DirectorCard :key="bout.BoutId"
+                      :eventRules="eventRules"
                       :bout="bout"
                       :hostingClubColors="hostingClubColors"
                       @penalty:add="handleUpdatePenalty"
@@ -33,6 +34,7 @@ import BaseIcon from "../../../Atoms/Icon/BaseIcon.vue";
 export default {
   name: "DirectorModal",
   components: {BaseIcon, DirectorCard},
+  emits: ['update:closeModal','update:bout','submit:bout','penalty:update','penalty:add','penalty:remove'],
   props: {
     show: {
       type: Boolean,

package/src/stories/Organisms/Cards/Director/DirectorCard.vue

@@ -81,6 +81,9 @@ export default {
     this.determineCountingDirection();
     this.emitBout()
   },
+  beforeUnmount() {
+    clearInterval(this.timerInterval);
+  },
   computed: {
     RingName() {
       return this.localBout.Pool?.RingName || 'Ring';
@@ -194,10 +197,12 @@ export default {
     updateHandShot1(value) {
       this.localBout.HandShot1 = value;
       if (this.localBout.HandShot2 === undefined) this.localBout.HandShot2 = 0;
+      this.emitBout();
     },
     updateHandShot2(value) {
       this.localBout.HandShot2 = value;
       if (this.localBout.HandShot1 === undefined) this.localBout.HandShot1 = 0;
+      this.emitBout();
     },
     updatePasses(currentPass) {
       this.localBout.CurrentPass = currentPass;
@@ -205,7 +210,7 @@ export default {
     },
     emitBout() {
       this.localBout.TimeLeft = this.timeLeft;
-      if (this.localBout.Started === null) this.localBout.Started = new Date().toISOString();
+      if (!this.localBout.Started) this.localBout.Started = new Date().toISOString();
 
       const isScoreReached = this.isCountingUp ? (this.localBout.Score1 === this.maxPoints || this.localBout.Score2 === this.maxPoints)
           : (this.localBout.Score1 === 0 || this.localBout.Score2 === 0);

package/src/stories/Organisms/Cards/PenaltyCard/PenaltyCard.vue

@@ -35,6 +35,23 @@
       </div>
     </div>
 
+    <!-- Quick phrases pills -->
+    <div class="mb-3">
+      <div class="flex flex-wrap gap-2">
+        <button
+            v-for="phrase in quickPhrases"
+            :key="phrase"
+            type="button"
+            class="rounded-full border px-3 py-1 text-sm shadow-sm bg-white
+             hover:bg-gray-50 active:scale-[0.98] transition
+             disabled:opacity-40 disabled:cursor-not-allowed"
+            @click="applyQuickPhrase(phrase)"
+        >
+          {{ phrase }}
+        </button>
+      </div>
+    </div>
+
     <!-- Notes Section -->
     <div class="mb-4">
       <textarea v-model="currentNote" class="w-full h-20 border rounded-md p-2" placeholder="Add a note..."/>
@@ -108,7 +125,14 @@ export default {
       noteToggle: false,
       medicalCount: 0,
       medicalToggle: false,
-      showConfirmModal: false
+      showConfirmModal: false,
+      quickPhrases: [
+        'Back of Head',
+        'Excessive force',
+        'Gear issue',
+        'Ignoring director',
+        'Unsafe fencing',
+      ],
     };
   },
   mounted() {
@@ -134,6 +158,9 @@ export default {
     },
   },
   methods: {
+    applyQuickPhrase(phrase) {
+      this.currentNote = this.currentNote + phrase;
+   },
     selectPastCard(card) {
       this.selectPenaltyId = card.PenaltyId;
       this.currentNote = card.Notes;

package/src/stories/Organisms/Form/AddDisplay/AddDisplay.vue

@@ -155,7 +155,17 @@ export default {
         { text: 'Ring 7', link: 'Ring 7' },
         { text: 'Ring 8', link: 'Ring 8' },
         { text: 'Ring 9', link: 'Ring 9' },
-        { text: 'Ring 10', link: 'Ring 10' }
+        { text: 'Ring 10', link: 'Ring 10' },
+        { text: 'Ring 11', link: 'Ring 11' },
+        { text: 'Ring 13', link: 'Ring 12' },
+        { text: 'Ring 14', link: 'Ring 13' },
+        { text: 'Ring 14', link: 'Ring 14' },
+        { text: 'Ring 15', link: 'Ring 15' },
+        { text: 'Ring 16', link: 'Ring 16' },
+        { text: 'Ring 17', link: 'Ring 17' },
+        { text: 'Ring 18', link: 'Ring 18' },
+        { text: 'Ring 19', link: 'Ring 19' },
+        { text: 'Ring 20', link: 'Ring 20' }
       ],
       flightBoardNames: [
         { text: 'FlightBoard 1', link: 'FlightBoard 1' },
@@ -165,7 +175,19 @@ export default {
         { text: 'FlightBoard 5', link: 'FlightBoard 5' },
         { text: 'FlightBoard 6', link: 'FlightBoard 6' },
         { text: 'FlightBoard 7', link: 'FlightBoard 7' },
-        { text: 'FlightBoard 8', link: 'FlightBoard 8' }
+        { text: 'FlightBoard 8', link: 'FlightBoard 8' },
+        { text: 'FlightBoard 9', link: 'FlightBoard 9' },
+        { text: 'FlightBoard 10', link: 'FlightBoard 10' },
+        { text: 'FlightBoard 11', link: 'FlightBoard 11' },
+        { text: 'FlightBoard 12', link: 'FlightBoard 12' },
+        { text: 'FlightBoard 13', link: 'FlightBoard 13' },
+        { text: 'FlightBoard 14', link: 'FlightBoard 14' },
+        { text: 'FlightBoard 15', link: 'FlightBoard 15' },
+        { text: 'FlightBoard 16', link: 'FlightBoard 16' },
+        { text: 'FlightBoard 17', link: 'FlightBoard 17' },
+        { text: 'FlightBoard 18', link: 'FlightBoard 18' },
+        { text: 'FlightBoard 19', link: 'FlightBoard 19' },
+        { text: 'FlightBoard 20', link: 'FlightBoard 20' },
       ]
     };
   },

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

@@ -181,8 +181,9 @@
       </div>
     </section>
 
-
-    <DirectorModal :bout="currentSelectedBout" :eventRules="eventRules" :hostingClubColors="hostingClubColors"
+    <DirectorModal :bout="currentSelectedBout"
+                   :eventRules="eventRules"
+                   :hostingClubColors="hostingClubColors"
                    :show="showDirectorModal"
                    @penalty:add="handleUpdatePenalty"
                    @penalty:update="handleAddPenalty"
@@ -432,18 +433,14 @@ export default {
       this.viewName = value;
     },
     handleUpdateBout(bout) {
-      if (!this.activeBouts || this.activeBouts.length === 0) {
-        return;
-      }
-
-      const updatedBout = this.activeBouts.find(b => b.BoutId === bout.BoutId);
+      if (!bout?.BoutId) return;
 
-      if (!updatedBout) {
-        return;
-      }
+      const updatedBout = this.localBouts.find(b => b.BoutId === bout.BoutId);
+      if (!updatedBout) return;
 
       Object.assign(updatedBout, bout);
-      updatedBout.Status = 'Active';
+      updatedBout.Status = 'Active'; // keep it active while directing
+
       this.$emit('update:bout', updatedBout);
     },
     handleEditBout(bout) {

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

@@ -167,9 +167,8 @@ export default {
           ? Math.max(1, (endDate - startDate) / (1000 * 60 * 60 * 24) + 1)
           : 1;
 
-      this.localTournament = {...this.tournament,
-        TotalDays,
-        WaiverScope: this.tournament.WaiverScope ?? "None",};
+      this.localTournament = {...this.tournament, TotalDays, WaiverScope: this.tournament.WaiverScope ?? "None",};
+      console.log(this.localTournament)
       this.setEndDate();
     },
     handleAddNewAddress(newAddress) {
@@ -220,10 +219,7 @@ export default {
     setEndDate() {
       if (!this.localTournament?.StartDate) return;
       const days = Math.max(1, Number(this.localTournament.TotalDays) || 1);
-      this.localTournament.EndDate = this.addDaysInclusiveYMD(
-          this.localTournament.StartDate,
-          days
-      );
+      this.localTournament.EndDate = this.addDaysInclusiveYMD(this.localTournament.StartDate, days);
     },
     handleCancel() {
       this.$emit('edit:cancel');
@@ -257,6 +253,7 @@ export default {
       this.transition('BACK');
     },
     handleSubmit() {
+      console.log(this.tournament)
       if (this.validateAllFields()) {
         this.saveButtonLabel = 'Saving...';
         setTimeout(() => {

package/src/stories/Templates/TournamentManagement/TournamentMangement.stories.js

@@ -30,7 +30,7 @@ export default {
 
 export const Default = {
     args: {
-        tournament: mockTournaments,
+        tournament: mockTournaments[0],
         locations: mockLocation,
         persons: mockPersons,
     },