@dcrackel/hematournamentui 1.0.509 → 1.0.511

package/package.json

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

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

@@ -11,22 +11,24 @@
     >
       <div class="w-full rounded-t-xl flex flex-row justify-between pt-2">
         <div class="absolute left-0 flex ml-2">
-          <BaseIcon v-for="index in countYellowCards" icon-name="fa-circle-small" size="md" color="gold" class="mr-1" />
-          <BaseIcon v-for=" index in countRedCards" icon-name="fa-circle-small" size="md" color="red" class="mr-1" />
+          <BaseIcon v-for="index in countYellowCards" icon-name="fa-circle-small" size="md" color="gold" class="mr-1"/>
+          <BaseIcon v-for=" index in countRedCards" icon-name="fa-circle-small" size="md" color="red" class="mr-1"/>
         </div>
         <div class="w-full text-center">
-          <BaseText :text="fencer1 ? bout.Person1.DisplayName : bout.Person2.DisplayName" size="xl" weight="bold" color="primaryHighlight"/>
+          <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')">
           <i class="fa-solid fa-chevron-right" @click="openPenaltyModal"></i>
         </div>
       </div>
       <div class="flex flex-row w-full justify-center">
-          <BaseText :text="lastNote" size="sm" color="primaryHighlight"/>
+        <BaseText :text="lastNote" size="sm" color="primaryHighlight"/>
       </div>
       <div class="w-full flex flex-row justify-around text-center px-4 pt-2">
         <div class="pt-1 w-1/4" @click="minus">
-          <BaseIcon :icon-name="isCountingUp ? 'fa-square-minus' : 'fa-square-plus'" size="5xl" :color="computedColor" hover="quaternary" :disabled="baseScore <= 0"/>
+          <BaseIcon :icon-name="isCountingUp ? 'fa-square-minus' : 'fa-square-plus'" size="5xl" :color="computedColor"
+                    hover="quaternary" :disabled="baseScore <= 0"/>
         </div>
         <div class="flex flex-row w-1/2 justify-center">
           <div class="text-5xl text-bluegray font-bold">
@@ -34,7 +36,8 @@
           </div>
         </div>
         <div class="pt-1 w-1/4" @click="plus">
-          <BaseIcon :icon-name="isCountingUp ? 'fa-square-plus' : 'fa-square-minus'" size="5xl" :color="computedColor" hover="quaternary" :disabled="baseScore >= maxScore"/>
+          <BaseIcon :icon-name="isCountingUp ? 'fa-square-plus' : 'fa-square-minus'" size="5xl" :color="computedColor"
+                    hover="quaternary" :disabled="baseScore >= maxScore"/>
         </div>
       </div>
       <div class="w-full flex flex-col justify-around text-center px-4 pb-6">
@@ -42,7 +45,8 @@
           <BaseText :text="fencer1 ? bout.Person1.Club.Name : bout.Person2.Club.Name" size="md" color="quinary"/>
         </div>
       </div>
-      <HandshotCounterBox v-if="showHandShotCounterBox" :handShotValue="getHandShotValue" :fencer1="fencer1" :hostingClubColors="hostingClubColors" @update:HandShotValue="emitHandShotValue"/>
+      <HandshotCounterBox v-if="showHandShotCounterBox" :handShotValue="getHandShotValue" :fencer1="fencer1"
+                          :hostingClubColors="hostingClubColors" @update:HandShotValue="emitHandShotValue"/>
     </div>
   </section>
 </template>
@@ -86,7 +90,7 @@ export default {
       type: Boolean,
       default: true
     },
