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

Korrekturen gefixt

Browse Source
This commit is contained in:
Daniel Schick 2023-02-24 18:34:34 +01:00
parent b175b17fec
commit e0c85b6576
6 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ENI2/Controls/MaerskListControl.xaml
View File

@ -32,13 +32,12 @@
<ColumnDefinition Width="40" /> <ColumnDefinition Width="40" />
<ColumnDefinition Width="120" /> <ColumnDefinition Width="120" />
<ColumnDefinition Width="50" /> <ColumnDefinition Width="50" />
<ColumnDefinition Width="50" /> <ColumnDefinition Width="30" />
<ColumnDefinition Width="120" /> <ColumnDefinition Width="120" />
<ColumnDefinition Width="80" /> <ColumnDefinition Width="80" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="80" /> <ColumnDefinition Width="80" />
<ColumnDefinition Width="80" /> <ColumnDefinition Width="80" />
<ColumnDefinition Width="30" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Content="From" Grid.Column="0" /> <Label Content="From" Grid.Column="0" />
<xctk:DateTimePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" Format="ShortDate" /> <xctk:DateTimePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" Format="ShortDate" />
@ -50,7 +49,7 @@
<Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" /> <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
<Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" /> <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
<Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" /> <Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" />
<local:BusyControl x:Name="busyControl" Grid.Column="11" /> <local:BusyControl x:Name="busyControl" Grid.Column="5" />
</Grid> </Grid>
<local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False" SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False"
@ -84,18 +83,18 @@
</local:ENIDataGrid.RowStyle> </local:ENIDataGrid.RowStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="Status" Binding="{Binding Status}" IsReadOnly="True" /> <DataGridTextColumn Header="Status" Binding="{Binding Status}" IsReadOnly="True" />
<DataGridTextColumn Header="Col A" Binding="{Binding ColA}" IsReadOnly="True" /> <DataGridTextColumn Header="ETA" Binding="{Binding ColA}" IsReadOnly="True" />
<DataGridTextColumn Header="Col B" Binding="{Binding ColB}" IsReadOnly="True" /> <DataGridTextColumn Header="ETD" Binding="{Binding ColB}" IsReadOnly="True" />
<DataGridTextColumn Header="Ship. Area" Binding="{Binding ColC}" IsReadOnly="True" /> <DataGridTextColumn Header="Rotation name" Binding="{Binding ColC}" IsReadOnly="True" />
<DataGridTextColumn Header="Col D" Binding="{Binding ColD}" IsReadOnly="True" /> <DataGridTextColumn Header="Vessel code" Binding="{Binding ColD}" IsReadOnly="True" />
<DataGridTextColumn Header="Name" Binding="{Binding ColE}" IsReadOnly="True" /> <DataGridTextColumn Header="Vessel name" Binding="{Binding ColE}" IsReadOnly="True" />
<DataGridTextColumn Header="IMO" Binding="{Binding ColF}" IsReadOnly="True" /> <DataGridTextColumn Header="IMO" Binding="{Binding ColF}" IsReadOnly="True" />
<DataGridTextColumn Header="Voy-No in" Binding="{Binding ColG}" IsReadOnly="True" /> <DataGridTextColumn Header="Arr voy" Binding="{Binding ColG}" IsReadOnly="True" />
<DataGridTextColumn Header="Voy-No out" Binding="{Binding ColH}" IsReadOnly="True" /> <DataGridTextColumn Header="Dep voy" Binding="{Binding ColH}" IsReadOnly="True" />
<DataGridTextColumn Header="Terminal" Binding="{Binding ColI}" IsReadOnly="True" /> <DataGridTextColumn Header="Terminal name" Binding="{Binding ColI}" IsReadOnly="True" />
<DataGridTextColumn Header="Oper" Binding="{Binding ColJ}" IsReadOnly="True" /> <DataGridTextColumn Header="Operator code" Binding="{Binding ColJ}" IsReadOnly="True" />
<DataGridTextColumn Header="ETA" Binding="{Binding ColK}" IsReadOnly="True" /> <DataGridTextColumn Header="Pro arr" Binding="{Binding ColK}" IsReadOnly="True" />
<DataGridTextColumn Header="ETD" Binding="{Binding ColL}" IsReadOnly="True" /> <DataGridTextColumn Header="Pro dep" Binding="{Binding ColL}" IsReadOnly="True" />
<DataGridTextColumn Header="Id" Binding="{Binding ColM}" IsReadOnly="True" /> <DataGridTextColumn Header="Id" Binding="{Binding ColM}" IsReadOnly="True" />
<DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" x:Name="gridColumnRemark" /> <DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" x:Name="gridColumnRemark" />

