Version 3.5.2.*: ENI-2 jetzt mit ClickOnce Installation
This commit is contained in:
parent
43b420e044
commit
6fb405f955
@ -17,7 +17,7 @@ Sample license text.
|
|||||||
<applicationSettings>
|
<applicationSettings>
|
||||||
<ENI2.Properties.Settings>
|
<ENI2.Properties.Settings>
|
||||||
<setting name="ConnectionString" serializeAs="String">
|
<setting name="ConnectionString" serializeAs="String">
|
||||||
<value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
|
<value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
|
||||||
</setting>
|
</setting>
|
||||||
</ENI2.Properties.Settings>
|
</ENI2.Properties.Settings>
|
||||||
</applicationSettings>
|
</applicationSettings>
|
||||||
|
|||||||
@ -14,20 +14,30 @@
|
|||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<PublishUrl>publish\</PublishUrl>
|
<IsWebBootstrapper>true</IsWebBootstrapper>
|
||||||
|
<PublishUrl>eni2.publish\</PublishUrl>
|
||||||
<Install>true</Install>
|
<Install>true</Install>
|
||||||
<InstallFrom>Disk</InstallFrom>
|
<InstallFrom>Web</InstallFrom>
|
||||||
<UpdateEnabled>false</UpdateEnabled>
|
<UpdateEnabled>true</UpdateEnabled>
|
||||||
<UpdateMode>Foreground</UpdateMode>
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
<UpdateInterval>7</UpdateInterval>
|
<UpdateInterval>7</UpdateInterval>
|
||||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||||
<UpdatePeriodically>false</UpdatePeriodically>
|
<UpdatePeriodically>false</UpdatePeriodically>
|
||||||
<UpdateRequired>false</UpdateRequired>
|
<UpdateRequired>false</UpdateRequired>
|
||||||
<MapFileExtensions>true</MapFileExtensions>
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
<ApplicationRevision>0</ApplicationRevision>
|
<InstallUrl>http://smnsw01.bsmd.local/eni2.publish/</InstallUrl>
|
||||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
<UpdateUrl>http://smnsw01.bsmd.local/eni2.publish/</UpdateUrl>
|
||||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
<SupportUrl>http://www.textbausteine.net/</SupportUrl>
|
||||||
|
<ProductName>ENI2</ProductName>
|
||||||
|
<PublisherName>Informatikbüro Daniel Schick</PublisherName>
|
||||||
|
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
|
||||||
|
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
||||||
|
<WebPage>publish.html</WebPage>
|
||||||
|
<ApplicationRevision>2</ApplicationRevision>
|
||||||
|
<ApplicationVersion>3.5.2.%2a</ApplicationVersion>
|
||||||
<UseApplicationTrust>false</UseApplicationTrust>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
|
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||||
|
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
@ -59,7 +69,25 @@
|
|||||||
<AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationIcon>Resources\containership.ico</ApplicationIcon>
|
<ApplicationIcon>Resources\logo_schwarz.ico</ApplicationIcon>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetZone>LocalIntranet</TargetZone>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<GenerateManifests>true</GenerateManifests>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<ManifestCertificateThumbprint>C907F4E529D2646C3EAECBF9ACA831CCC99069A8</ManifestCertificateThumbprint>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<ManifestKeyFile>ENI2_TemporaryKey.pfx</ManifestKeyFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<SignManifests>true</SignManifests>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||||
@ -175,7 +203,10 @@
|
|||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<None Include="bsmdKey.snk" />
|
<None Include="bsmdKey.snk" />
|
||||||
<None Include="ENI2.licenseheader" />
|
<None Include="ENI2.licenseheader" />
|
||||||
|
<None Include="ENI2_1_TemporaryKey.pfx" />
|
||||||
|
<None Include="ENI2_TemporaryKey.pfx" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
|
<None Include="Properties\app.manifest" />
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
<Generator>SettingsSingleFileGenerator</Generator>
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||||
@ -212,6 +243,9 @@
|
|||||||
<Name>bsmd.database</Name>
|
<Name>bsmd.database</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Resource Include="Resources\logo_schwarz.ico" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
BIN
ENI-2/ENI2/ENI2/ENI2_TemporaryKey.pfx
Normal file
BIN
ENI-2/ENI2/ENI2/ENI2_TemporaryKey.pfx
Normal file
Binary file not shown.
@ -5,7 +5,7 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:ENI2"
|
xmlns:local="clr-namespace:ENI2"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="ENI 2" Height="350" Width="525" Icon="Resources/containership.ico" Loaded="Window_Loaded" Closing="Window_Closing" SourceInitialized="Window_SourceInitialized">
|
Title="ENI 2" Height="350" Width="525" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" SourceInitialized="Window_SourceInitialized">
|
||||||
<DockPanel>
|
<DockPanel>
|
||||||
<Grid DockPanel.Dock="Top" Height="80" Background="#FFE8F6FF">
|
<Grid DockPanel.Dock="Top" Height="80" Background="#FFE8F6FF">
|
||||||
<Image x:Name="logoImage" HorizontalAlignment="Left" Height="80" Width="80" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp"/>
|
<Image x:Name="logoImage" HorizontalAlignment="Left" Height="80" Width="80" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp"/>
|
||||||
|
|||||||
10
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
generated
10
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
generated
@ -79,5 +79,15 @@ namespace ENI2.Properties {
|
|||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Icon logo_schwarz {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("logo_schwarz", resourceCulture);
|
||||||
|
return ((System.Drawing.Icon)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,4 +124,7 @@
|
|||||||
<data name="EUREPORT" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="EUREPORT" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\EUREPORT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\EUREPORT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="logo_schwarz" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\logo_schwarz.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
4
ENI-2/ENI2/ENI2/Properties/Settings.Designer.cs
generated
4
ENI-2/ENI2/ENI2/Properties/Settings.Designer.cs
generated
@ -25,8 +25,8 @@ namespace ENI2.Properties {
|
|||||||
|
|
||||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=(localdb)\\Projects;Initial Catalog=nsw;Integrated Security=True;Conne" +
|
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Time" +
|
||||||
"ct Timeout=30;Encrypt=False;TrustServerCertificate=False")]
|
"out=30;Encrypt=False;TrustServerCertificate=False")]
|
||||||
public string ConnectionString {
|
public string ConnectionString {
|
||||||
get {
|
get {
|
||||||
return ((string)(this["ConnectionString"]));
|
return ((string)(this["ConnectionString"]));
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<Profiles />
|
<Profiles />
|
||||||
<Settings>
|
<Settings>
|
||||||
<Setting Name="ConnectionString" Type="System.String" Scope="Application">
|
<Setting Name="ConnectionString" Type="System.String" Scope="Application">
|
||||||
<Value Profile="(Default)">Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</Value>
|
<Value Profile="(Default)">Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
<Setting Name="MainWindowPlacement" Type="System.String" Scope="User">
|
<Setting Name="MainWindowPlacement" Type="System.String" Scope="User">
|
||||||
<Value Profile="(Default)" />
|
<Value Profile="(Default)" />
|
||||||
|
|||||||
46
ENI-2/ENI2/ENI2/Properties/app.manifest
Normal file
46
ENI-2/ENI2/ENI2/Properties/app.manifest
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
|
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
|
||||||
|
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||||
|
<security>
|
||||||
|
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||||
|
<!-- UAC Manifest Options
|
||||||
|
If you want to change the Windows User Account Control level replace the
|
||||||
|
requestedExecutionLevel node with one of the following.
|
||||||
|
|
||||||
|
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||||
|
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
|
||||||
|
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
|
||||||
|
|
||||||
|
Specifying requestedExecutionLevel element will disable file and registry virtualization.
|
||||||
|
Remove this element if your application requires this virtualization for backwards
|
||||||
|
compatibility.
|
||||||
|
-->
|
||||||
|
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||||
|
</requestedPrivileges>
|
||||||
|
<applicationRequestMinimum>
|
||||||
|
<defaultAssemblyRequest permissionSetReference="Custom" />
|
||||||
|
<PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
|
||||||
|
</applicationRequestMinimum>
|
||||||
|
</security>
|
||||||
|
</trustInfo>
|
||||||
|
|
||||||
|
<!--compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||||
|
<application-->
|
||||||
|
<!-- A list of the Windows versions that this application has been tested on and is
|
||||||
|
is designed to work with. Uncomment the appropriate elements and Windows will
|
||||||
|
automatically selected the most compatible environment. -->
|
||||||
|
<!-- Windows Vista -->
|
||||||
|
<!-- supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /-->
|
||||||
|
<!-- Windows 7 -->
|
||||||
|
<!-- supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /-->
|
||||||
|
<!-- Windows 8 -->
|
||||||
|
<!-- supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /-->
|
||||||
|
<!-- Windows 8.1 -->
|
||||||
|
<!-- supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /-->
|
||||||
|
<!-- Windows 10 -->
|
||||||
|
<!--supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /-->
|
||||||
|
<!--/application>
|
||||||
|
</compatibility> -->
|
||||||
|
|
||||||
|
</assembly>
|
||||||
BIN
ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico
Normal file
BIN
ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
@ -62,7 +62,7 @@
|
|||||||
<DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="ETA" Binding="{Binding ETA , StringFormat=\{0:dd.MM.yyyy HH:mm\}}" IsReadOnly="True" />
|
<DataGridTextColumn Header="ETA" Binding="{Binding ETA , StringFormat=\{0:dd.MM.yyyy HH:mm\}}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Hafen" Binding="{Binding Portname}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Hafen" Binding="{Binding Portname}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Id" Binding="{Binding VisitId}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Status" Binding="{Binding BSMDStatusInternal}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Status" Binding="{Binding BSMDStatusInternal}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Bearbeiter" Binding="{Binding EditedBy}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Bearbeiter" Binding="{Binding EditedBy}" IsReadOnly="True" />
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
<DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="ETA" Binding="{Binding ETA , StringFormat=\{0:dd.MM.yyyy HH:mm\}}" IsReadOnly="True" />
|
<DataGridTextColumn Header="ETA" Binding="{Binding ETA , StringFormat=\{0:dd.MM.yyyy HH:mm\}}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Hafen" Binding="{Binding Portname}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Hafen" Binding="{Binding Portname}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Id" Binding="{Binding VisitId}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Status" Binding="{Binding BSMDStatusInternal}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Status" Binding="{Binding BSMDStatusInternal}" IsReadOnly="True" />
|
||||||
<DataGridTextColumn Header="Bearbeiter" Binding="{Binding EditedBy}" IsReadOnly="True" />
|
<DataGridTextColumn Header="Bearbeiter" Binding="{Binding EditedBy}" IsReadOnly="True" />
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@ -2155,7 +2155,9 @@ namespace bsmd.ExcelReadService
|
|||||||
string crewVisaNo = string.Format("CREW.CrewMemberVisaNumber_{0}", i + 1);
|
string crewVisaNo = string.Format("CREW.CrewMemberVisaNumber_{0}", i + 1);
|
||||||
|
|
||||||
string lastName = reader.ReadText(crewLastName);
|
string lastName = reader.ReadText(crewLastName);
|
||||||
if (!lastName.IsNullOrEmpty())
|
string firstName = reader.ReadText(crewFirstName);
|
||||||
|
|
||||||
|
if (!lastName.IsNullOrEmpty() || !firstName.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
CREW crew = crewMessage.GetSublistElementWithIdentifier((i + 1).ToString()) as CREW;
|
CREW crew = crewMessage.GetSublistElementWithIdentifier((i + 1).ToString()) as CREW;
|
||||||
if (crew == null)
|
if (crew == null)
|
||||||
@ -2167,9 +2169,9 @@ namespace bsmd.ExcelReadService
|
|||||||
}
|
}
|
||||||
|
|
||||||
crew.CrewMemberLastName = lastName;
|
crew.CrewMemberLastName = lastName;
|
||||||
reader.Conf.ConfirmText(crewLastName, lastName, ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(crewLastName, lastName, crew.CrewMemberLastName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
|
||||||
crew.CrewMemberFirstName = reader.ReadText(crewFirstName);
|
crew.CrewMemberFirstName = firstName;
|
||||||
reader.Conf.ConfirmText(crewFirstName, crew.CrewMemberFirstName, crew.CrewMemberFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(crewFirstName, crew.CrewMemberFirstName, crew.CrewMemberFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
|
||||||
crew.CrewMemberGender = reader.ReadGender(crewGender);
|
crew.CrewMemberGender = reader.ReadGender(crewGender);
|
||||||
crew.CrewMemberDuty = reader.ReadText(crewDuty);
|
crew.CrewMemberDuty = reader.ReadText(crewDuty);
|
||||||
reader.Conf.ConfirmText(crewDuty, crew.CrewMemberDuty, ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(crewDuty, crew.CrewMemberDuty, ExcelReader.ReadState.OK);
|
||||||
@ -2266,7 +2268,9 @@ namespace bsmd.ExcelReadService
|
|||||||
string pasVisaNo = string.Format("PAS.PassengerVisaNumber_{0}", i + 1);
|
string pasVisaNo = string.Format("PAS.PassengerVisaNumber_{0}", i + 1);
|
||||||
|
|
||||||
string lastName = reader.ReadText(pasLastName);
|
string lastName = reader.ReadText(pasLastName);
|
||||||
if (!lastName.IsNullOrEmpty())
|
string firstName = reader.ReadText(pasFirstName);
|
||||||
|
|
||||||
|
if (!lastName.IsNullOrEmpty() || !firstName.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
PAS pas = pasMessage.GetSublistElementWithIdentifier((i + 1).ToString()) as PAS;
|
PAS pas = pasMessage.GetSublistElementWithIdentifier((i + 1).ToString()) as PAS;
|
||||||
if (pas == null)
|
if (pas == null)
|
||||||
@ -2278,9 +2282,9 @@ namespace bsmd.ExcelReadService
|
|||||||
}
|
}
|
||||||
|
|
||||||
pas.PassengerLastName = lastName;
|
pas.PassengerLastName = lastName;
|
||||||
reader.Conf.ConfirmText(pasLastName, lastName, ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(pasLastName, lastName, lastName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
|
||||||
pas.PassengerFirstName = reader.ReadText(pasFirstName);
|
pas.PassengerFirstName = firstName;
|
||||||
reader.Conf.ConfirmText(pasFirstName, pas.PassengerFirstName, pas.PassengerFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(pasFirstName, pas.PassengerFirstName, pas.PassengerFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
|
||||||
pas.PassengerGender = reader.ReadGender(pasGender);
|
pas.PassengerGender = reader.ReadGender(pasGender);
|
||||||
pas.PassengerNationality = reader.ReadNationality(pasNationality);
|
pas.PassengerNationality = reader.ReadNationality(pasNationality);
|
||||||
// TODO: Nicht klar ob hier LOCODEs kommen oder nicht
|
// TODO: Nicht klar ob hier LOCODEs kommen oder nicht
|
||||||
|
|||||||
@ -878,7 +878,10 @@ namespace bsmd.database
|
|||||||
SqlDataReader reader = this.PerformCommand(cmd);
|
SqlDataReader reader = this.PerformCommand(cmd);
|
||||||
if(reader.Read())
|
if(reader.Read())
|
||||||
{
|
{
|
||||||
core.Shipname = reader.GetString(0);
|
if (reader.IsDBNull(0))
|
||||||
|
core.Shipname = "";
|
||||||
|
else
|
||||||
|
core.Shipname = reader.GetString(0);
|
||||||
}
|
}
|
||||||
reader.Close();
|
reader.Close();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,6 +74,19 @@ namespace bsmd.database
|
|||||||
[MaxLength(25)]
|
[MaxLength(25)]
|
||||||
public string TransitId { get; set; }
|
public string TransitId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Display Property für ENI-2
|
||||||
|
/// </summary>
|
||||||
|
public string DisplayId
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (!VisitId.IsNullOrEmpty()) return VisitId;
|
||||||
|
if (!TransitId.IsNullOrEmpty()) return TransitId;
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[MaxLength(7)]
|
[MaxLength(7)]
|
||||||
public string IMO { get; set; }
|
public string IMO { get; set; }
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
|
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
|
||||||
[assembly: AssemblyProduct("BSMD NSW interface")]
|
[assembly: AssemblyProduct("BSMD NSW interface")]
|
||||||
[assembly: AssemblyInformationalVersion("3.5.0")]
|
[assembly: AssemblyInformationalVersion("3.5.2")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
|
[assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.5.0.*")]
|
[assembly: AssemblyVersion("3.5.2.*")]
|
||||||
|
|
||||||
|
|||||||
@ -26,5 +26,5 @@
|
|||||||
// documentation for more information on this.
|
// documentation for more information on this.
|
||||||
//
|
//
|
||||||
[assembly: AssemblyDelaySign(false)]
|
[assembly: AssemblyDelaySign(false)]
|
||||||
[assembly: AssemblyKeyFile("..\\bsmdKey.snk")]
|
// [assembly: AssemblyKeyFile("..\\bsmdKey.snk")]
|
||||||
[assembly: AssemblyKeyName("")]
|
[assembly: AssemblyKeyName("")]
|
||||||
Loading…
Reference in New Issue
Block a user