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

Korrekturpunkte 5.0.9 in Bearbeitung / Zwischenstand

Browse Source
This commit is contained in:
Daniel Schick 2018-06-06 05:26:18 +00:00
parent ad0b1f9e4f
commit ca9e22305e
17 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
View File

@ -372,6 +372,14 @@ namespace ENI2
message.SaveElements();
}
message.IsDirty = false;
if(message.MessageNotificationClass == Message.NotificationClass.ATA)
{
DetailBaseControl currentControl = this.detailView.Children[0] as DetailBaseControl;
// ggf. hat sich die Ticketnr geändert..
DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);
}
}
}

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

@ -21,20 +21,22 @@
<ColumnDefinition Width="2*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="28" />
<RowDefinition Height="28" />
<RowDefinition Height="28" />
<RowDefinition Height="10" />
<RowDefinition Height="400" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label Content="{x:Static p:Resources.textDangerousGoodsOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<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, 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 x:Name="comboBoxVesselClass" Grid.Row="1" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
<TabControl Name="tabControlPositions" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="5">
<TextBlock Name="textBlockMessageClass" FontWeight="DemiBold" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" />
<Label Content="{x:Static p:Resources.textDangerousGoodsOnBoard}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival, Converter={util:InverseBooleanConverter}}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
<CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center"/>
<CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center"/>
<ComboBox x:Name="comboBoxVesselClass" Grid.Row="2" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
<TabControl Name="tabControlPositions" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="5">
<TabItem Header="{x:Static p:Resources.textIMDGItems}" Name="tabIMDGItems">
<enictrl:ENIDataGrid x:Name="dataGridIMDGItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
AutoGenerateColumns="False" Margin="0,5,0,0">

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

@ -74,6 +74,7 @@ namespace ENI2.DetailViewControls
}
}
}
this.textBlockMessageClass.Text = IsDeparture ? "HAZD" : "HAZA";
}
#region HAZ

2
ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
View File

@ -48,7 +48,7 @@
<Label Content="{x:Static p:Resources.textLastExpandedInspection }" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<DatePicker Grid.Column="1" Grid.Row="7" Name="datePickerLastExpandedInspection" VerticalAlignment="Center" SelectedDate="{Binding DateOfLastExpandedInspection, Mode=TwoWay}" Margin="2,2,2,2" />
<Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
<xctk:IntegerUpDown Grid.Row="8" Grid.Column="1" Name="integerUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
<xctk:DoubleUpDown Grid.Row="8" Grid.Column="1" Name="doubleUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" FormatString="N2" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
</Grid>
</ScrollViewer>
</GroupBox>

2
ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
View File

@ -47,7 +47,7 @@ namespace ENI2.DetailViewControls
this.RegisterTextboxChange(this.textBoxPlannedOperations, Message.NotificationClass.PRE72H);
this.RegisterTextboxChange(this.textBoxPlannedWorks, Message.NotificationClass.PRE72H);
this.RegisterDatePickerChange(this.datePickerLastExpandedInspection, Message.NotificationClass.PRE72H);
this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);
this.RegisterDoubleUpDownChange(this.doubleUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);
this.checkBoxTanker.Checked += CheckBoxTanker_Checked;
this.checkBoxTanker.Unchecked += CheckBoxTanker_Checked;
}

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

@ -122,6 +122,7 @@
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="UIAutomationProvider" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />

10
ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
View File

@ -8,17 +8,17 @@
xmlns:enictrl="clr-namespace:ENI2.Controls"
xmlns:p="clr-namespace:ENI2.Properties"
mc:Ignorable="d"
Title="{x:Static p:Resources.textPortCall}" Height="220" Width="450" WindowStyle="SingleBorderWindow" Background="AliceBlue">
Title="{x:Static p:Resources.textPortCall}" Height="300" Width="550" WindowStyle="SingleBorderWindow" Background="AliceBlue">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="28" />
<RowDefinition Height="28" />
<RowDefinition Height="28" />
<RowDefinition Height="56" />
<RowDefinition Height="136" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="3*" />
</Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" />
<Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textATDPortOfCall}" />
@ -27,6 +27,6 @@
<enictrl:LocodeControl Grid.Column="1" Grid.Row="0" x:Name="locodeControlPortName" />
<DatePicker Name="datePickerATAPortOfCall" Grid.Column="1" Grid.Row="1" Margin="2"/>
<CheckBox Name="checkBoxCrewMembersJoined" VerticalContentAlignment="Center" Grid.Column="1" Grid.Row="2" />
<TextBox Name="textBoxCrewMemberNames" Grid.Column="1" Grid.Row="3" Margin="2" />
<TextBox Name="textBoxCrewMemberNames" Grid.Column="1" Grid.Row="3" Margin="2" TextWrapping="Wrap"/>
</Grid>
</enictrl:EditWindowBase>

1
ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml.cs
View File

@ -63,6 +63,7 @@ namespace ENI2.EditControls
this.ShipToShipActivity.ShipToShipActivityDateFrom = this.datePickerFrom.SelectedDate;
this.ShipToShipActivity.ShipToShipActivityDateTo = this.datePickerTo.SelectedDate;
// this.ShipToShipActivity.ShipToShipActivityType = this.textBoxActivityType.Text.Trim();
if(this.comboBoxActivityType.SelectedValue != null)
this.ShipToShipActivity.ShipToShipActivityTypeCode = (int) this.comboBoxActivityType.SelectedValue;
this.ShipToShipActivity.ShipToShipActivitySecurityMattersToReport = this.textBoxSecurityMatters.Text.Trim();
}

