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

Version ENI-2 3.6.9.0,

Browse Source 
Korrekturen an den Detailmasken
This commit is contained in:
Daniel Schick 2017-07-24 15:18:06 +00:00
parent 83722519bd
commit 0b08679de0
24 changed files with 277 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI-2/ENI2/ENI2/App.config
View File

@ -26,12 +26,12 @@
<value>1000</value>
</setting>
<setting name="LockingServerAddress" serializeAs="String">
<!--value>http://192.168.2.4/LockingService/LockingService.svc</value-->
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
<value>http://192.168.2.4/LockingService/LockingService.svc</value>
<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
</setting>
<setting name="ConnectionString" serializeAs="String">
<!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
<value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
<value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
<!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
</setting>
</ENI2.Properties.Settings>
</applicationSettings>

1
ENI-2/ENI2/ENI2/App.xaml.cs
View File

@ -68,6 +68,7 @@ namespace ENI2
CREW.NationalityDict = LocalizedLookup.getNationalities();
STAT.VesselTypeDict = LocalizedLookup.getVesselTypes();
STAT.TransportModeDict = LocalizedLookup.getTransportModes();
HAZ.PackageTypes = LocalizedLookup.getPackageTypes();
// Connect to locking service (if enabled)

7
ENI-2/ENI2/ENI2/DetailBaseControl.cs
View File

@ -232,11 +232,14 @@ namespace ENI2
{
if (((string)o).Contains(cmb.Text, StringComparison.OrdinalIgnoreCase)) result = true;
}
//System.Diagnostics.Trace.WriteLine(string.Format("{0} - {1} - {2}", o, cmb.Text, result));
else if (o is System.Collections.Generic.KeyValuePair<string, string>)
{
if (((System.Collections.Generic.KeyValuePair<string, string>)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase))
result = true;
}
return result;
});
//System.Diagnostics.Trace.WriteLine("---");
itemsViewOriginal.Refresh();
}

84
ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
View File

