Testing NSW 6.0 (Testsystem D+D), Version 6.0.2

This commit is contained in:
Daniel Schick 2020-02-27 09:21:26 +00:00
parent a4365fa6eb
commit fe63082330
8 changed files with 15 additions and 5 deletions

View File

@ -35,7 +35,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>1</ApplicationRevision> <ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>6.0.1.%2a</ApplicationVersion> <ApplicationVersion>6.0.2.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

Binary file not shown.

View File

@ -109,7 +109,7 @@ namespace bsmd.database
[ShowReport] [ShowReport]
[ReportDisplayName("Issuing state")] [ReportDisplayName("Issuing state")]
[Validation(ValidationCode.FLAG_CODE)] [Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
[MaxLength(2)] [MaxLength(2)]
[ENI2Validation] [ENI2Validation]
public string CrewMemberIdentityDocumentIssuingState { get; set; } public string CrewMemberIdentityDocumentIssuingState { get; set; }

View File

@ -118,7 +118,7 @@ namespace bsmd.database
[ShowReport] [ShowReport]
[ReportDisplayName("Issuing state")] [ReportDisplayName("Issuing state")]
[Validation(ValidationCode.FLAG_CODE)] [Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
[ENI2Validation] [ENI2Validation]
public string PassengerIdentityDocumentIssuingState { get; set; } public string PassengerIdentityDocumentIssuingState { get; set; }

View File

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

View File

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

View File

@ -281,6 +281,15 @@ namespace bsmd.database
errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename)); errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename));
} }
break; break;
case ValidationCode.OPTIONAL_FLAG_CODE:
{
if(!value.IsNullOrEmpty())
{
if (!RuleEngine.NationalityChecker(value))
errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename));
}
}
break;
case ValidationCode.TWO_DIGIT: case ValidationCode.TWO_DIGIT:
{ {
Regex rgx = new Regex("[0-9]{2}"); Regex rgx = new Regex("[0-9]{2}");

View File

@ -47,6 +47,7 @@ namespace bsmd.database
TRUNCATE = 28, TRUNCATE = 28,
MMSI = 29, MMSI = 29,
INVALID_NUMBER_CHARS = 30, INVALID_NUMBER_CHARS = 30,
OPTIONAL_FLAG_CODE,
E121 = 121, E121 = 121,
E122 = 122, E122 = 122,
E123 = 123, E123 = 123,