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

rework main screen Part I

Browse Source
This commit is contained in:
Daniel Schick 2023-02-07 11:00:31 +01:00
parent af1a071664
commit 8862d8e83c
12 changed files with 158 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ENI2/ENI2.csproj
View File

@ -852,6 +852,11 @@
<Resource Include="Resources\logo_eni.png" />
<Resource Include="Resources\import1.png" />
<Resource Include="Resources\import2.png" />
<Resource Include="Resources\about.png" />
<Resource Include="Resources\document_into.png" />
<Resource Include="Resources\document_plain_new.png" />
<Resource Include="Resources\exit.png" />
<Resource Include="Resources\document_exchange.png" />
<Content Include="x64\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

45
ENI2/MainWindow.xaml
View File

@ -59,12 +59,48 @@
</Grid>
</xctk:BusyIndicator.BusyContent>
<DockPanel Name="mainPanel">
<Grid DockPanel.Dock="Top" Height="80" Background="#FFE8F6FF">
<Menu DockPanel.Dock="Top" Background="#FFE8F6FF">
<Menu.ItemsPanel>
<ItemsPanelTemplate>
<DockPanel HorizontalAlignment="Stretch"/>
</ItemsPanelTemplate>
</Menu.ItemsPanel>
<MenuItem Header="_File">
<MenuItem Header="_Create new Id" Click="buttonNewTransitIdClick">
<MenuItem.Icon>
<Image Source="Resources/document_plain_new.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="_New with Id" Click="buttonNewWithIdClick">
<MenuItem.Icon>
<Image Source="Resources/document_into.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Compare _Excel sheets" Click="buttonCompareSheets_Click">
<MenuItem.Icon>
<Image Source="Resources/document_exchange.png" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="Exit" Click="MenuItem_Click">
<MenuItem.Icon>
<Image Source="Resources/exit.png" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Help" HorizontalAlignment="Right">
<MenuItem Header="About" Click="buttonAbout_Click">
<MenuItem.Icon>
<Image Source="Resources/about.png" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>
</Menu>
<Grid DockPanel.Dock="Top" Height="28" Background="#FFE8F6FF">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Grid.Column="0" x:Name="logoImage" HorizontalAlignment="Left" Height="75" Width="75" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp" Margin="2"/>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
@ -79,14 +115,11 @@
<RowDefinition Height="28"/>
<RowDefinition Height="28"/>
</Grid.RowDefinitions>
<Button Grid.Column="0" x:Name="buttonNewId" Content="{x:Static p:Resources.textNewVisitTransitId}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonNewTransitIdClick" Background="Transparent" Margin="2,2,0,0" Grid.RowSpan="2"/>
<Button Grid.Column="1" x:Name="buttonNewWithId" Content="{x:Static p:Resources.textNewWithId}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonNewWithIdClick" Background="Transparent" Margin="2,2,0,0" Grid.RowSpan="2"/>
<RadioButton Grid.Column="2" x:Name="buttonNotifications" Content="{x:Static p:Resources.textNotifications}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" IsChecked="True" Grid.RowSpan="2" />
<RadioButton Grid.Column="3" x:Name="buttonStatus" Content="{x:Static p:Resources.textServerStatus}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" Grid.RowSpan="2" />
<RadioButton Grid.Column="4" x:Name="buttonUserAdmin" Content="{x:Static p:Resources.textUserAdministration}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2"/>
<RadioButton Grid.Column="5" x:Name="buttonPOListe" Content="{x:Static p:Resources.textPOLists}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2" />
<Button Grid.Column="6" x:Name="buttonCompareSheets" Content="{x:Static p:Resources.textCompareExcel}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonCompareSheets_Click" Background="Transparent" Margin="2,2,0,0" />
<Button Grid.Column="7" x:Name="buttonAbout" Content="?" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" Margin="0,2,2,0" Padding="5,0,5,0" Click="buttonAbout_Click" Grid.RowSpan="2"/>
<Label Grid.Column="0" Grid.Row="1" x:Name="labelStatusId" Grid.ColumnSpan="3" Margin="2,2,0,0" HorizontalAlignment="Left"/>
</Grid>
</Grid>

