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

Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2023-01-18 09:46:51 +01:00
parent 00bc43790d
commit 820d12611d
5 changed files with 68 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsmd.database/HAZ.cs
View File

@ -380,7 +380,10 @@ namespace bsmd.database
public void SaveElements() public void SaveElements()
{ {
foreach (IMDGPosition imdg in this.IMDGPositions) foreach (IMDGPosition imdg in this.IMDGPositions)
{
DBManager.Instance.Save(imdg); DBManager.Instance.Save(imdg);
((ISublistContainer)imdg).SaveElements();
}
foreach (IMSBCPosition imsbc in this.IMSBCPositions) foreach (IMSBCPosition imsbc in this.IMSBCPositions)
DBManager.Instance.Save(imsbc); DBManager.Instance.Save(imsbc);
foreach (IBCPosition ibc in this.IBCPositions) foreach (IBCPosition ibc in this.IBCPositions)

40
bsmd.database/IMDGPosition.cs
View File

@ -21,7 +21,7 @@ namespace bsmd.database
[TypeConverter(typeof(MessageClassConverter<IMDGPosition>))] [TypeConverter(typeof(MessageClassConverter<IMDGPosition>))]
[JsonConverter(typeof(NoTypeConverterJsonConverter<IMDGPosition>))] [JsonConverter(typeof(NoTypeConverterJsonConverter<IMDGPosition>))]
public class IMDGPosition : DatabaseEntity, ISublistElement public class IMDGPosition : DatabaseEntity, ISublistElement, ISublistContainer
{ {
public IMDGPosition() public IMDGPosition()
{ {
@ -229,7 +229,7 @@ namespace bsmd.database
else else
{ {
string[] risks = value.Split(','); string[] risks = value.Split(',');
List<SubsidiaryRisks> foundList = new List<database.SubsidiaryRisks>(); List<SubsidiaryRisks> foundList = new List<SubsidiaryRisks>();
for (int i = 0; i < risks.Length; i++) for (int i = 0; i < risks.Length; i++)
{ {
@ -441,6 +441,42 @@ namespace bsmd.database
#endregion #endregion
#region ISublistContainer implementation
public ISublistElement GetSublistElementWithIdentifier(string identifier)
{
foreach (ISublistElement sElem in this.SubsidiaryRiskList)
if (sElem.Identifier.Equals(identifier))
return sElem;
return null;
}
[Browsable(false)]
[JsonIgnore]
public int NumberOfExcelRows
{
get { return 1; }
}
public void SaveElements()
{
foreach (SubsidiaryRisks sr in this.SubsidiaryRiskList)
{
DBManager.Instance.Save(sr);
}
}
public void DeleteElements()
{
foreach (SubsidiaryRisks sr in this.SubsidiaryRiskList)
{
DBManager.GetSingleCon(DBManager.Instance.ConnectionString).Delete(sr);
}
this.SubsidiaryRiskList.Clear();
}
#endregion
#region Validation #region Validation
public override void Validate(List<MessageError> errors, List<MessageViolation> violations) public override void Validate(List<MessageError> errors, List<MessageViolation> violations)

5
bsmd.database/WAS_RCPT.cs
View File

@ -347,11 +347,6 @@ namespace bsmd.database
wasteReceived.Validate(errors, violations); wasteReceived.Validate(errors, violations);
} }
if(TreatmentFacilityProviderText.IsNullOrEmpty())
{
errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "TreatmentFacilityProviderName empty", null, this.Title, this.IdentificationNumber, this.Tablename));
}
bool entryMissing = false; bool entryMissing = false;
string missingType = ""; string missingType = "";

26
bsmd.dbh/RequestUtil.cs
View File

@ -477,7 +477,7 @@ namespace bsmd.dbh
rootCREW.CrewMember[i].CrewMemberFirstName = crew.CrewMemberFirstName; rootCREW.CrewMember[i].CrewMemberFirstName = crew.CrewMemberFirstName;
rootCREW.CrewMember[i].CrewMemberGenderSpecified = crew.CrewMemberGender.HasValue; rootCREW.CrewMember[i].CrewMemberGenderSpecified = crew.CrewMemberGender.HasValue;
if (crew.CrewMemberGender.HasValue) if (crew.CrewMemberGender.HasValue)
rootCREW.CrewMember[i].CrewMemberGender = (Gender)crew.CrewMemberGender.Value; rootCREW.CrewMember[i].CrewMemberGender = SetGender(crew.CrewMemberGender.Value);
rootCREW.CrewMember[i].CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId; rootCREW.CrewMember[i].CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId;
if (crew.CrewMemberIdentityDocumentType.HasValue) if (crew.CrewMemberIdentityDocumentType.HasValue)
rootCREW.CrewMember[i].CrewMemberIdentityDocumentType = (IdDocType)crew.CrewMemberIdentityDocumentType.Value; rootCREW.CrewMember[i].CrewMemberIdentityDocumentType = (IdDocType)crew.CrewMemberIdentityDocumentType.Value;
@ -515,7 +515,7 @@ namespace bsmd.dbh
rootPAS.Passenger[i].PassengerDateOfBirth = pas.PassengerDateOfBirth.Value; rootPAS.Passenger[i].PassengerDateOfBirth = pas.PassengerDateOfBirth.Value;
rootPAS.Passenger[i].PassengerGenderSpecified = pas.PassengerGender.HasValue; rootPAS.Passenger[i].PassengerGenderSpecified = pas.PassengerGender.HasValue;
if (pas.PassengerGender.HasValue) if (pas.PassengerGender.HasValue)
rootPAS.Passenger[i].PassengerGender = (Gender)pas.PassengerGender.Value; rootPAS.Passenger[i].PassengerGender = SetGender(pas.PassengerGender.Value);
rootPAS.Passenger[i].PassengerNationality = pas.PassengerNationality; rootPAS.Passenger[i].PassengerNationality = pas.PassengerNationality;
if (pas.PassengerIdentityDocumentType.HasValue) if (pas.PassengerIdentityDocumentType.HasValue)
rootPAS.Passenger[i].PassengerIdentityDocumentType = (IdDocType)pas.PassengerIdentityDocumentType.Value; rootPAS.Passenger[i].PassengerIdentityDocumentType = (IdDocType)pas.PassengerIdentityDocumentType.Value;
@ -1711,5 +1711,27 @@ namespace bsmd.dbh
return null; return null;
} }
} }
#region helper
private static Gender SetGender(byte genderVal)
{
switch (genderVal)
{
case 0:
return Gender.NOT_KNOWN;
case 1:
return Gender.MALE;
case 2:
return Gender.FEMALE;
case 9:
return Gender.NOT_APPLICABLE;
default:
return Gender.NOT_KNOWN;
}
}
#endregion
} }
} }