-    showHandShotCounterBox:{
+    showHandShotCounterBox: {
       type: Boolean,
       default: false
     }
@@ -98,8 +102,11 @@ export default {
   },
   computed: {
     lastNote() {
-      const person = this.fencer1 ? this.bout.Person1 : this.bout.Person2;
-      return person.EventPersons[0].LastNote ?? '';
+      const eventPersons = this.fencer1 ? this.bout.Person1?.EventPersons : this.bout.Person2?.EventPersons;
+      if (eventPersons && eventPersons.length > 0) {
+        return eventPersons[0].LastNote ?? "";
+      }
+      return "";
     },
     currentScore() {
       if (!this.isCountingUp) {
@@ -112,12 +119,18 @@ export default {
       return this.fencer1 ? this.hostingClubColors.Color1.toLowerCase() : this.hostingClubColors.Color2.toLowerCase();
     },
     countYellowCards() {
-      return  this.fencer1 ? this.bout.Person1.Penalties.filter(penalty => penalty.PenaltyType === 'Yellow' && penalty.BoutId === this.bout.BoutId).length
-                           : this.bout.Person2.Penalties.filter(penalty => penalty.PenaltyType === 'Yellow' && penalty.BoutId === this.bout.BoutId).length;
+      const penalties = this.fencer1 ? this.bout.Person1.Penalties : this.bout.Person2.Penalties;
+      if (!penalties) {
+        return 0;
+      }
+      return penalties.filter((t3) => t3.PenaltyType === "Yellow" && t3.BoutId === this.bout.BoutId).length;
     },
-    countRedCards(){
-      return  this.fencer1 ? this.bout.Person1.Penalties.filter(penalty => penalty.PenaltyType === 'Red' && penalty.BoutId === this.bout.BoutId).length
-                           : this.bout.Person2.Penalties.filter(penalty => penalty.PenaltyType === 'Red' && penalty.BoutId === this.bout.BoutId).length;
+    countRedCards() {
+      const penalties = this.fencer1 ? this.bout.Person1.Penalties : this.bout.Person2.Penalties;
+      if (!penalties) {
+        return 0;
+      }
+      return penalties.filter((t3) => t3.PenaltyType === "Red" && t3.BoutId === this.bout.BoutId).length;
     },
     getHandShotValue() {
       const personId = this.fencer1 ? this.bout.Person1Id : this.bout.Person2Id;

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

@@ -194,11 +194,11 @@ export default {
       if (fencer1) {
         this.localBout.Person1.EventPersons[0].LastNote = updatedPenalty.Notes;
         updatedPenalty.PersonId = this.localBout.Person1Id;
-        this.localBout.Person1.Penalties.push(updatedPenalty);
+        //this.localBout.Person1.Penalties.push(updatedPenalty);
       } else {
         this.localBout.Person2.EventPersons[0].LastNote = updatedPenalty.Notes;
         updatedPenalty.PersonId = this.localBout.Person2Id;
-        this.localBout.Person2.Penalties.push(updatedPenalty);
+        //this.localBout.Person2.Penalties.push(updatedPenalty);
       }
 
       return updatedPenalty;

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

@@ -40,14 +40,14 @@
       <textarea v-model="currentNote" class="w-full h-20 border rounded-md p-2" placeholder="Add a note..."/>
       <div class="w-full flex justify-between">
         <BaseButton type="primary" label="Clear" size="sm" @buttonClick="clearPenalty()" />
-        <BaseButton v-if="toggled" type="primary" label="Save Note" size="sm" @buttonClick="handlePenalty()" />
+        <BaseButton v-if="toggled" type="primary" label="Save Penalty" size="sm" @buttonClick="handlePenalty()" />
         <BaseText v-if="!toggled"  text="Save Penalty" color="quinary" size="sm" class="bg-poolSetup border p-2 rounded-lg ml-1 resize-none focus:ring-primary focus:border-primary" />
       </div>
     </div>
 
-    <!-- Past Notes Section -->
+    <!-- Past cards Section -->
     <div>
-      <BaseText v-if="pastCards.length" text="Past Notes" type="h3" size="lg" color="primary" weight="bold" class="mb-2 "/>
+      <BaseText v-if="pastCards.length" text="Past Cards in this Event" type="h3" size="lg" color="primary" weight="bold" class="mb-2 "/>
       <div v-for="card in pastCards" :key="card.PenaltyId" class="flex items-center justify-between bg-neutral mb-2 border shadow-md p-2 rounded-lg">
         <BaseIcon :iconName="getFlagIcon(card.PenaltyType)" :color="getFlagColor(card.PenaltyType)"/>
         <div class="flex-grow ml-4 text-sm"  @click="selectPastCard(card)">
@@ -134,13 +134,13 @@ export default {
     },
     countCards() {
       if (this.fencer1) {
-        this.yellowCardCount = this.bout.Person1.Penalties.filter(c => c.PenaltyType === 'Yellow').length;
-        this.redCardCount = this.bout.Person1.Penalties.filter(c => c.PenaltyType === 'Red').length;
+        this.yellowCardCount = this.bout.Person1.Penalties.filter(c => c.PenaltyType === 'Yellow' && c.BoutId === this.bout.BoutId).length;
+        this.redCardCount = this.bout.Person1.Penalties.filter(c => c.PenaltyType === 'Red' && c.BoutId === this.bout.BoutId).length;
       }
 
       if (!this.fencer1) {
-        this.yellowCardCount = this.bout.Person2.Penalties.filter(c => c.PenaltyType === 'Yellow').length;
-        this.redCardCount = this.bout.Person2.Penalties.filter(c => c.PenaltyType === 'Red').length;
+        this.yellowCardCount = this.bout.Person2.Penalties.filter(c => c.PenaltyType === 'Yellow' && c.BoutId === this.bout.BoutId).length;
+        this.redCardCount = this.bout.Person2.Penalties.filter(c => c.PenaltyType === 'Red' && c.BoutId === this.bout.BoutId).length;
       }
     },
     toggleAllOff(){
@@ -214,6 +214,7 @@ export default {
         this.bout.Person2.Penalties.push(newPenalty);
       }
 
+      this.countCards();
       this.$emit('penalty:add', newPenalty);
       this.currentNote = '';
     },
@@ -228,6 +229,7 @@ export default {
         this.$emit('penalty:update', penalties[existingPenaltyIndex]);
       }
 
+      this.countCards();
       this.selectPenaltyId = null;
       this.currentNote = '';
     },
@@ -256,6 +258,8 @@ export default {
             person.EventPersons[0].LastNote = '';
           }
         }
+
+        this.countCards();
       }
     },
     getFlagIcon(flag) {