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

weitere Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2022-05-11 15:46:25 +02:00
parent 9353da42e5
commit 7b87df2fd7
7 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ENI2/DetailViewControls/OverViewDetailControl.xaml
View File

@ -75,7 +75,7 @@
<Label HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
<Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
<Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
<Button Name="buttonFormblattNeu" Grid.Column="5" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
<Button Name="buttonFormblattNeu" Grid.Column="4" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
<StackPanel Orientation="Horizontal">
<TextBlock Text="Formblatt neu"></TextBlock>
<Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
@ -122,13 +122,14 @@
<Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
</StackPanel>
</Button>
<!--
<Button Grid.Column="4" Grid.Row="7" Margin="2" Name="buttonExcelExport" Click="buttonExcelExport_Click">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Static p:Resources.textExcelExport}"></TextBlock>
<Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
</StackPanel>
</Button>
-->
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="4" Visibility="Hidden" Name="stackPanelLock">
<Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
<TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />

15
ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
View File

@ -67,17 +67,10 @@ namespace ENI2.DetailViewControls
if (this.Messages == null) return;
if (this.Core == null) return;
if (DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsAdmin)
{
this.textBoxENI.IsReadOnly = false;
this.textBoxIMO.IsReadOnly = false;
this.locodePoC.IsEnabled = true;
this.textBoxDisplayId.IsReadOnly = false;
}
else
{
this.buttonExcelExport.Visibility = Visibility.Hidden;
}
this.textBoxENI.IsReadOnly = false;
this.textBoxIMO.IsReadOnly = false;
this.locodePoC.IsEnabled = true;
this.textBoxDisplayId.IsReadOnly = false;
this.textBoxENI.DataContext = this.Core;
this.textBoxIMO.DataContext = this.Core;

4
ENI2/ENI2.csproj
View File

@ -36,8 +36,8 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>7.1.0.1</ApplicationVersion>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>7.1.0.2</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>

13
ENI2/Excel/DakosyUtil.cs
View File

@ -489,11 +489,16 @@ namespace ENI2.Excel
sec.CurrentShipSecurityLevel = (byte?)reader.ReadCellAsDecimal("security", "D7");
sec.SECSimplification = reader.ReadCellAsBool("security", "D9");
sec.KielCanalPassagePlanned = reader.ReadCellAsBool("security", "I7");
sec.KielCanalPassagePlanned = reader.ReadCellAsBool("security", "I7") ?? false;
if(sec.KielCanalPassagePlanned ?? false)
{
sec.KielCanalPassagePlannedIncomming = reader.ReadCellAsDateTime("security", "I9");
sec.KielCanalPassagePlannedOutgoing = reader.ReadCellAsDateTime("security", "I12");
DateTime? incoming = reader.ReadCellAsDateTime("security", "I9");
if (incoming.HasValue)
sec.KielCanalPassagePlannedIncomming = new DateTime(incoming.Value.Year, incoming.Value.Month, incoming.Value.Day, 11, 11, 0).ToUniversalTime();
DateTime? outgoing = reader.ReadCellAsDateTime("security", "I12");
if(outgoing.HasValue)
sec.KielCanalPassagePlannedOutgoing = new DateTime(outgoing.Value.Year, outgoing.Value.Month, outgoing.Value.Day, 11, 11, 0).ToUniversalTime();
}
if(sec.SECSimplification ?? false)
@ -627,7 +632,7 @@ namespace ENI2.Excel
pre72h.VolumeOfCargo = reader.ReadCellAsDecimal("port state control", "C13");
}
pre72h.PlannedOperations = reader.ReadCellAsText("port state control", "C14");
pre72h.PlannedOperations = reader.ReadTextFromDropdown("port state control", "C14");
pre72h.PlannedWorks = reader.ReadCellAsText("port state control", "C15");
pre72h.DateOfLastExpandedInspection = reader.ReadCellAsDateTime("port state control", "C16");
pre72h.PlannedPeriodOfStay_HUR = reader.ReadCellAsDecimal("port state control", "C17");

9
ENI2/Excel/ExcelReader.cs
View File

@ -582,12 +582,11 @@ namespace ENI2.Excel
try
{
Worksheet workSheet = (Worksheet)_workBook.Worksheets[sheetName];
Shapes shapes = workSheet.Shapes;
Shape aShape = shapes.Item("bla");
Range aRange = workSheet.Range[range];
string formulaRange = aRange.Validation.Formula1;
if (aRange != null)
{
}
}
catch (Exception e)
{

4
bsmd.database/DBManager.cs
View File

@ -1437,11 +1437,11 @@ namespace bsmd.database
if (core == null) return;
using (SqlCommand cmd = new SqlCommand())
{
cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28";
cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)";
cmd.Parameters.AddWithValue("@ID", core.Id);
int total = this.PerformReadIntQuery(cmd) ?? 0;
cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; // compare "CONFIRMED"
int sent = this.PerformReadIntQuery(cmd) ?? 0;
core.NumberSentDisplay = string.Format("{0}/{1}", sent, total);

2
bsmd.database/MDH.cs
View File

@ -599,7 +599,7 @@ namespace bsmd.database
if ((this.SanitaryMeasuresApplied ?? false) && this.SanitaryMeasuresDetails.IsNullOrEmpty())
violations.Add(RuleEngine.CreateViolation(ValidationCode.V763, "Sanitary measure details missing", null, this.Title, null, this.Tablename));
if ((this.StowawaysDetected ?? false) && this.StowawaysJoiningLocation.IsNullOrEmpty())
if ((this.StowawaysDetected ?? false) && this.StowawaysJoiningLocationText.IsNullOrEmpty())
violations.Add(RuleEngine.CreateViolation(ValidationCode.V764, "Stowaways joining location missing", null, this.Title, null, this.Tablename));
if ((this.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false) &&