BIN
Stundensheet.xlsx
View File

Binary file not shown.

11
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -704,12 +704,14 @@ namespace bsmd.ExcelReadService
}
#endregion
if(haza.HasPositions) // Christin 22.3.17: Felder bei Positionen immer fest ausfüllen
{
haza.NoDPGOnBoardOnArrival = false;
haza.DPGManifestOnBoardOnArrival = true;
// haza.DPGManifestOnBoardOnArrival = true;
}
}
#endregion
@ -1042,11 +1044,16 @@ namespace bsmd.ExcelReadService
}
#endregion
if (hazd.HasPositions) // Christin 22.3.17: Felder bei Positionen immer fest ausfüllen
{
hazd.NoDPGOnBoardOnArrival = false;
hazd.DPGManifestOnBoardOnArrival = true;
// hazd.DPGManifestOnBoardOnArrival = true;
}
}
#endregion

2
nsw/Source/bsmd.database/CREW.cs
View File

@ -70,7 +70,7 @@ namespace bsmd.database
[ShowReport]
[ReportDisplayName("Nationality")]
[Validation(ValidationCode.NOT_NULL)]
[Validation(ValidationCode.FLAG_CODE)]
[MaxLength(2)]
[ENI2Validation]
public string CrewMemberNationality { get; set; }

2
nsw/Source/bsmd.database/PAS.cs
View File

@ -70,7 +70,7 @@ namespace bsmd.database
[ShowReport]
[ReportDisplayName("Nationality")]
[Validation(ValidationCode.NOT_NULL)]
[Validation(ValidationCode.FLAG_CODE)]
[MaxLength(2)]
[ENI2Validation]
public string PassengerNationality { get; set; }

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

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("5.0.8")]
[assembly: AssemblyInformationalVersion("5.0.9")]
[assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")]
[assembly: AssemblyTrademark("")]

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

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

7
nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
View File

@ -195,6 +195,13 @@ namespace bsmd.database
errors.Add(RuleEngine.CreateError(ValidationCode.LOCODE, "ShipToShipActivityLocationLoCode", this.ShipToShipActivityLocationLoCode, this.Title, this.Identifier, this.SEC.Tablename));
}
if(this.ShipToShipActivityTypeCode.HasValue)
{
if ((this.ShipToShipActivityTypeCode.Value < 1) ||
((this.ShipToShipActivityTypeCode.Value > 23) && (this.ShipToShipActivityTypeCode.Value != 98)))
errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "ShipToShipActivityType", this.ShipToShipActivityTypeCode.ToString(), this.Title, this.Identifier, this.SEC.Tablename));
}
}
#endregion

2
nsw/Source/bsmd.dbh/Request.cs
View File

@ -272,6 +272,7 @@ namespace bsmd.dbh
RootNOA_NODCallPurpose rnncp = new RootNOA_NODCallPurpose();
CallPurpose callPurpose = noa_nod.CallPurposes[i] as CallPurpose;
rnncp.CallPurposeCode = callPurpose.CallPurposeCode;
if(callPurpose.CallPurposeDescription != string.Empty)
rnncp.CallPurposeDescription = callPurpose.CallPurposeDescription;
choices.Add(rnncp);
}
@ -828,6 +829,7 @@ namespace bsmd.dbh
rootPre.TankerDetails.TankerHullConfiguration = (HullConfiguration)pre72h.TankerHullConfiguration.Value;
if (pre72h.ConditionCargoBallastTanks.HasValue)
rootPre.TankerDetails.ConditionCargoBallastTanks = (TankCondition)pre72h.ConditionCargoBallastTanks.Value;
if(pre72h.NatureOfCargo != string.Empty)
rootPre.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
rootPre.TankerDetails.VolumeOfCargo_TNESpecified = pre72h.VolumeOfCargo.HasValue;
if (pre72h.VolumeOfCargo.HasValue)

2
nsw/Source/bsmd.hisnord/Request.cs
View File

@ -271,6 +271,7 @@ namespace bsmd.hisnord
hn_noanod.CallPurposes[i] = new callpurpose();
CallPurpose callPurpose = noa_nod.CallPurposes[i] as CallPurpose;
hn_noanod.CallPurposes[i].CallPurposeCode = callPurpose.CallPurposeCode.ToString();
if(callPurpose.CallPurposeDescription != string.Empty)
hn_noanod.CallPurposes[i].CallPurposeDescription = callPurpose.CallPurposeDescription;
}
}
@ -789,6 +790,7 @@ namespace bsmd.hisnord
hn_pre72.TankerDetails = new tankerdetails();
if (pre72h.ConditionCargoBallastTanks.HasValue)
hn_pre72.TankerDetails.ConditionCargoBallastTanks = (cargoconditiontype)pre72h.ConditionCargoBallastTanks.Value;
if(pre72h.NatureOfCargo != string.Empty)
hn_pre72.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
if (pre72h.TankerHullConfiguration.HasValue)
hn_pre72.TankerDetails.TankerHullConfiguration = (hullconfigtype)pre72h.TankerHullConfiguration.Value;