Fix to account for extra COVID caused gameweeks

Initial fix.  None breaking change, but will probably be modified later.  I needed a quick bit of code in so I could run the stats over my mini-league

Author: c-wilkinson

PowerShell/PSFPLInfo/Private/CreateInitialLeagueStructure.ps1

@@ -8,7 +8,7 @@ function CreateInitialLeagueStructure
         into the initial league structure.
 #> 
     [CmdletBinding()]
-	[OutputType([object])]
+    [OutputType([object])]
     param(
         [Parameter(Mandatory=$true)][int]$leagueId,
         [Parameter(Mandatory=$true)][object]$session
@@ -40,12 +40,15 @@ function CreateInitialLeagueStructure
                 $rank = $team.rank;
                 Write-Output "Load gameweek history for $teamName";
                 $gameweekHistoryJson = Get-Data $session $teamurl;
+				$gameweekNumber = 0;
                 foreach($gameweek in $gameweekHistoryJson.current)
                 {
+                    $gameweekNumber++;
                     $valueParser = ($gameweek.value).ToString();
                     $value = "£" + $valueParser.SubString(0, $valueParser.length - 1) + '.' + $valueParser.SubString($valueParser.length - 1, 1);
                     $unstructured += New-Object PsObject -Property @{
                                                              GameWeek = $gameweek.event;
+                                                             GameWeekNumber = $gameweekNumber;
                                                              GameWeekPoints = $gameweek.points;
                                                              PointsOnBench = $gameweek.points_on_bench;
                                                              TransfersMade = $gameweek.event_transfers;

PowerShell/PSFPLInfo/Private/EncodeString.ps1

@@ -8,7 +8,7 @@ function EncodeString
         non-latin based characters are returned correctly.
 #> 
     [CmdletBinding()]
-	[OutputType([string])]
+    [OutputType([string])]
     param(
         [Parameter(Mandatory=$true)][string]$string
     )

PowerShell/PSFPLInfo/Private/Get-Data.ps1

@@ -10,7 +10,7 @@ function Get-Data
         the FPL API.
 #> 
     [CmdletBinding()]
-	[OutputType([object])]
+    [OutputType([object])]
     param(
         [Parameter(Mandatory=$true)][object]$session, 
         [Parameter(Mandatory=$true)][string]$url

PowerShell/PSFPLInfo/Private/Get-URLFromAPI.ps1

@@ -8,7 +8,7 @@ function Get-URLFromAPI
         location for updating URLs if required
 #> 
     [CmdletBinding()]
-	[OutputType([string])]
+    [OutputType([string])]
     param(
         [Parameter(Mandatory=$true)][string]$api,
         [Parameter(Mandatory=$false)][string]$arg1,

PowerShell/PSFPLInfo/Public/Authenticate.ps1

@@ -23,7 +23,7 @@ function Authenticate
         C:\> $session = Authenticate (New-Object System.Management.Automation.PSCredential('[email protected]',('somePassword' | ConvertTo-SecureString -asPlainText -Force)));
 #>    
     [cmdletbinding()]
-	[OutputType([object])]
+    [OutputType([object])]
     param(
         [Parameter(Mandatory=$true)][PSCredential]$credential
     )

PowerShell/PSFPLInfo/Public/Chart.ps1

@@ -26,11 +26,27 @@ function Chart
         C:\> $chart = Chart $league; $chart.SaveImage("C:\SomePath\Chart.png", "PNG");
 #> 
     [CmdletBinding()]
-	[OutputType([object])]
+    [OutputType([object])]
     param(
         [Parameter(Mandatory=$true)][object]$league
     )
     $totalPlayers = $league.Count;
+    # This is to cover COVID style extra gameweeks. . .
+    $maxGameweeks = 38;
+    foreach($team in $league)
+    {
+        foreach($gw in $team.GameWeekHistory)
+        {
+            if($maxGameweeks -lt $gw.GameWeekNumber)
+            { 
+                # In theory, you could use GameWeek since the Event are iterating on
+                # the FPL website from 38, but the UI is showing 30+ as Event 39 so
+                # I added a count in case it gets changed
+                $maxGameweeks = $gw.GameWeekNumber;
+            }
+        }
+    }
+    
     Write-Verbose "League has $totalPlayers players";
     $leagueChart = New-object System.Windows.Forms.DataVisualization.Charting.Chart;
     $leagueChart.Width = (38 * 10) + 1000;
@@ -46,7 +62,7 @@ function Chart
     $chartarea.AxisX.Interval = 1;
     $chartarea.AxisX.IsStartedFromZero = $false;
     $chartarea.AxisX.Minimum = 1;
-    $chartarea.AxisX.Maximum = 38;
+    $chartarea.AxisX.Maximum = $maxGameweeks;
     $chartarea.AxisY.Interval = 1;
     $chartarea.AxisY.IsReversed = $true;
     $chartarea.AxisY.IsStartedFromZero = $false;
@@ -69,7 +85,7 @@ function Chart
             $gameweekRankList = @();
             foreach($week in $team.GameWeekHistory)
             {
-                $gameweekList += $week.GameWeek -as [int];
+                $gameweekList += $week.GameWeek;
                 $gameweekRankList += $week.GameWeekRank -as [int];
             }
 

PowerShell/PSFPLInfo/Public/Get-League.ps1

@@ -28,7 +28,7 @@ function Get-League
         C:\> $league = Get-League 1000 (Authenticate -credential (New-Object System.Management.Automation.PSCredential('[email protected]', ('somePassword' | ConvertTo-SecureString -asPlainText -Force))));
 #> 
     [CmdletBinding()]
-	[OutputType([object])]
+    [OutputType([object])]
     param(
         [Parameter(Mandatory=$true)][int]$leagueId,
         [Parameter(Mandatory=$true)][object]$session
@@ -49,6 +49,7 @@ function Get-League
                                                          TransfersCode = $info.TransfersCode;
                                                          OverallPoints = $info.OverallPoints;
                                                          GameWeekRank = $info.GameWeekRank;
+                                                         GameWeekNumber = $info.GameWeekNumber;
                                                       };
             if ($currentdata)
             {

PowerShell/PSFPLInfo/Tests/WorkMiniLeagueStatGeneration.ps1

@@ -3,6 +3,6 @@ Import-Module -Name $PSScriptRoot\..\PSFPLInfo -Force
 $session = Authenticate $credential;
 $league = Get-League $leagueId $session;
 $chart = Chart $league;
-$chart.SaveImage("Chart.png", "PNG");
+$chart.SaveImage("$PSScriptRoot\Chart.png", "PNG");
 New-Item -ItemType Directory -Force -Path "$PSScriptRoot\..\Output";
 Move-Item -Path "$PSScriptRoot\Chart.png" -Destination "$PSScriptRoot\..\Output\Chart.png";