@dcrackel/hematournamentui 1.0.607 → 1.0.609

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

@@ -90,6 +90,10 @@ export default {
       type: Boolean,
       default: true
     },
+    penaltiesReset: {
+      type: Boolean,
+      default: false
+    },
     showHandShotCounterBox: {
       type: Boolean,
       default: false
@@ -123,6 +127,11 @@ export default {
       if (!penalties) {
         return 0;
       }
+      console.log(this.penaltiesReset);
+      console.log(penalties);
+      if (this.penaltiesReset) {
+        return penalties.filter((t3) => t3.PenaltyType === "Yellow").length;
+      }
       return penalties.filter((t3) => t3.PenaltyType === "Yellow" && t3.BoutId === this.bout.BoutId).length;
     },
     countRedCards() {
@@ -130,6 +139,9 @@ export default {
       if (!penalties) {
         return 0;
       }
+      if (this.penaltiesReset) {
+        return penalties.filter((t3) => t3.PenaltyType === "Red").length;
+      }
       return penalties.filter((t3) => t3.PenaltyType === "Red" && t3.BoutId === this.bout.BoutId).length;
     },
     getHandShotValue() {

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

@@ -6,11 +6,11 @@
               :maxScore="parseInt(maxPoints)"
               :isCountingUp="isCountingUp"
               :showHandShotCounterBox="showHandShotCounterBox"
+              :penaltiesReset="penaltiesReset"
               @penalty:open="openPenaltyModal"
               @update:Score="updateScore1"
               @update:HandShotValue="updateHandShot1"
     />
-
     <TimerBox v-if="showTimerBox"
               :timeLeft="timeLeft"
               :running="timerRunning"
@@ -20,13 +20,13 @@
 
     <PassesBox v-if="showPassesBox" :bout="localBout" :maxPasses="parseInt(maxPasses)" @update:passes="updatePasses" />
     <PenaltyConfirmationBox v-if="showPenaltyConfirmationBox" />
-
     <ScoreBox :fencer1="false"
               :bout="localBout"
               :hostingClubColors="hostingClubColors"
               :maxScore="parseInt(maxPoints)"
               :isCountingUp="isCountingUp"
               :showHandShotCounterBox="showHandShotCounterBox"
+              :penaltiesReset="penaltiesReset"
               @penalty:open="openPenaltyModal"
               @update:Score="updateScore2"
               @update:HandShotValue="updateHandShot2"
@@ -103,6 +103,10 @@ export default {
       return Array.isArray(this.eventRules) &&
           this.eventRules.some((n2) => n2.Rules.RuleName === "CountHandshots" && n2.RuleValue === "true");
     },
+    penaltiesReset() {
+      return Array.isArray(this.eventRules) &&
+          this.eventRules.some((n2) => n2.Rules.RuleName === "PenaltiesReset" && n2.RuleValue === "true");
+    },
     maxPoints() {
       if (this.localBout.DEBoutId) {
         const e = Array.isArray(this.eventRules) ? this.eventRules.find((t) => t.Rules.RuleName === "DEMaxPoints") : null;

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

@@ -18,7 +18,7 @@
       <img v-if="portraitURL" :src="portraitURL" alt="Portrait" class="w-14 h-14 rounded-xl">
     </div>
 
-    <div class="flex flex-col w-1/2 md:w-4/12 justify-star">
+    <div class="flex flex-col w-3/4 md:w-4/12 justify-start">
       <span class="flex justify-start overflow-hidden">
         <BaseText :text="person.Person.DisplayName" size="md" color="quaternary" weight="bold" class="text-sm md:text-xl"/>
       </span>
@@ -39,7 +39,7 @@
       </div>
     </div>
 
-    <div class="hidden md:grid grid-col ls-2 gap-x-4 mr-10">
+    <div class="hidden md:grid grid-col ls-2 gap-x-4 mr-4 w-36">
       <div class="flex">
         <BaseText text="M2Rating:" size="sm" color="quaternary" weight="normal" class="mr-2" />
         <BaseText :text="M2Rating" size="sm" color="quinary" weight="bold" class="pt-0.5"/>
@@ -50,10 +50,11 @@
       </div>
     </div>
 
-    <div class="mr-2 md:mr-4 md:ml-auto">
+    <div class="mr-2 md:mr-4 md:ml-auto flex flex-row">
+      <BaseButton label="Edit" size="xs" color="quinary" class="hidden md:block mr-10 h-9 mt-1" @click="handleForwardToProfile"/>
       <ButtonBar :buttons="buttons" :selected="computedSelected" @update:selected="handleAttendance" />
     </div>
-    <div class="block md:ml-4 border-l border-dropdownSelect h-16 w-7 md:h-20 md:w-10 items-center text-center hover:bg-eventBoxRed rounded-tr-lg rounded-br-lg pt-5 md:pt-6">
+    <div class="block md:ml-4 border-l border-dropdownSelect h-16 w-9 md:h-20 md:w-10 items-center text-center hover:bg-eventBoxRed rounded-tr-lg rounded-br-lg pt-5 md:pt-6">
       <BaseIcon v-if="!showSpinner" icon-name="fa-circle-xmark" size="" color="quinary" hover="alarm" @click="handlerRemoveFencer" class="text-md md:text-2xl" />
       <BaseIcon v-if="showSpinner" icon-name="fa-spinner-third" size="" color="alarm" class="animate-spin text-md md:text-2xl" hover="alarm" />
     </div>
@@ -64,10 +65,11 @@
 import BaseText from "../../../Atoms/Text/BaseText.vue";
 import ButtonBar from "../../../Molecules/Buttons/ButtonBar/ButtonBar.vue";
 import BaseIcon from "../../../Atoms/Icon/BaseIcon.vue";
+import BaseButton from "../../../Molecules/Buttons/BaseButton/BaseButton.vue";
 
 export default {
   name: 'FencerCard',
-  components: {BaseIcon, ButtonBar, BaseText },
+  components: {BaseButton, BaseIcon, ButtonBar, BaseText },
   props: {
     person: {
       type: Object,
@@ -132,6 +134,9 @@ export default {
     handelMoveDown(){
       if(!this.isLast) this.$emit('update:moveDown', this.person);
     },
+    handleForwardToProfile(){
+      this.$emit('forward:toProfile', this.person.PersonId);
+    }
   }
 };
 </script>

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

@@ -1,8 +1,8 @@
 <template>
   <div class="flex items-center border border-dropdownSelect rounded-lg shadow-lg bg-white  w-full hover:border-bright"
-       :class="detail ? 'my-4  ' : ''" @click="handleEditClick">
-    <div class="md:mr-4 md:border-r border-dropdownSelect h-12 md:h-16 md:w-10 items-center text-center pt-3 md:pt-6">
-      <BaseText :text="place" size="" color="quaternary" weight="bold" class="text-md md:text-2xl"/>
+       :class="detail ? 'my-1  ' : ''" @click="handleEditClick">
+    <div class="md:mr-4 md:border-r border-dropdownSelect h-12 md:h-16 md:w-10 items-center text-center pl-1 md:pl-1 pt-3 md:pt-4">
+      <BaseText :text="place" size="" color="quaternary" weight="bold" class="text-md md:text-xl"/>
     </div>
     <div class="hidden md:flex mr-4 w-16">
       <div v-if="!portraitURL" class="w-12 h-12 rounded-full bg-dropdownSelect items-center justify-center">

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

@@ -1,8 +1,8 @@
 <template>
-  <section>
+  <section class="">
     <EditEventsTopMenu :currentTab="'Final'"  :tabs="tabs(role,isMobile)" @tabMenuClick="handleTabMenuClick"/>
     <EventFinalResultsHeader :event="event" @export:HemaRatings="handleExportToHemaRatings"/>
-    <div class="mt-4">
+    <div class="md:mt-4">
       <FinalResultsTable :finalResults="finalResults"/>
       <div v-if="finalResults.length < 1" class="w-full flex justify-center items-center">
         <div class="text-center mb-10">

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

@@ -5,7 +5,7 @@
                  @update:selection="handleViewChange" :connectedToServer="connectedToServer" class="hidden md:block" />
 
     <section v-if="viewName === 'Pool Grid'" class="hidden md:block">
-      <PoolGrid  :bouts="bouts"/>
+      <PoolGrid  :bouts="localBouts"/>
     </section>
 
     <section>
@@ -55,7 +55,7 @@
     </section>
     </section>
 
-    <DirectorModal :bout="selectedBout" :eventRules="eventRules" :hostingClubColors="hostingClubColors"
+    <DirectorModal :bout="currentSelectedBout" :eventRules="eventRules" :hostingClubColors="hostingClubColors"
                    :show="showDirectorModal"
                    @penalty:add="handleUpdatePenalty"
                    @penalty:update="handleAddPenalty"
@@ -64,7 +64,7 @@
                    @update:bout="handleUpdateBout"
                    @submit:bout="handleSubmitBout"/>
 
-    <EditBoutModal :bout="selectedBout" :eventRules="eventRules" :hostingClubColors="hostingClubColors"
+    <EditBoutModal :bout="currentSelectedBout" :eventRules="eventRules" :hostingClubColors="hostingClubColors"
                    :show="showEditBoutModal"
                    @update:closeModal="handleCloseModal"
                    @submit:bout="handleEditBout"/>
@@ -125,6 +125,7 @@ export default {
   },
   data() {
     return {
+      localBouts: this.bouts,
       showDirectorModal: false,
       showEditBoutModal: false,
       selectedBout: {},
@@ -135,10 +136,11 @@ export default {
   },
   watch: {
     bouts: {
-      handler() { //newBouts
-        this.$forceUpdate();
+      handler(newBouts) {
+        this.localBouts = newBouts;
       },
-      deep: true,
+      immediate: true,
+      deep: true
     }
   },
   mounted() {
@@ -148,6 +150,9 @@ export default {
     window.removeEventListener('resize', this.handleResize);
   },
   computed: {
+    currentSelectedBout() {
+      return this.localBouts.find(b => b.BoutId === this.selectedBout.BoutId) || this.selectedBout;
+    },
     isMobile() {
       return this.windowWidth <= 748;
     },
@@ -155,13 +160,13 @@ export default {
       return this.event?.EventRules || {};
     },
     upcomingBouts() {
-      return this.bouts.filter(bout => bout.Status === 'Scheduled');
+      return this.localBouts.filter(bout => bout.Status === 'Scheduled');
     },
     completedBouts() {
-      return this.bouts.filter(bout => bout.Status === 'Completed');
+      return this.localBouts.filter(bout => bout.Status === 'Completed');
     },
     activeBouts() {
-      return this.bouts.filter(bout => bout.Status === 'Active');
+      return this.localBouts.filter(bout => bout.Status === 'Active');
     },
     hasActiveBout() {
       return this.activeBouts.length > 0;
@@ -191,7 +196,7 @@ export default {
       this.showEditBoutModal = false;
 
       if (bout.Status !== 'Completed') {
-        const updatedBout = this.bouts.find(b => b.BoutId === bout.BoutId);
+        const updatedBout = this.localBouts.find(b => b.BoutId === bout.BoutId);
         if (updatedBout) {
           updatedBout.Status = 'Scheduled';
           updatedBout.Score1 = 0;
@@ -228,7 +233,7 @@ export default {
     handleSubmitBout(bout, resetToActive = false) {
       this.showEditBoutModal = false;
       this.showDirectorModal = false;
-      const updatedBout = this.bouts.find(b => b.BoutId === bout.BoutId);
+      const updatedBout = this.localBouts.find(b => b.BoutId === bout.BoutId);
 
       Object.assign(updatedBout, bout);
       if (!resetToActive) updatedBout.Status = 'Completed';
@@ -237,10 +242,10 @@ export default {
       this.$emit('submit:bout', updatedBout);
     },
     directBout(bout) {
-      const activeBouts = this.bouts.filter(b => b.Status === 'Active');
+      const activeBouts = this.localBouts.filter(b => b.Status === 'Active');
       activeBouts.forEach(b => b.Status = 'Scheduled');
 
-      const updatedBout = this.bouts.find(b => b.BoutId === bout.BoutId);
+      const updatedBout = this.localBouts.find(b => b.BoutId === bout.BoutId);
 
       if (updatedBout) {
         updatedBout.Status = 'Active';
@@ -250,7 +255,7 @@ export default {
       this.$emit('update:directing-bout', updatedBout)
     },
     editBout(bout) {
-      const updatedBout = this.bouts.find(b => b.BoutId === bout.BoutId);
+      const updatedBout = this.localBouts.find(b => b.BoutId === bout.BoutId);
       if (updatedBout) {
         this.showEditBoutModal = true;
         this.selectedBout = bout;
@@ -260,6 +265,7 @@ export default {
       this.windowWidth = window.innerWidth;
     },
     handleUpdatePenalty(penalty) {
+
       this.$emit('penalty:update', penalty);
     },
     handleAddPenalty(penalty) {

package/src/stories/Templates/PersonManagement/Admin/FencerAdmin.vue

@@ -1,4 +1,4 @@
-<template>
+`<template>
   <section class="mt-2 min-h-80">
     <div>
       <!-- HEMA Rating ID -->
@@ -42,6 +42,10 @@ export default {
     person: {
       type: Object,
       required: true
+    },
+    userLevel: {
+      type: String,
+      required: true
     }
   },
   computed: {
@@ -49,11 +53,18 @@ export default {
       return this.person?.HEMARatings?.[0]?.HemaRatingId ?? '';
     },
     accessLevels() {
+      if (this.userLevel === 'Admin') {
+        return [
+          { text: 'User', link: 'User' },
+          { text: 'Director', link: 'Director' },
+          { text: 'Club', link: 'Club' },
+          { text: 'Admin', link: 'Admin' },
+        ];
+      }
       return [
         { text: 'User', link: 'User' },
         { text: 'Director', link: 'Director' },
-        { text: 'Club', link: 'Club' },
-        { text: 'Admin', link: 'Admin' },
+        { text: 'Club', link: 'Club' }
       ];
     },
     getSelectedAccessLevel() {
@@ -71,3 +82,4 @@ export default {
   }
 };
 </script>
+`

package/src/stories/Templates/PersonManagement/PersonManagement.stories.js

@@ -51,6 +51,19 @@ export const admin = {
     }
 };
 
+export const clubAdmin = {
+    args: {
+        personProfile: personsMock[1],
+        fencingClubs: clubGetAllMock,
+        attendance: attendance,
+        uploadImageName: 'profile-test',
+        uploadServer: 'http://localhost:3000/api/upload/',
+        imageServer: 'http://localhost:3000/uploads/',
+        userLevel: 'Club'
+    }
+};
+
+
 export const adminWithLoading = {
     args: {
         personProfile: personsMock,

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

@@ -27,7 +27,7 @@
 
     <EditEventsTopMenu :tabs="personProfileTabs(userLevel)" :currentTab="currentTab" @tabMenuClick="handleTab" />
     <BasicEdit v-if="currentTab === 'Basic'" :person="person" :fencingClubs="fencingClubs" :validation="validation" @update:person="updatePerson" />
-    <FencerAdmin v-if="currentTab === 'Admin'" :person="person" @update:person="updatePerson"/>
+    <FencerAdmin v-if="currentTab === 'Admin'" :person="person" :userLevel="userLevel" @update:person="updatePerson"/>
     <Attendance v-if="currentTab === 'Stats'" :attendance="attendance" />
     <Attendance v-if="currentTab === 'Attendance'" :attendance="attendance" />
 
@@ -126,8 +126,7 @@ export default {
     },
     showButtons() {
       return (
-          (this.userLevel === "Admin" && this.currentTab === "Basic") ||
-          (this.userLevel === "Admin" && this.currentTab === "Admin") ||
+          ((this.userLevel === "Admin" || this.userLevel === "Club") && (this.currentTab === "Basic" || this.currentTab === "Admin")) ||
           (this.userLevel === "User" && this.currentTab === "Basic")
       );
     },

package/src/stories/Util/tabs.js

@@ -59,6 +59,15 @@ export const personProfileTabs = (role) => {
         ]
     }
 
+    if (role.toLocaleLowerCase() === 'club') {
+        return [
+            {id: 'Basic', label: 'Basic', color: 'primaryHighlight', icon: 'fa-info-circle'},
+            {id: 'Admin', label: 'Administration', color: 'primaryHighlight', icon: 'fa-gear'},
+            // {id: 'Stats', label: 'Statistics', color: 'primaryHighlight', icon: 'fa-trophy '},
+            {id: 'Attendance', label: 'Attendance', color: 'primaryHighlight', icon: 'fa-user-check'},
+        ]
+    }
+
     return [
         {id: 'Basic', label: 'Basic', color: 'primaryHighlight', icon: 'fa-info-circle'},
         // {id: 'Stats', label: 'Statistics', color: 'primaryHighlight', icon: 'fa-trophy'},