@ -7,6 +7,7 @@
xmlns:local="clr-namespace:ENI2.DetailViewControls"
xmlns:p="clr-namespace:ENI2.Properties"
xmlns:enictrl="clr-namespace:ENI2.Controls"
xmlns:util="clr-namespace:ENI2.Util"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1024">
@ -29,7 +30,7 @@
<Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
<CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival, Converter={util:InverseBooleanConverter}}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
<CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center"/>
<CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center"/>
<ComboBox Name="comboBoxVesselClass" Grid.Row="1" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass}"/>
@ -38,23 +39,42 @@
<enictrl:ENIDataGrid x:Name="dataGridIMDGItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding PortOfItineraryName}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textPackingGroup}" Binding="{Binding PackingGroup}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textProperShippingName}" Binding="{Binding ProperShippingName}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textIMOClassDivision}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textTechnicalName}" Binding="{Binding TechnicalName}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textNetExplosiveMass}" Binding="{Binding NetExplosiveMass_KGM}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textNetExplosiveMass}" Binding="{Binding NetExplosiveMass_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textRadioNuclideName}" Binding="{Binding Class7NuclideName}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textMaxActivity}" Binding="{Binding Class7MaxActivity_BQL}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textMaxActivity}" Binding="{Binding Class7MaxActivity_BQL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textCategory}" Binding="{Binding Class7Category}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textTransportIndex}" Binding="{Binding Class7TransportIndex}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textCriticalSafetyIndex}" Binding="{Binding Class7CSI}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textSubsidiaryRisk}" Binding="{Binding SubsidiaryRiskText}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textControlTemperature}" Binding="{Binding ControlTemperature_CEL}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textEmergencyTemperature}" Binding="{Binding EmergencyTemperature_CEL}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textControlTemperature}" Binding="{Binding ControlTemperature_CEL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textEmergencyTemperature}" Binding="{Binding EmergencyTemperature_CEL, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textMarinePollutant}" Binding="{Binding Class7Category}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textNumberOfPackages}" Binding="{Binding NumberOfPackages}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textPackageType}" Binding="{Binding PackageType}" IsReadOnly="True" Width="80" />
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textLimitedQuantity}" Binding="{Binding LimitedQuantities}" IsReadOnly="True" Width="80" />
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textExceptedQuantities}" Binding="{Binding ExceptedQuantities}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textNetQuantity}" Binding="{Binding NetQuantity_KGM, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textExceptedQuantities}" Binding="{Binding ExceptedQuantities, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textCargoVolume}" Binding="{Binding Volume_MTQ, StringFormat={}{0:N2}}" IsReadOnly="True" Width="80" />
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textGeneralCargo}" Binding="{Binding GeneralCargoIBC}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textContainerNo}" Binding="{Binding ContainerNumber}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textVehicleLicensePlate}" Binding="{Binding VehicleLicenseNumber}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textSubsidiaryRisk}" Binding="{Binding SubsidiaryRiskText}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionBay}" Binding="{Binding Bay}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionRow}" Binding="{Binding Row}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textContainerPositionTier}" Binding="{Binding Tier}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="80" />
</DataGrid.Columns>
</enictrl:ENIDataGrid>
</TabItem>
@ -62,9 +82,18 @@
<enictrl:ENIDataGrid x:Name="dataGridIBCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
<DataGridTextColumn Binding="{Binding PortOfItineraryLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay}" IsReadOnly="True" Width="0.6*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textProductName}" Binding="{Binding ProductName}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPollutionCategory}" Binding="{Binding PollutionCategoryDisplay}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textRisks}" Binding="{Binding HazardsDisplay}" IsReadOnly="True" Width="auto" />
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textColumsOfIBC}" Binding="{Binding SpecRef15_19}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint_CEL}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
</DataGrid.Columns>
</enictrl:ENIDataGrid>
</TabItem>
@ -72,9 +101,15 @@
<enictrl:ENIDataGrid x:Name="dataGridIGCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
<DataGridTextColumn Binding="{Binding PortOfItineraryLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay}" IsReadOnly="True" Width="0.6*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textProductName}" Binding="{Binding ProductName}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textIMOClassSubclass}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
</DataGrid.Columns>
</enictrl:ENIDataGrid>
</TabItem>
@ -82,9 +117,16 @@
<enictrl:ENIDataGrid x:Name="dataGridIMSBCItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
<DataGridTextColumn Binding="{Binding PortOfItineraryLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay}" IsReadOnly="True" Width="0.6*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textBulkCargoShippingName}" Binding="{Binding BulkCargoShippingName}" IsReadOnly="True" Width="auto" />
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textMaterialHazard}" Binding="{Binding MHB}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textUNNumber}" Binding="{Binding UNNumber}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textIMOClassSubclass}" Binding="{Binding IMOClass}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
</DataGrid.Columns>
</enictrl:ENIDataGrid>
</TabItem>
@ -92,9 +134,15 @@
<enictrl:ENIDataGrid x:Name="dataGridMARPOLItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static p:Resources.textPortname}" Binding="{Binding PortOfItineraryName, Mode=TwoWay}" IsReadOnly="True" Width="0.3*" />
<DataGridTextColumn Binding="{Binding PortOfItineraryLocode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textETA}" Binding="{Binding PortOfItineraryETA, Mode=TwoWay}" IsReadOnly="True" Width="0.6*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdentifier}" Binding="{Binding Identifier}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding Name}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textFlashpointInformation}" Binding="{Binding FlashpointInformationDisplay}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textFlashpoint}" Binding="{Binding Flashpoint}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textQuantity}" Binding="{Binding Quantity_KGM, StringFormat={}{0:N3}}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textStowagePosition}" Binding="{Binding StowagePosition}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfLoading}" Binding="{Binding PortOfLoading}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfDischarge}" Binding="{Binding PortOfDischarge}" IsReadOnly="True" Width="auto" />
<DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding Remarks}" IsReadOnly="True" Width="auto" />
</DataGrid.Columns>
</enictrl:ENIDataGrid>
</TabItem>