18
ENI2/Controls/MaerskListControl.xaml.cs
View File

@ -208,7 +208,7 @@ namespace ENI2.Controls
private async void PerformSearch() private async void PerformSearch()
{ {
busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY; busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>(); Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
@ -221,7 +221,7 @@ namespace ENI2.Controls
// suche auslösen // suche auslösen
List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict); List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
// alle anderen Häfen weg // alle anderen Häfen weg
searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals(PortLocode))); searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals(PortLocode)));
@ -239,6 +239,7 @@ namespace ENI2.Controls
} }
} }
this.SortItemSource();
this.dataGridPOCores.SelectedItem = null; this.dataGridPOCores.SelectedItem = null;
busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL; busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
} }
@ -258,6 +259,15 @@ namespace ENI2.Controls
return null; return null;
} }
private void SortItemSource()
{
ObservableCollection<MaerskData> temp;
temp = new ObservableCollection<MaerskData>(this.maerskDataList.OrderBy(p => p.ColA));
this.maerskDataList.Clear();
foreach (MaerskData md in temp)
this.maerskDataList.Add(md);
}
#endregion #endregion
#region button event handler #region button event handler
@ -359,8 +369,7 @@ namespace ENI2.Controls
if (importData.Count > 0) if (importData.Count > 0)
{ {
busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY; busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
importData.Sort();
foreach (MaerskData md in importData) foreach (MaerskData md in importData)
{ {
@ -384,6 +393,7 @@ namespace ENI2.Controls
maerskDataList.Add(md); maerskDataList.Add(md);
} }
} }
this.SortItemSource();
busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL; busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
} }

2
ENI2/ENI2.csproj
View File

@ -36,7 +36,7 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>6</ApplicationRevision> <ApplicationRevision>7</ApplicationRevision>
<ApplicationVersion>7.9.0.%2a</ApplicationVersion> <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>

4
ENI2/EditControls/CopyDeclarationDialog.xaml.cs
View File

@ -102,6 +102,10 @@ namespace ENI2.EditControls
{ {
this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH; this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
} }
else
{
this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
}
} }
private void doubleUpDownIMO_ValueChanged(object sender, System.Windows.RoutedPropertyChangedEventArgs<object> e) private void doubleUpDownIMO_ValueChanged(object sender, System.Windows.RoutedPropertyChangedEventArgs<object> e)

11
ENI2/EditControls/NewWithIdDialog.xaml.cs
View File

@ -37,6 +37,9 @@ namespace ENI2.EditControls
this.comboBoxInitialHIS.ItemsSource = comboDataSource; this.comboBoxInitialHIS.ItemsSource = comboDataSource;
this.comboBoxInitialHIS.SelectedIndex = 0; this.comboBoxInitialHIS.SelectedIndex = 0;
} }
public bool ValidId { get; set; } public bool ValidId { get; set; }
@ -54,6 +57,14 @@ namespace ENI2.EditControls
private void textBoxVisitTransitId_TextChanged(object sender, TextChangedEventArgs e) private void textBoxVisitTransitId_TextChanged(object sender, TextChangedEventArgs e)
{ {
this.CheckComplete(); this.CheckComplete();
if(textBoxVisitTransitId.Text.StartsWith("DEBRE") || textBoxVisitTransitId.Text.StartsWith("DEBHV"))
{
this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
}
else
{
this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
}
} }
private void CheckComplete() private void CheckComplete()

4
ENI2/EditControls/VisitIdDialog.xaml.cs
View File

@ -101,6 +101,10 @@ namespace ENI2.EditControls
{ {
this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH; this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
} }
else
{
this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
}
} }
private void datePickerETA_SelectedDateChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) private void datePickerETA_SelectedDateChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)