Skip to content

Commit

Permalink
Added refresh button to Season view.
Browse files Browse the repository at this point in the history
  • Loading branch information
Firewolf1337 committed Sep 1, 2023
1 parent 32be87f commit 4d321bb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion RCRPlanner/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<TextBlock x:Name="btnMenu6tb" Margin="0,-3,0,0" FontSize="16"/>
</Button>
</DockPanel>
<TextBlock x:Name="tbMenu6" Grid.Column="5" Grid.Row="0" Height="30" Text="" Style="{StaticResource DefaultTextBlockStyle}" FontSize="30" HorizontalAlignment="Right" Margin="0,0,20,0" MouseDown="tbMenu6_MouseDown" />
<TextBlock x:Name="tbMenu6" Grid.Column="5" Grid.Row="0" Height="30" Text="" Style="{StaticResource DefaultTextBlockStyle}" FontSize="30" HorizontalAlignment="Right" Margin="0,-7,20,0" MouseDown="tbMenu6_MouseDown" VerticalAlignment="Center" TextAlignment="Center" UseLayoutRounding="True" />
<Grid x:Name="gridDetails" Grid.Column="3" Grid.ColumnSpan="3" Grid.Row="1" Visibility="Hidden">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="15"/>
Expand Down
18 changes: 11 additions & 7 deletions RCRPlanner/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1743,7 +1743,7 @@ private void generateAutoStartView()
gridAutoStart.ItemsSource = null;
gridAutoStart.ItemsSource = dgAutoStartList;
}
private async Task<DataTable> generateSeasonOverview()
private async Task<DataTable> generateSeasonOverview(bool reload)
{
var dgSeriesL = dgSeriesList.Where(x => x.Favourite.Contains(favsymbolSelected)).ToList();
List<dgObjects.seasonOverviewDataGrid> dgSeasonOverview = new List<dgObjects.seasonOverviewDataGrid>();
Expand All @@ -1765,7 +1765,7 @@ private async Task<DataTable> generateSeasonOverview()
YearQuaterSeries.Add((ser.Season.season_year, ser.Season.season_quarter, ser.SerieId));
}
}
if (seasonRaces.Count == 0)
if (seasonRaces.Count == 0 || reload)
{
foreach (var yq in YearQuater.Distinct())
{
Expand Down Expand Up @@ -1840,13 +1840,13 @@ private async Task<DataTable> generateSeasonOverview()
}
return dataTable;
}
private async void generateSeasonOverviewGrid()
private async void generateSeasonOverviewGrid(bool reload)
{
try
{
if (await fData.Login_API(Encoding.UTF8.GetBytes((username).ToLower()), Encoding.UTF8.GetBytes(helper.ToInsecureString(password)), false) == 200)
{
DataTable view = await generateSeasonOverview();
DataTable view = await generateSeasonOverview(reload);
gridSeasonOverview.Children.Clear();
Grid grid = new Grid();
grid.ShowGridLines = false;
Expand Down Expand Up @@ -2505,10 +2505,11 @@ private void btnLoadSeasonOverview_Click(object sender, RoutedEventArgs e)
dpMenu4.Visibility = Visibility.Hidden;
dpMenu5.Visibility = Visibility.Hidden;
cbMenu6.Visibility = Visibility.Hidden;
tbMenu6.Visibility = Visibility.Hidden;
generateSeasonOverviewGrid();
dpMenu6.Visibility = Visibility.Hidden;
tbMenu6.Visibility = Visibility.Visible;
generateSeasonOverviewGrid(false);
stackPanelMenuClose_MouseDown(null, null);
generateSeasonOverview();
//generateSeasonOverview(false);
switchMainGridVisibility(new List<System.Windows.Controls.DataGrid> { null }, false);
gridSeasonOverview.Visibility = Visibility.Visible;
scrollSeasonOverview.Visibility = Visibility.Visible;
Expand Down Expand Up @@ -3255,6 +3256,9 @@ private void tbMenu6_MouseDown(object sender, MouseButtonEventArgs e)
case "gridRaces":
generateRaceView();
break;
case "gridSeasonOverview":
generateSeasonOverviewGrid(true);
break;
}
}
private void btnMenu6_Click(object sender, RoutedEventArgs e)
Expand Down

0 comments on commit 4d321bb

Please sign in to comment.