8
ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
View File

@ -6,6 +6,7 @@ using System.Windows;
using bsmd.database;
using ENI2.EditControls;
using ENI2.Util;
namespace ENI2.DetailViewControls
{
@ -41,10 +42,14 @@ namespace ENI2.DetailViewControls
foreach (Message aMessage in this.Messages)
{
if (IsDeparture)
{
if (aMessage.MessageNotificationClass == Message.NotificationClass.HAZD) { this._hazMessage = aMessage; this.ControlMessages.Add(aMessage); }
}
else
{
if (aMessage.MessageNotificationClass == Message.NotificationClass.HAZA) { this._hazMessage = aMessage; this.ControlMessages.Add(aMessage); }
}
}
#region HAZ
@ -66,6 +71,9 @@ namespace ENI2.DetailViewControls
}
this.haz = haz;
this.comboBoxVesselClass.ItemsSource = GlobalStructures.vesselClasses;
this.groupBoxHAZ.DataContext = haz;
this.dataGridIMDGItems.Initialize();

5
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,8 +35,8 @@
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>5</ApplicationRevision>
<ApplicationVersion>3.6.7.%2a</ApplicationVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>3.6.9.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
@ -290,6 +290,7 @@
<Compile Include="Util\BoolToVisibilityConverter.cs" />
<Compile Include="Util\DatabaseEntityWatchdog.cs" />
<Compile Include="Util\GlobalStructures.cs" />
<Compile Include="Util\InverseBooleanConverter.cs" />
<Compile Include="VorgaengeControl.xaml.cs">
<DependentUpon>VorgaengeControl.xaml</DependentUpon>
</Compile>

6
ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml
View File

@ -45,15 +45,15 @@
<TextBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxIdentifier" MaxLength="40" Margin="2" />
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxProductName" MaxLength="255" Margin="2" />
<ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxPollutionCategory" Margin="2" />
<ComboBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Name="comboBoxFlashpointInformation" Margin="2" />
<ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxPollutionCategory" Margin="2" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
<ComboBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Name="comboBoxFlashpointInformation" Margin="2" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
<xctk:DoubleUpDown Name="doubleUpDownQuantity" Grid.Row="4" Grid.Column="1" Margin="2" FormatString="N3" ShowButtonSpinner="False" />
<Label Grid.Row="4" Grid.Column="2" Content="kg" />
<enictrl:LocodeControl x:Name="locodePortOfLoading" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" />
<TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" Name="textBoxRemarks" Margin="2" MaxLength="255" />
<CheckBox Grid.Row="1" Grid.Column="4" Name="checkBoxSpecRef15_19" VerticalAlignment="Center" Margin="2" />
<ComboBox Grid.Row="2" Grid.Column="4" Name="comboBoxRisks" Margin="2" />
<ComboBox Grid.Row="2" Grid.Column="4" Name="comboBoxRisks" Margin="2" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
<TextBox Name="textBoxFlashpoint" Grid.Row="3" Grid.Column="4" Margin="2" MaxLength="11" />
<Label Grid.Row="3" Grid.Column="5" Content="°C" />
<TextBox Name="textBoxStowagePosition" Grid.Row="4" Grid.Column="4" Grid.ColumnSpan="2" MaxLength="24" Margin="2"/>

9
ENI-2/ENI2/ENI2/EditControls/EditIBCDialog.xaml.cs
View File

