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

7.0.0.9: kleinere Validierungs- und Versendeprobleme bearbeitet

Browse Source
This commit is contained in:
Daniel Schick 2022-03-16 08:17:44 +01:00
parent c8650210e7
commit dce64f9a8e
5 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ENI2/Controls/EditWindowBase.cs
View File

@ -10,6 +10,7 @@ using System.Text.RegularExpressions;
using Xceed.Wpf.Toolkit; using Xceed.Wpf.Toolkit;
using bsmd.database;
using ENI2.Util; using ENI2.Util;
namespace ENI2.Controls namespace ENI2.Controls
@ -83,7 +84,7 @@ namespace ENI2.Controls
protected void DateTimePicker_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e) protected void DateTimePicker_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
{ {
if ((sender is DateTimePicker thePicker) && rdt.IsMatch(thePicker.Text)) if ((sender is DateTimePicker thePicker) && !thePicker.Text.IsNullOrEmpty() && rdt.IsMatch(thePicker.Text))
{ {
try try
{ {

4
ENI2/ENI2.csproj
View File

@ -36,8 +36,8 @@
<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>8</ApplicationRevision> <ApplicationRevision>9</ApplicationRevision>
<ApplicationVersion>7.0.0.8</ApplicationVersion> <ApplicationVersion>7.0.0.9</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

1
bsmd.database/Message.cs
View File

@ -601,6 +601,7 @@ namespace bsmd.database
case NotificationClass.STO: case NotificationClass.STO:
case NotificationClass.TOWA: case NotificationClass.TOWA:
case NotificationClass.TOWD: case NotificationClass.TOWD:
case NotificationClass.WAS_RCPT:
return true; return true;
} }

2
bsmd.database/WAS_RCPT.cs
View File

@ -39,9 +39,11 @@ namespace bsmd.database
public ObservableCollection<WasteReceived> WasteReceived { get; private set; } = new ObservableCollection<WasteReceived>(); public ObservableCollection<WasteReceived> WasteReceived { get; private set; } = new ObservableCollection<WasteReceived>();
[Validation(ValidationCode.NOT_NULL)] [Validation(ValidationCode.NOT_NULL)]
[ENI2Validation]
public DateTime? WasteDeliveryDateFrom { get; set; } public DateTime? WasteDeliveryDateFrom { get; set; }
[Validation(ValidationCode.NOT_NULL)] [Validation(ValidationCode.NOT_NULL)]
[ENI2Validation]
public DateTime? WasteDeliveryDateTo { get; set; } public DateTime? WasteDeliveryDateTo { get; set; }
[Browsable(false)] [Browsable(false)]

30
bsmd.hisnord/Request.cs
View File

@ -1200,6 +1200,9 @@ namespace bsmd.hisnord
was_item_names.Add(ItemsChoiceType6.LastWasteDisposalDate); was_item_names.Add(ItemsChoiceType6.LastWasteDisposalDate);
} }
was_items.Add(was.NextWasteDisposalPort);
was_item_names.Add(ItemsChoiceType6.NextWasteDisposalPort);
for (int i = 0; i < was.WasteDisposalServiceProvider.Count; i++) for (int i = 0; i < was.WasteDisposalServiceProvider.Count; i++)
{ {
if (!((WasteDisposalServiceProvider) was.WasteDisposalServiceProvider[i]).WasteDisposalServiceProviderName.IsNullOrEmpty()) if (!((WasteDisposalServiceProvider) was.WasteDisposalServiceProvider[i]).WasteDisposalServiceProviderName.IsNullOrEmpty())
@ -1209,9 +1212,6 @@ namespace bsmd.hisnord
} }
} }
was_items.Add(was.NextWasteDisposalPort);
was_item_names.Add(ItemsChoiceType6.NextWasteDisposalPort);
if (was.Waste.Count > 0) if (was.Waste.Count > 0)
{ {
for (int i = 0; i < was.Waste.Count; i++) for (int i = 0; i < was.Waste.Count; i++)
@ -1312,7 +1312,8 @@ namespace bsmd.hisnord
hn_was_rcpt.Items[i].WasteReceived[j].AmountWasteReceived_MTQ = (decimal) (was_rcpt.WasteReceived[j].AmountWasteReceived_MTQ ?? 0); hn_was_rcpt.Items[i].WasteReceived[j].AmountWasteReceived_MTQ = (decimal) (was_rcpt.WasteReceived[j].AmountWasteReceived_MTQ ?? 0);
hn_was_rcpt.Items[i].WasteReceived[j].WasteType = new was_rcptWasteDeliveryReceiptWasteReceivedWasteType(); hn_was_rcpt.Items[i].WasteReceived[j].WasteType = new was_rcptWasteDeliveryReceiptWasteReceivedWasteType();
hn_was_rcpt.Items[i].WasteReceived[j].WasteType.WasteCode = was_rcpt.WasteReceived[j].WasteCode; hn_was_rcpt.Items[i].WasteReceived[j].WasteType.WasteCode = was_rcpt.WasteReceived[j].WasteCode;
hn_was_rcpt.Items[i].WasteReceived[j].WasteType.WasteDescription = was_rcpt.WasteReceived[j].WasteDescription; if(!was_rcpt.WasteReceived[j].WasteDescription.IsNullOrEmpty())
hn_was_rcpt.Items[i].WasteReceived[j].WasteType.WasteDescription = was_rcpt.WasteReceived[j].WasteDescription;
} }
} }
} }
@ -1491,6 +1492,8 @@ namespace bsmd.hisnord
#region CREW #region CREW
// das ist bei mir dasselbe wie CREWA und muss daher zum Zeitpunkt X geändert werden // das ist bei mir dasselbe wie CREWA und muss daher zum Zeitpunkt X geändert werden
// ACHTUNG! CREWA ist bei HIS Nord anders aufgebaut als das CREW hier
if (message.MessageNotificationClass == Message.NotificationClass.CREW) if (message.MessageNotificationClass == Message.NotificationClass.CREW)
{ {
if (message.Reset) if (message.Reset)
@ -1562,14 +1565,17 @@ namespace bsmd.hisnord
hn_crew.CountryOfBirth = crewd.CrewMemberCountryOfBirth; hn_crew.CountryOfBirth = crewd.CrewMemberCountryOfBirth;
if(crewd.CrewMemberDateOfBirth.HasValue) if(crewd.CrewMemberDateOfBirth.HasValue)
hn_crew.DateOfBirth = crewd.CrewMemberDateOfBirth.Value; hn_crew.DateOfBirth = crewd.CrewMemberDateOfBirth.Value;
hn_crew.DetailsSchengen = new crewtypeCrewMemberDetailsSchengen(); if (acrewd.NotificationSchengen ?? false)
if (crewd.CrewMemberIdentityDocumentExpiryDate.HasValue) {
hn_crew.DetailsSchengen.IdentityDocumentExpiryDate = crewd.CrewMemberIdentityDocumentExpiryDate.Value; hn_crew.DetailsSchengen = new crewtypeCrewMemberDetailsSchengen();
hn_crew.DetailsSchengen.IdentityDocumentId = crewd.CrewMemberIdentityDocumentId; if (crewd.CrewMemberIdentityDocumentExpiryDate.HasValue)
hn_crew.DetailsSchengen.IdentityDocumentIssuingState = crewd.CrewMemberIdentityDocumentIssuingState; hn_crew.DetailsSchengen.IdentityDocumentExpiryDate = crewd.CrewMemberIdentityDocumentExpiryDate.Value;
if (crewd.CrewMemberIdentityDocumentType.HasValue) hn_crew.DetailsSchengen.IdentityDocumentId = crewd.CrewMemberIdentityDocumentId;
hn_crew.DetailsSchengen.IdentityDocumentType = (documenttype)crewd.CrewMemberIdentityDocumentType.Value; hn_crew.DetailsSchengen.IdentityDocumentIssuingState = crewd.CrewMemberIdentityDocumentIssuingState;
hn_crew.DetailsSchengen.VisaNumber = crewd.CrewMemberVisaNumber; if (crewd.CrewMemberIdentityDocumentType.HasValue)
hn_crew.DetailsSchengen.IdentityDocumentType = (documenttype)crewd.CrewMemberIdentityDocumentType.Value;
hn_crew.DetailsSchengen.VisaNumber = crewd.CrewMemberVisaNumber;
}
hn_crew.DutyOnBoard = crewd.CrewMemberDuty; hn_crew.DutyOnBoard = crewd.CrewMemberDuty;
hn_crew.FirstName = crewd.CrewMemberFirstName; hn_crew.FirstName = crewd.CrewMemberFirstName;
if(crewd.CrewMemberGender.HasValue) if(crewd.CrewMemberGender.HasValue)