49
ENI2/MainWindow.xaml.cs
View File

@ -1,28 +1,27 @@
// Copyright (c) 2017 schick Informatik
// Copyright (c) 2017-present schick Informatik
// Description: The main application window
//
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Threading;
using System.Timers;
using System.Text;
using log4net;
using bsmd.database;
using System.Windows.Controls;
using ENI2.Controls;
using ENI2.EditControls;
using ENI2.Util;
using log4net;
using System.ComponentModel;
using ENI2.Locode;
using System.Text;
namespace ENI2
{
@ -39,8 +38,7 @@ namespace ENI2
private ServerStatusControl statusControl;
private readonly SucheControl sucheControl;
private CompareExcelDialog compareExcelDialog;
private bool efMode = false;
private bool dbConnected;
private readonly ScaleTransform _transform = new ScaleTransform(1.0, 1.0);
private readonly Dictionary<Guid, ClosableTabItem> openTabs = new Dictionary<Guid, ClosableTabItem>();
@ -245,13 +243,7 @@ namespace ENI2
#endregion
#region Window control click event handler
private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
{
if(efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
else Process.Start("http://www.eureport.de/");
}
#region Window control click event handler
private void buttonAbout_Click(object sender, RoutedEventArgs e)
{
@ -262,12 +254,12 @@ namespace ENI2
private void radioButton_Click(object sender, RoutedEventArgs e)
{
this.rootContainer.Children.Clear();
bool newButtonsVisible = false;
if(sender == this.buttonNotifications)
{
this.rootContainer.Children.Add(this.mainFrame);
newButtonsVisible = true;
}
else if(sender == this.buttonUserAdmin)
{
@ -295,9 +287,6 @@ namespace ENI2
}
this.rootContainer.Children.Add(this.statusControl);
}
this.buttonNewId.Visibility = newButtonsVisible ? Visibility.Visible : Visibility.Hidden;
this.buttonNewWithId.Visibility = newButtonsVisible ? Visibility.Visible : Visibility.Hidden;
}
private void buttonCompareSheets_Click(object sender, RoutedEventArgs ev)
@ -327,12 +316,7 @@ namespace ENI2
this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString);
labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed";
labelVersion.Text = "V. " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
if (Keyboard.IsKeyDown(Key.LeftShift))
{
efMode = true;
logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
}
labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
Microsoft.Win32.SystemEvents.SessionEnded += SystemEvents_SessionEnded;
}
@ -609,6 +593,11 @@ namespace ENI2
}
}
private void MenuItem_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
#endregion
#region mouse wheel / zooming events
@ -717,6 +706,6 @@ namespace ENI2
}
#endregion
}
}

50
ENI2/Properties/Resources.Designer.cs generated
View File