@ -34,11 +34,14 @@ namespace ENI2.EditControls
this.checkBoxSpecRef15_19.IsChecked = this.IBC.SpecRef15_19;
this.comboBoxFlashpointInformation.ItemsSource = GlobalStructures.flashpointInformations;
this.comboBoxFlashpointInformation.ItemsSource = IBCPosition.flashpointInformations;
this.comboBoxFlashpointInformation.KeyUp += ComboBox_KeyUp;
this.comboBoxFlashpointInformation.SelectedIndex = this.IBC.FlashpointInformation ?? -1;
this.comboBoxPollutionCategory.ItemsSource = GlobalStructures.pollutionCategories;
this.comboBoxPollutionCategory.ItemsSource = IBCPosition.pollutionCategories;
this.comboBoxPollutionCategory.KeyUp += ComboBox_KeyUp;
this.comboBoxPollutionCategory.SelectedIndex = this.IBC.PollutionCategory ?? -1;
this.comboBoxRisks.ItemsSource = GlobalStructures.hazards;
this.comboBoxRisks.ItemsSource = IBCPosition.hazards;
this.comboBoxRisks.KeyUp += ComboBox_KeyUp;
this.comboBoxRisks.SelectedIndex = this.IBC.Hazards ?? -1;
this.doubleUpDownQuantity.Value = this.IBC.Quantity_KGM;

4
ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml
View File

@ -105,7 +105,7 @@ Copyright (c) 2017 schick Informatik
<xctk:DoubleUpDown Grid.Row="5" Grid.Column="4" Name="decimalUpDownCSI" Minimum="0" Maximum="100" Margin="2" FormatString="N2" ShowButtonSpinner="False" />
<xctk:DoubleUpDown Grid.Row="6" Grid.Column="4" Name="decimalUpDownEmergencyTemperature" Margin="2" FormatString="N2" ShowButtonSpinner="False" />
<Label Grid.Row="6" Grid.Column="5" Content="°C" />
<TextBox Grid.Row="7" Grid.Column="4" Name="textBoxPackageType" MaxLength="100" Margin="2" />
<ComboBox Name="comboBoxPackageType" Grid.Column="4" Grid.Row="7" Grid.ColumnSpan="2" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
<CheckBox Grid.Row="8" Grid.Column="4" Name="checkBoxExceptedQuantities" VerticalAlignment="Center" Margin="2" />
<xctk:DoubleUpDown Grid.Row="9" Grid.Column="4" Name="decimalUpDownGrossQuantity" Minimum="0" FormatString="N3" Margin="2" ShowButtonSpinner="False" />
<Label Grid.Row="9" Grid.Column="5" Content="kg" />
@ -116,7 +116,7 @@ Copyright (c) 2017 schick Informatik
<enictrl:LocodeControl Grid.Row="10" Grid.Column="7" x:Name="locodeControlPortOfDischarge" Grid.ColumnSpan="2" />
<TextBox Grid.Row="11" Grid.Column="7" Width="auto" Name="textBoxContainerPositionTier" MaxLength="2" Margin="2" />
<ComboBox Grid.Row="1" Grid.Column="7" Name="comboBoxPackingGroup" Margin="2" />
<ComboBox Grid.Row="1" Grid.Column="7" Name="comboBoxPackingGroup" Margin="2" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
<CheckBox Grid.Row="2" Grid.Column="7" Name="checkBoxMarinePollutant" VerticalAlignment="Top" Margin="2,6,0,0" />
<xctk:IntegerUpDown Grid.Row="3" Grid.Column="7" Name="integerUpDownCategory" Maximum="3" Minimum="1" Margin="2" ShowButtonSpinner="False" />
<TextBox Grid.Row="4" Grid.Column="7" Name="textBoxSubsidiaryRisks" Margin="2" Grid.ColumnSpan="2" Grid.RowSpan="2" />

7
ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs
View File

