|
@@ -1445,15 +1445,17 @@ namespace PRSDesktop
|
|
|
);
|
|
|
|
|
|
var dailyReportPanel = LoadWindow<DailyReport>(ProjectDailyReportButton);
|
|
|
-
|
|
|
- dailyReportPanel.OnTimeSheetConfirmed += e =>
|
|
|
+ if(dailyReportPanel is not null)
|
|
|
{
|
|
|
- if (!OutstandingDailyReports(true))
|
|
|
+ dailyReportPanel.OnTimeSheetConfirmed += e =>
|
|
|
{
|
|
|
- ConfigureMainScreen();
|
|
|
- LoadApplicationState();
|
|
|
- }
|
|
|
- };
|
|
|
+ if (!OutstandingDailyReports(true))
|
|
|
+ {
|
|
|
+ ConfigureMainScreen();
|
|
|
+ LoadApplicationState();
|
|
|
+ }
|
|
|
+ };
|
|
|
+ }
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -2752,13 +2754,6 @@ namespace PRSDesktop
|
|
|
LoadWindow<DeliveryPanel>((Fluent.Button)sender);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- private void TaskTypesButton_OnClick(object sender, RoutedEventArgs e)
|
|
|
- {
|
|
|
- var list = new MasterList(typeof(KanbanType));
|
|
|
- list.ShowDialog();
|
|
|
- }
|
|
|
-
|
|
|
private void TrolleySetup_Click()
|
|
|
{
|
|
|
var list = new MasterList(typeof(ManufacturingTrolley));
|