@ -70,6 +70,16 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap about {
get {
object obj = ResourceManager.GetObject("about", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -290,6 +300,26 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap document_exchange {
get {
object obj = ResourceManager.GetObject("document_exchange", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap document_into {
get {
object obj = ResourceManager.GetObject("document_into", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -310,6 +340,16 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap document_plain_new {
get {
object obj = ResourceManager.GetObject("document_plain_new", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -380,6 +420,16 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap exit {
get {
object obj = ResourceManager.GetObject("exit", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

15
ENI2/Properties/Resources.resx
View File

@ -1861,4 +1861,19 @@
<data name="textSpecialCaseBREBRV" xml:space="preserve">
<value>At least one of NOA_NOD, AGNT, INFO, SEC, TIEFA hasn't been sent for DEBRE/DEBRV: ({0}) Close anyway?</value>
</data>
<data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="document_exchange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document_exchange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="document_into" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document_into.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="document_plain_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document_plain_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ENI2/Resources/about.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
ENI2/Resources/document_exchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
ENI2/Resources/document_into.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ENI2/Resources/document_plain_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ENI2/Resources/exit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

33
ENI2/SucheControl.xaml
View File

@ -17,7 +17,8 @@
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="75" />
<ColumnDefinition Width="75" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="2*" />
@ -30,19 +31,19 @@
<RowDefinition Height="30" />
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="0" Content="Id" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="1" Content="IMO / ENI No." Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="2" Content="Shipname" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="0" Content="Port of call" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="1" Content="ETA" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="2" Content="Ticket-No." Margin="0,0,10,0"/>
<TextBox Grid.Column="1" Grid.Row="0" Name="textBoxId" VerticalContentAlignment="Center" Margin="2"/>
<TextBox Grid.Column="1" Grid.Row="1" Name="textBoxIMO" VerticalContentAlignment="Center" Margin="2" MaxLength="8"/>
<TextBox Grid.Column="1" Grid.Row="2" Name="textBoxName" VerticalContentAlignment="Center" Margin="2"/>
<TextBox Grid.Column="3" Grid.Row="0" Name="textBoxHafen" VerticalContentAlignment="Center" Margin="2"/>
<Image Grid.Column="0" Grid.RowSpan="3" x:Name="logoImage" HorizontalAlignment="Left" Height="75" Width="75" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp" Margin="2"/>
<Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="0" Content="Id" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="1" Content="IMO / ENI No." Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="2" Content="Shipname" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="0" Content="Port of call" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="1" Content="ETA" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="2" Content="Ticket-No." Margin="0,0,10,0"/>
<TextBox Grid.Column="2" Grid.Row="0" Name="textBoxId" VerticalContentAlignment="Center" Margin="2"/>
<TextBox Grid.Column="2" Grid.Row="1" Name="textBoxIMO" VerticalContentAlignment="Center" Margin="2" MaxLength="8"/>
<TextBox Grid.Column="2" Grid.Row="2" Name="textBoxName" VerticalContentAlignment="Center" Margin="2"/>
<TextBox Grid.Column="4" Grid.Row="0" Name="textBoxHafen" VerticalContentAlignment="Center" Margin="2"/>
<Grid Grid.Column="3" Grid.Row="1" Height="Auto" Margin="2">
<Grid Grid.Column="4" Grid.Row="1" Height="Auto" Margin="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="3*" />
@ -54,9 +55,9 @@
<Label Grid.Column="2" Grid.Row="0" Content="To:" HorizontalAlignment="Left" />
<DatePicker Grid.Column="3" Grid.Row="0" Name="dateTimePickerETATo" VerticalContentAlignment="Center" SelectedDateChanged="etaValueChanged" ContextMenu="{DynamicResource ClearContextMenu}"/>
</Grid>
<TextBox Grid.Column="3" Grid.Row="2" Name="textBoxTicketNr" VerticalContentAlignment="Center" Margin="2"/>
<Button Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="1" Content="Search" Name="buttonSuche" Click="buttonSuche_Click" Margin="2" FontSize="14"/>
<Grid Grid.Column="3" Grid.Row="3">
<TextBox Grid.Column="4" Grid.Row="2" Name="textBoxTicketNr" VerticalContentAlignment="Center" Margin="2"/>
<Button Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="1" Content="Search" Name="buttonSuche" Click="buttonSuche_Click" Margin="2" FontSize="14"/>
<Grid Grid.Column="4" Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />

13
ENI2/SucheControl.xaml.cs
View File

@ -13,6 +13,7 @@ using bsmd.database;
using System.Windows.Data;
using log4net;
using System.Windows.Media.Imaging;
using System.Diagnostics;
namespace ENI2
{
@ -24,6 +25,7 @@ namespace ENI2
#region Fields
private bool efMode = false;
private List<MessageCore> anmeldungen = new List<MessageCore>();
private readonly object searchLock = new object();
private readonly ILog _log = LogManager.GetLogger("SucheControl");
@ -55,6 +57,12 @@ namespace ENI2
cancelItem.Click += CancelItem_Click;
cancelItem.Visibility = Visibility.Collapsed;
this.dataGrid.ContextMenu.Items.Add(cancelItem);
if (Keyboard.IsKeyDown(Key.LeftShift))
{
efMode = true;
logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
}
}
@ -291,5 +299,10 @@ namespace ENI2
#endregion
private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
{
if (efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
else Process.Start("http://www.eureport.de/");
}
}
}