@ -34,7 +34,6 @@ namespace ENI2.EditControls
this.textBoxFlashpoint.Text = this.IMDG.Flashpoint_CEL;
this.textBoxIdentifier.Text = this.IMDG.Identifier;
this.textBoxIMOClass.Text = this.IMDG.IMOClass;
this.textBoxPackageType.Text = this.IMDG.PackageType;
this.textBoxProperShippingName.Text = this.IMDG.ProperShippingName;
this.textBoxRemarks.Text = this.IMDG.Remarks;
this.textBoxStowagePosition.Text = this.IMDG.StowagePosition;
@ -60,7 +59,11 @@ namespace ENI2.EditControls
this.checkBoxLimitedQuantities.IsChecked = this.IMDG.LimitedQuantities;
this.checkBoxMarinePollutant.IsChecked = this.IMDG.MarinePollutant;
this.comboBoxPackageType.ItemsSource = HAZ.PackageTypes;
this.comboBoxPackageType.KeyUp += ComboBox_KeyUp;
this.comboBoxPackageType.SelectedValue = this.IMDG.PackageType;
this.comboBoxPackingGroup.ItemsSource = GlobalStructures.packingGroups;
this.comboBoxPackingGroup.KeyUp += ComboBox_KeyUp;
this.comboBoxPackingGroup.SelectedIndex = (int) (this.IMDG.PackingGroup ?? -1);
this.locodeControlPortOfDischarge.LocodeValue = this.IMDG.PortOfDischarge;
@ -81,7 +84,7 @@ namespace ENI2.EditControls
this.IMDG.Flashpoint_CEL = this.textBoxFlashpoint.Text.Trim();
this.IMDG.Identifier = this.textBoxIdentifier.Text.Trim();
this.IMDG.IMOClass = this.textBoxIMOClass.Text.Trim();
this.IMDG.PackageType = this.textBoxPackageType.Text.Trim();
this.IMDG.PackageType = this.comboBoxPackageType.SelectedValue as string;
this.IMDG.ProperShippingName = this.textBoxProperShippingName.Text.Trim();
this.IMDG.Remarks = this.textBoxRemarks.Text.Trim();
this.IMDG.StowagePosition = this.textBoxStowagePosition.Text.Trim();

2
ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml
View File

@ -39,7 +39,7 @@
<TextBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Name="textBoxIdentifier" MaxLength="40" Margin="2" />
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Name="textBoxName" MaxLength="255" Margin="2" />
<ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxFlashpointInformation" Margin="2" />
<ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxFlashpointInformation" Margin="2" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False"/>
<TextBox Grid.Row="2" Grid.Column="4" Name="textBoxFlashpoint" MaxLength="10" Margin="2" />
<Label Grid.Row="2" Grid.Column="5" Content="°C" />
<xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownQuantity" Margin="2" FormatString="N3" ShowButtonSpinner="False" />

3
ENI-2/ENI2/ENI2/EditControls/EditMarpolDialog.xaml.cs
View File

@ -32,7 +32,8 @@ namespace ENI2.EditControls
this.textBoxRemarks.Text = this.MARPOL.Remarks;
this.textBoxStowagePosition.Text = this.MARPOL.StowagePosition;
this.comboBoxFlashpointInformation.ItemsSource = GlobalStructures.flashpointInformations;
this.comboBoxFlashpointInformation.ItemsSource = IBCPosition.flashpointInformations;
this.comboBoxFlashpointInformation.KeyUp += ComboBox_KeyUp;
this.comboBoxFlashpointInformation.SelectedIndex = (this.MARPOL.FlashpointInformation == null) ? -1 : ((int)this.MARPOL.FlashpointInformation);
this.doubleUpDownQuantity.Value = this.MARPOL.Quantity_KGM;
this.locodeControlPortOfDischarge.LocodeValue = this.MARPOL.PortOfDischarge;

8
ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml.cs
View File

@ -19,6 +19,13 @@ namespace ENI2.EditControls
InitializeComponent();
Loaded += EditPortOfCallLast30DaysDialog_Loaded;
AddClicked += () => { this.locodeControlPortName.Focus(); };
this.checkBoxCrewMembersJoined.Checked += CheckBoxCrewMembersJoined_Checked;
this.checkBoxCrewMembersJoined.Unchecked += CheckBoxCrewMembersJoined_Checked;
}
private void CheckBoxCrewMembersJoined_Checked(object sender, RoutedEventArgs e)
{
this.textBoxCrewMemberNames.IsEnabled = this.checkBoxCrewMembersJoined.IsChecked ?? false;
}
public PortOfCallLast30Days PocLast30Days { get; set; }
@ -32,6 +39,7 @@ namespace ENI2.EditControls
this.datePickerATAPortOfCall.SelectedDate = this.PocLast30Days.PortOfCallLast30DaysDateOfDeparture;
this.checkBoxCrewMembersJoined.IsChecked = this.PocLast30Days.PortOfCallLast30DaysCrewMembersJoined;
this.textBoxCrewMemberNames.Text = this.PocLast30Days.CrewMembersJoinedText;
this.textBoxCrewMemberNames.IsEnabled = this.PocLast30Days.PortOfCallLast30DaysCrewMembersJoined ?? false;
this.AddVisible = true;
}

