Merge pull request #857 from PennyDreadfulMTG/filter-matches

Return filtering player matches to working order
PennyDreadfulMTG · Nov 26, 2024 · ce8084e · ce8084e
2 parents 917c8ed + 3f6c05a
commit ce8084e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/gatherling/Views/Components/AllMatchForm.php b/gatherling/Views/Components/AllMatchForm.php
@@ -11,15 +11,15 @@ class AllMatchForm extends Component
     public DropMenu $formatDropMenuP;
     public DropMenu $seriesDropMenuP;
     public DropMenu $seasonDropMenuP;
-    public DropMenu $oppDropMenu;
+    public DropMenu $oppDropMenuP;
 
     public function __construct(Player $player, string $selectedFormat, string $selectedSeries, string $selectedSeason, string $selectedOpponent)
     {
         $this->formatDropMenuP = selector(opts($player->getFormatsPlayed()), 'format', '-- Format --', $selectedFormat ? $selectedFormat : '%');
         $this->seriesDropMenuP = selector(opts($player->getSeriesPlayed()), 'series', '-- Series --', $selectedSeries ? $selectedSeries : '%');
         $this->seasonDropMenuP = selector(opts($player->getSeasonsPlayed()), 'season', '-- Season --', $selectedSeason ? $selectedSeason : '%');
         $opts = array_map(fn (array $item) => ['value' => $item['opp'], 'text' => $item['opp'] . ' [' . $item['cnt'] . ']'], $player->getOpponents());
-        $this->oppDropMenu = selector($opts, 'opp', '-- Opponent --', $selectedOpponent ? $selectedOpponent : '%');
+        $this->oppDropMenuP= selector($opts, 'opp', '-- Opponent --', $selectedOpponent ? $selectedOpponent : '%');
     }
 }
 

diff --git a/gatherling/templates/partials/allMatchForm.mustache b/gatherling/templates/partials/allMatchForm.mustache
@@ -34,7 +34,7 @@
         </tr>
         <tr>
             <td colspan="2" class="c">
-                <input type="submit" name="mode" value="Filter Matches">
+                <input class="inputbutton" type="submit" name="mode" value="Filter Matches">
             </td>
         </tr>
         <tr>

diff --git a/gatherling/templates/partials/playerMatches.mustache b/gatherling/templates/partials/playerMatches.mustache
@@ -1,6 +1,6 @@
-{{#playerMatchForm}}
-    {{> playerMatchForm}}
-{{/playerMatchForm}}
+{{#allMatchForm}}
+    {{> allMatchForm}}
+{{/allMatchForm}}
 
 {{#matchTable}}
     {{> matchTable}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ @@
             </tr>
             <tr>
                 <td colspan="2" class="c">
-                    <input type="submit" name="mode" value="Filter Matches">
+                    <input class="inputbutton" type="submit" name="mode" value="Filter Matches">
                 </td>
             </tr>
             <tr>
@@ Expand Down @@