@dcrackel/hematournamentui 1.0.421 → 1.0.424

package/package.json

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

package/src/mocks/getPoolResults.js

@@ -116,7 +116,6 @@ const getPoolResults =
             {
                 "PersonId": 37,
                 "DisplayName": "Brian Thiessen",
-                "PoolId": 225,
                 "Image": null,
                 "Club": "Steelhead Western Martial Arts",
                 "ShowData": true,
@@ -135,7 +134,6 @@ const getPoolResults =
             {
                 "PersonId": 10,
                 "DisplayName": "Melissa Jones",
-                "PoolId": 224,
                 "Image": "https://randomuser.me/api/portraits/women/9.jpg",
                 "Club": "Guardians of the Guard",
                 "ShowData": true,
@@ -154,7 +152,6 @@ const getPoolResults =
             {
                 "PersonId": 68,
                 "DisplayName": "Regina Mendicino",
-                "PoolId": 224,
                 "Image": null,
                 "Club": "Columbus United Fencing Club",
                 "ShowData": true,
@@ -173,7 +170,6 @@ const getPoolResults =
             {
                 "PersonId": 111,
                 "DisplayName": "Aaron Senteney",
-                "PoolId": 225,
                 "Image": null,
                 "Club": "Steelhead Western Martial Arts",
                 "ShowData": true,
@@ -192,7 +188,6 @@ const getPoolResults =
             {
                 "PersonId": 49,
                 "DisplayName": "Jack Seyler",
-                "PoolId": 224,
                 "Image": null,
                 "Club": "Ars Gladii",
                 "ShowData": true,
@@ -211,7 +206,6 @@ const getPoolResults =
             {
                 "PersonId": 80,
                 "DisplayName": "Robin Steele ",
-                "PoolId": 224,
                 "Image": null,
                 "Club": "Hilt and Helm Pittsburgh Fencing Club",
                 "ShowData": true,
@@ -230,7 +224,6 @@ const getPoolResults =
             {
                 "PersonId": 102,
                 "DisplayName": "Team Ronin",
-                "PoolId": 225,
                 "Image": null,
                 "Club": "Columbus United Fencing Club",
                 "ShowData": true,
@@ -249,7 +242,6 @@ const getPoolResults =
             {
                 "PersonId": 41,
                 "DisplayName": "David Reddy",
-                "PoolId": 225,
                 "Image": null,
                 "Club": "Gem City Duelists Society",
                 "ShowData": true,

package/src/stories/Organisms/Containers/PoolResults/PoolResultsTable.vue

@@ -12,7 +12,6 @@
       </section>
 
       <div v-if="shouldShowResults" v-for="(person, index) in results" :key="person.personId" class="flex flex-col py-1">
-        <!-- Person Card -->
         <FencerPoolResultsCard
             :isLast="index === results.length - 1"
             :person="person"
@@ -83,13 +82,6 @@ export default {
     }
   },
   watch: {
-    numPromoted() {
-      this.updatePromotions();
-    },
-    poolResults(newResults) {
-      this.results = newResults;
-      this.updatePromotions();
-    },
     initialCutoffIndex(newValue) {
       this.cutoffIndex = newValue - 1;
       this.updatePromotions();
@@ -100,6 +92,9 @@ export default {
       return this.event.Status && ["live", "results", "de", "completed"].includes(this.event.Status.toLowerCase());
     }
   },
+  mounted() {
+    this.updatePromotions();
+  },
   methods: {
     moveUp() {
       if (this.cutoffIndex > 1) {

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

@@ -14,7 +14,7 @@
             :directorName="getDirectorName(pool.Staff)"
             :pool="pool.participants"
             :staff="staff"
-            :mode="event.Status"
+            :mode="event.Status || 'planning'"
             :loading="loading"
             @update:swapFencers="swapFencers"
             @update:setDirector="setDirector"

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

@@ -1,13 +1,13 @@
 import EditEvents from './PoolResults.vue';
 import getPoolResults from '../../../../mocks/getPoolResults.js';
-import eventPersonGetPoolAssignmentEvent from '../../../../mocks/eventPersonGetPoolAssignmentEvent.js';
+//import eventPersonGetPoolAssignmentEvent from '../../../../mocks/eventPersonGetPoolAssignmentEvent.js';
 
 export default {
     title: 'Templates/EventManagement/PoolResults',
     component: EditEvents,
     tags: ['autodocs'],
     args: {
-        event: eventPersonGetPoolAssignmentEvent,
+        event: getPoolResults,
         rules: getPoolResults.eventRules,
         poolResults: getPoolResults.report
     },
@@ -20,39 +20,35 @@ export default {
     }
 };
 
-let modifiedEvent = {...eventPersonGetPoolAssignmentEvent, Status: "results"}
+let modifiedEvent = {...getPoolResults, Status: "results"}
 export const Default = {
     args: {
         event: modifiedEvent,
-        rules: getPoolResults.eventRules,
         poolResults: getPoolResults.report
     }
 };
 
-modifiedEvent = {...eventPersonGetPoolAssignmentEvent, Status: "de"}
+modifiedEvent = {...getPoolResults, Status: "de"}
 export const EventIsInDE = {
     args: {
         event: modifiedEvent,
-        rules: getPoolResults.eventRules,
         poolResults: getPoolResults.report
     }
 };
 
 
-modifiedEvent = {...eventPersonGetPoolAssignmentEvent, Status: "planning"}
+modifiedEvent = {...getPoolResults, Status: "planning"}
 export const EventIsInPlanning = {
     args: {
         event: modifiedEvent,
-        rules: getPoolResults.eventRules,
         poolResults: getPoolResults.report
     }
 };
 
-modifiedEvent = {...eventPersonGetPoolAssignmentEvent, Status: "planning"}
+modifiedEvent = {...getPoolResults, Status: "planning"}
 export const noResults = {
     args: {
         event: modifiedEvent,
-        rules: getPoolResults.eventRules,
         poolResults: []
     }
 };

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

@@ -7,7 +7,6 @@
                        @update:handleIncreaseCount="handleIncreaseCount"
                        @update:handleDecreaseCount="handleDecreaseCount"
     />
-
     <PoolResultsTable :poolResults="localPoolResults"
                       :initialCutoffIndex="initialCutoffIndex"
                       :numPromoted="promoted"
@@ -53,10 +52,6 @@ export default {
       type: Object,
       required: true
     },
-    rules: {
-      type: Object,
-      required: true
-    },
     poolResults: {
       type: Array,
       required: true
@@ -92,6 +87,9 @@ export default {
     }
   },
   computed: {
+    rules() {
+      return this.event?.eventRules || [];
+    },
     promotedByRule() {
       const rule = this.rules?.find((n2) => n2.Rules.RuleName === "DEPromoteBy");
       return rule ? rule.RuleValue : "Percent";
@@ -105,31 +103,33 @@ export default {
     handleTabMenuClick(value) {
       this.$emit('tab:menu-click', value);
     },
-    handleIncreaseCount(value){
-      let numPercent = this.getNumericValue(value)
+    handleIncreaseCount(value) {
+      let numPercent = this.getNumericValue(value);
       if (this.promotedByRule === 'Top') {
         const rule = this.rules.find(rule => rule.Rules.RuleName === "DENumOfPromotion");
         if (rule) {
           rule.RuleValue++;
           console.log(rule.RuleValue);
+          this.updatePromotions(); // Centralized logic
         }
         return;
       }
 
       if (numPercent === 100) {
         this.initialCutoffIndex = 500;
-        return
+        return;
       }
 
-      this.calculateInitialCutoffIndex(numPercent+10)
+      this.calculateInitialCutoffIndex(numPercent + 10);
     },
-    handleDecreaseCount(value){
-      let numPercent = this.getNumericValue(value)
+    handleDecreaseCount(value) {
+      let numPercent = this.getNumericValue(value);
       if (this.promotedByRule === 'Top') {
         const rule = this.rules.find(rule => rule.Rules.RuleName === "DENumOfPromotion");
         if (rule) {
           rule.RuleValue--;
           console.log(rule.RuleValue);
+          this.updatePromotions(); // Centralized logic
         }
         return;
       }
@@ -138,7 +138,7 @@ export default {
         return;
       }
 
-      this.calculateInitialCutoffIndex(numPercent-10)
+      this.calculateInitialCutoffIndex(numPercent - 10);
     },
     getNumericValue(percent) {
       let numPercent;
@@ -154,10 +154,68 @@ export default {
       return numPercent
     },
     calculateInitialCutoffIndex(numPercent) {
+      if (this.promotedByRule === 'Top') {
+        const numPromoted = parseInt(this.promoted, 10) || 2;
+        this.updatePromotions(numPromoted); // Centralized logic
+        return;
+      }
+
       const totalFencers = this.poolResults.length;
-      const promotionRate =  numPercent / 100;
-      this.promoted = `${numPercent}%`
+      const promotionRate = numPercent / 100;
+      this.promoted = `${numPercent}%`;
       this.initialCutoffIndex = Math.ceil(totalFencers * promotionRate);
+
+      this.updatePromotions(this.initialCutoffIndex); // Centralized logic
+    },
+    updatePromotions(numPromoted = parseInt(this.promoted, 10) || 2) {
+      const pools = this.groupFencersByPool(this.poolResults);
+
+      Object.entries(pools).forEach(([poolFencers]) => {
+        // Sort by criteria
+        this.sortFencersByCriteria(poolFencers);
+        // Mark top fencers as promoted
+        this.markTopFencers(poolFencers, numPromoted);
+      });
+
+      console.log('Final Pool Results After Promotion:', this.poolResults);
+    },
+    groupFencersByPool(poolResults) {
+      return poolResults.reduce((acc, person) => {
+        const poolKey = person.PoolId || person.PoolName; // Use PoolId if available
+        if (!acc[poolKey]) acc[poolKey] = [];
+        acc[poolKey].push(person);
+        return acc;
+      }, {});
+    },
+    sortFencersByCriteria(poolFencers) {
+      // Validate input
+      if (!Array.isArray(poolFencers)) {
+        console.error('Invalid input to sortFencersByCriteria:', poolFencers);
+        return null;
+      }
+
+      // Return a sorted copy of the array
+      return [...poolFencers].sort((a, b) => {
+        // Primary: Win Percentage (Descending)
+        if (b.WinPercentage !== a.WinPercentage) {
+          return b.WinPercentage - a.WinPercentage;
+        }
+        // Secondary: Total Wins (Descending)
+        if (b.TotalWins !== a.TotalWins) {
+          return b.TotalWins - a.TotalWins;
+        }
+        // Tertiary: Indicator (Descending)
+        if (b.Indicator !== a.Indicator) {
+          return b.Indicator - a.Indicator;
+        }
+        // Quaternary: Total Scored (Descending)
+        return b.PointsScored - a.PointsScored;
+      });
+    },
+    markTopFencers(poolFencers, numPromoted) {
+      poolFencers.forEach((person, index) => {
+        person.Promoted = index < numPromoted;
+      });
     },
     closeModal(){
       this.showRemoveModal = false

package/src/stories/Templates/Menus/Admin/AdminLeftMenu.vue

@@ -84,6 +84,7 @@ export default {
       ]
     };
   },
+  emits: ['button:Account', 'button:Logout', 'button:Click'],
   mounted() {
     document.addEventListener('click', this.handleClickOutside);
   },