8
ENI-2/ENI2/ENI2/EditControls/EditTOWDialog.xaml
View File

@ -47,12 +47,12 @@
<TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxName" Margin="2" MaxLength="100" />
<TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxPurposeOfCall" Margin="2" MaxLength="100" />
<xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownDraught" Margin="2" />
<xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownLength" Margin="2" />
<xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownDraught" Margin="2" ShowButtonSpinner="False" FormatString="N1" />
<xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownLength" Margin="2" ShowButtonSpinner="False" FormatString="N2"/>
<TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxRemarks" Margin="2" MaxLength="100" />
<ComboBox Grid.Row="1" Grid.Column="4" Name="comboBoxFlag" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
<xctk:IntegerUpDown Grid.Row="2" Grid.Column="4" Name="integerUpDownGrossTonnage" Margin="2" />
<xctk:DoubleUpDown Grid.Row="3" Grid.Column="4" Name="doubleUpDownBeam" Margin="2" />
<xctk:IntegerUpDown Grid.Row="2" Grid.Column="4" Name="integerUpDownGrossTonnage" Margin="2" ShowButtonSpinner="False" />
<xctk:DoubleUpDown Grid.Row="3" Grid.Column="4" Name="doubleUpDownBeam" Margin="2" ShowButtonSpinner="False" FormatString="N2"/>
<TextBlock Text="Operator" FontWeight="Bold" FontSize="10" Grid.Row="5" Grid.Column="0" />

18
ENI-2/ENI2/ENI2/LocalizedLookup.cs
View File

@ -97,6 +97,24 @@ namespace ENI2
return result;
}
public static Dictionary<string, string> getPackageTypes()
{
Dictionary<string, string> result = new Dictionary<string, string>();
string query = string.Format("SELECT Code, Text FROM PackageTypes ORDER BY Code");
SQLiteCommand cmd = new SQLiteCommand(query, _con);
IDataReader reader = cmd.ExecuteReader();
while (reader.Read())
{
string code = null;
string name = null;
if (!reader.IsDBNull(0)) code = reader.GetString(0);
if (!reader.IsDBNull(1)) name = reader.GetString(1);
if ((code != null) && (name != null))
result[code] = string.Format("{0} {1}", code, name);
}
reader.Close();
return result;
}
public static Dictionary<string, string> getTransportModes()
{

21
ENI-2/ENI2/ENI2/Util/GlobalStructures.cs
View File

@ -76,27 +76,6 @@ namespace ENI2.Util
"III"
};
public static string[] pollutionCategories =
{
"X",
"Y",
"Z",
"OS"
};
public static string[] hazards =
{
"P",
"S",
"S/P"
};
public static string[] flashpointInformations =
{
"Not flammable",
"Above 60°",
"Less than 60°"
};
public static List<string> EdiCodes
{

52
ENI-2/ENI2/ENI2/Util/InverseBooleanConverter.cs Normal file
View File

@ -0,0 +1,52 @@
// Copyright (c) 2017 schick Informatik
// Description: Bool'sche Werte für Bindings invertieren
//
using System;
using System.Windows.Data;
using System.Windows.Markup;
namespace ENI2.Util
{
[ValueConversion(typeof(bool?), typeof(bool?))]
public class InverseBooleanConverter : MarkupExtension, IValueConverter
{
private static InverseBooleanConverter _converter = null;
public override object ProvideValue(IServiceProvider serviceProvider)
{
if (_converter == null)
{
_converter = new InverseBooleanConverter();
}
return _converter;
}
#region IValueConverter Members
public object Convert(object value, Type targetType, object parameter,
System.Globalization.CultureInfo culture)
{
if (targetType != typeof(bool?))
throw new InvalidOperationException("The target must be a boolean");
if (!((bool?)value).HasValue) return null;
return !(bool?)value;
}
public object ConvertBack(object value, Type targetType, object parameter,
System.Globalization.CultureInfo culture)
{
if (targetType != typeof(bool?))
throw new InvalidOperationException("The target must be a boolean");
if (!((bool?)value).HasValue) return null;
return !(bool?)value;
}
#endregion
}
}

BIN
Stundensheet.xlsx
View File

Binary file not shown.

5
nsw/Source/bsmd.database/HAZ.cs
View File

@ -97,6 +97,11 @@ namespace bsmd.database
}
}
/// <summary>
/// Hilfsstruktur für Packagetype Darstellung (IMDG) im ENI-2
/// </summary>
public static Dictionary<string, string> PackageTypes { get; set; }
#endregion
#region DatabaseEntity implementation

