dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

POListControl umbenannt, neue Übersicht mit Tabs

Browse Source
This commit is contained in:
Daniel Schick 2023-02-03 14:13:15 +01:00
parent 114b9db663
commit b94835ee4b
6 changed files with 388 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/Controls/POListControl.xaml → ENI2/Controls/MaerskListControl.xaml
View File

@ -1,4 +1,4 @@
<UserControl x:Class="ENI2.Controls.POListControl"
<UserControl x:Class="ENI2.Controls.MaerskListControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

6
ENI2/Controls/POListControl.xaml.cs → ENI2/Controls/MaerskListControl.xaml.cs
View File

@ -18,9 +18,9 @@ using bsmd.database;
namespace ENI2.Controls
{
/// <summary>
/// Interaction logic for POListControl.xaml
/// Interaction logic for MaerskListControl.xaml
/// </summary>
public partial class POListControl : UserControl
public partial class MaerskListControl : UserControl
{
#region Fields
@ -40,7 +40,7 @@ namespace ENI2.Controls
#region Construction
public POListControl()
public MaerskListControl()
{
InitializeComponent();
Loaded += POList_Loaded;

12
ENI2/Controls/MaerskOverviewControl.xaml Normal file
View File

@ -0,0 +1,12 @@
<UserControl x:Class="ENI2.Controls.MaerskOverviewControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ENI2.Controls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
</Grid>
</UserControl>

28
ENI2/Controls/MaerskOverviewControl.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace ENI2.Controls
{
/// <summary>
/// Interaction logic for MaerskOverviewControl.xaml
/// </summary>
public partial class MaerskOverviewControl : UserControl
{
public MaerskOverviewControl()
{
InitializeComponent();
}
}
}

13
ENI2/ENI2.csproj
View File

@ -228,6 +228,9 @@
<Compile Include="Controls\LocodeControl.xaml.cs">
<DependentUpon>LocodeControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\MaerskOverviewControl.xaml.cs">
<DependentUpon>MaerskOverviewControl.xaml</DependentUpon>
</Compile>
<Compile Include="EditControls\CompareExcelDialog.xaml.cs">
<DependentUpon>CompareExcelDialog.xaml</DependentUpon>
</Compile>
@ -249,8 +252,8 @@
<Compile Include="Excel\ExcelManager.cs" />
<Compile Include="Excel\ExcelReader.cs" />
<Compile Include="Excel\ExcelUtil.cs" />
<Compile Include="Controls\POListControl.xaml.cs">
<DependentUpon>POListControl.xaml</DependentUpon>
<Compile Include="Controls\MaerskListControl.xaml.cs">
<DependentUpon>MaerskListControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\ReportingPartyControl.xaml.cs">
<DependentUpon>ReportingPartyControl.xaml</DependentUpon>
@ -458,7 +461,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\POListControl.xaml">
<Page Include="Controls\MaerskOverviewControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\MaerskListControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

8
ENI2/MainWindow.xaml.cs
View File

@ -35,7 +35,7 @@ namespace ENI2
#region Fields
private ReportingPartyControl rpControl;
private POListControl poControl;
private MaerskOverviewControl moControl;
private ServerStatusControl statusControl;
private readonly SucheControl sucheControl;
private CompareExcelDialog compareExcelDialog;
@ -281,11 +281,11 @@ namespace ENI2
}
else if(sender == this.buttonPOListe)
{
if (this.poControl == null)
if (this.moControl == null)
{
this.poControl = new POListControl();
this.moControl = new MaerskOverviewControl();
}
this.rootContainer.Children.Add(poControl);
this.rootContainer.Children.Add(moControl);
}
else if(sender == this.buttonStatus)
{