65
nsw/Source/bsmd.database/IBCPosition.cs
View File

@ -17,11 +17,42 @@ namespace bsmd.database
{
public class IBCPosition : DatabaseEntity, ISublistElement
{
#region Construction
public IBCPosition()
{
this.tablename = "[dbo].[IBCPosition]";
}
#endregion
#region static lookup values
public static string[] pollutionCategories =
{
"X",
"Y",
"Z",
"OS"
};
public static string[] hazards =
{
"P",
"S",
"S/P"
};
public static string[] flashpointInformations =
{
"Not flammable",
"Above 60°",
"Less than 60°"
};
#endregion
#region Properties
public HAZ HAZ { get; set; }
@ -29,15 +60,49 @@ namespace bsmd.database
[Validation(ValidationCode.NOT_NULL)]
[MaxLength(255)]
public string ProductName { get; set; }
[ShowReport]
[Validation(ValidationCode.NOT_NULL)]
public byte? PollutionCategory { get; set; }
public string PollutionCategoryDisplay
{
get
{
if (this.PollutionCategory.HasValue && (this.PollutionCategory.Value >= 0) && (this.PollutionCategory.Value < pollutionCategories.Length))
return pollutionCategories[this.PollutionCategory.Value];
return "";
}
}
[ShowReport]
public byte? Hazards { get; set; }
public string HazardsDisplay
{
get
{
if (this.Hazards.HasValue && (this.Hazards.Value >= 0) && (this.Hazards.Value < hazards.Length))
return hazards[this.Hazards.Value];
return "";
}
}
[ShowReport]
[Validation(ValidationCode.NOT_NULL)]
public byte? FlashpointInformation { get; set; }
public string FlashpointInformationDisplay
{
get
{
if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value >= 0) && (this.FlashpointInformation.Value < flashpointInformations.Length))
return flashpointInformations[this.FlashpointInformation.Value];
return "";
}
}
[ShowReport]
[MaxLength(11)]
public string Flashpoint_CEL { get; set; }

10
nsw/Source/bsmd.database/MARPOL_Annex_I_Position.cs
View File

@ -35,6 +35,16 @@ namespace bsmd.database
[Validation(ValidationCode.NOT_NULL)]
public byte? FlashpointInformation { get; set; }
public string FlashpointInformationDisplay
{
get
{
if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value >= 0) && (this.FlashpointInformation.Value < IBCPosition.flashpointInformations.Length))
return IBCPosition.flashpointInformations[this.FlashpointInformation.Value];
return "";
}
}
[ShowReport]
[MaxLength(10)]
public string Flashpoint_CEL { get; set; }

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.6.8")]
[assembly: AssemblyInformationalVersion("3.6.9")]
[assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
[assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("3.6.8.*")]
[assembly: AssemblyVersion("3.6.9.*")]

BIN
nsw/Source/misc/db.sqlite
View File

Binary file not shown.