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

Version 5.0.14 - schnelle Zwischenversion mit neuen NSW Häfen und einer kleinen Readonly Korrektur

Browse Source
This commit is contained in:
Daniel Schick 2018-08-21 07:38:39 +00:00
parent 28d076ff39
commit e5e7d6fed3
7 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI-2/ENI2/ENI2/App.config
View File

@ -26,12 +26,12 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<!--value>http://192.168.2.4/LockingService/LockingService.svc</value--> <value>http://192.168.2.4/LockingService/LockingService.svc</value>
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value> <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;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>
<value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value> <!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

73
ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
View File

@ -66,9 +66,11 @@ namespace ENI2.DetailViewControls
sec = this._secMessage.Elements[0] as SEC; sec = this._secMessage.Elements[0] as SEC;
if (sec == null) if (sec == null)
{ {
sec = new SEC(); sec = new SEC
sec.MessageCore = this.Core; {
sec.MessageHeader = this._secMessage; MessageCore = this.Core,
MessageHeader = this._secMessage
};
_secMessage.Elements.Add(sec); _secMessage.Elements.Add(sec);
} }
@ -103,6 +105,8 @@ namespace ENI2.DetailViewControls
this.checkBoxSECSimplification.Unchecked += CheckBoxSECSimplification_Checked; this.checkBoxSECSimplification.Unchecked += CheckBoxSECSimplification_Checked;
this.checkBoxKielCanalPassagePlanned.Checked += CheckBoxKielCanalPassagePlanned_Checked; this.checkBoxKielCanalPassagePlanned.Checked += CheckBoxKielCanalPassagePlanned_Checked;
this.CheckBoxKielCanalPassagePlanned_Checked(null, null);
#endregion #endregion
} }
@ -122,8 +126,10 @@ namespace ENI2.DetailViewControls
private void DataGridShip2ShipActivities_CreateRequested() private void DataGridShip2ShipActivities_CreateRequested()
{ {
EditShip2ShipActivitiesDialog epd = new EditShip2ShipActivitiesDialog(); EditShip2ShipActivitiesDialog epd = new EditShip2ShipActivitiesDialog
epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled(); {
ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled()
};
epd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled); epd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
epd.ShipToShipActivity.SEC = this._sec; epd.ShipToShipActivity.SEC = this._sec;
@ -133,9 +139,11 @@ namespace ENI2.DetailViewControls
if(!this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Contains(epd.ShipToShipActivity)) if(!this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Contains(epd.ShipToShipActivity))
this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(epd.ShipToShipActivity); this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(epd.ShipToShipActivity);
this.dataGridShip2ShipActivities.Items.Refresh(); this.dataGridShip2ShipActivities.Items.Refresh();
epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled(); epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled
epd.ShipToShipActivity.SEC = this._sec; {
epd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled); SEC = this._sec,
Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
};
this.SublistElementChanged(Message.NotificationClass.SEC); this.SublistElementChanged(Message.NotificationClass.SEC);
}; };
@ -163,17 +171,21 @@ namespace ENI2.DetailViewControls
private void DataGridShip2ShipActivities_EditRequested(DatabaseEntity obj) private void DataGridShip2ShipActivities_EditRequested(DatabaseEntity obj)
{ {
EditShip2ShipActivitiesDialog ecpd = new EditShip2ShipActivitiesDialog(); EditShip2ShipActivitiesDialog ecpd = new EditShip2ShipActivitiesDialog
ecpd.ShipToShipActivity = obj as ShipToShipActivitiesDuringLastTenPortFacilitiesCalled; {
ShipToShipActivity = obj as ShipToShipActivitiesDuringLastTenPortFacilitiesCalled
};
ecpd.AddClicked += () => ecpd.AddClicked += () =>
{ {
ecpd.CopyValuesToEntity(); ecpd.CopyValuesToEntity();
if (!_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Contains(ecpd.ShipToShipActivity)) if (!_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Contains(ecpd.ShipToShipActivity))
_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(ecpd.ShipToShipActivity); _sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(ecpd.ShipToShipActivity);
this.dataGridShip2ShipActivities.Items.Refresh(); this.dataGridShip2ShipActivities.Items.Refresh();
ecpd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled(); ecpd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled
ecpd.ShipToShipActivity.SEC = this._sec; {
ecpd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled); SEC = this._sec,
Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
};
this.SublistElementChanged(Message.NotificationClass.SEC); this.SublistElementChanged(Message.NotificationClass.SEC);
}; };
if (ecpd.ShowDialog() ?? false) if (ecpd.ShowDialog() ?? false)
@ -196,8 +208,10 @@ namespace ENI2.DetailViewControls
private void DataGridLast10PortFacilities_CreateRequested() private void DataGridLast10PortFacilities_CreateRequested()
{ {
EditLast10PortFacilitiesDialog epd = new EditLast10PortFacilitiesDialog(); EditLast10PortFacilitiesDialog epd = new EditLast10PortFacilitiesDialog
epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled(); {
LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled()
};
epd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled); epd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
epd.LastTenPortFacilitiesCalled.SEC = this._sec; epd.LastTenPortFacilitiesCalled.SEC = this._sec;
@ -208,9 +222,11 @@ namespace ENI2.DetailViewControls
this._sec.LastTenPortFacilitesCalled.Add(epd.LastTenPortFacilitiesCalled); this._sec.LastTenPortFacilitesCalled.Add(epd.LastTenPortFacilitiesCalled);
this.dataGridLast10PortFacilities.Items.Refresh(); this.dataGridLast10PortFacilities.Items.Refresh();
epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled(); epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled
epd.LastTenPortFacilitiesCalled.SEC = this._sec; {
epd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled); SEC = this._sec,
Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled)
};
this.SublistElementChanged(Message.NotificationClass.SEC); this.SublistElementChanged(Message.NotificationClass.SEC);
}; };
@ -238,17 +254,21 @@ namespace ENI2.DetailViewControls
private void DataGridLast10PortFacilities_EditRequested(DatabaseEntity obj) private void DataGridLast10PortFacilities_EditRequested(DatabaseEntity obj)
{ {
EditLast10PortFacilitiesDialog ecpd = new EditLast10PortFacilitiesDialog(); EditLast10PortFacilitiesDialog ecpd = new EditLast10PortFacilitiesDialog
ecpd.LastTenPortFacilitiesCalled = obj as LastTenPortFacilitiesCalled; {
LastTenPortFacilitiesCalled = obj as LastTenPortFacilitiesCalled
};
ecpd.AddClicked += () => ecpd.AddClicked += () =>
{ {
ecpd.CopyValuesToEntity(); ecpd.CopyValuesToEntity();
if (!_sec.LastTenPortFacilitesCalled.Contains(ecpd.LastTenPortFacilitiesCalled)) if (!_sec.LastTenPortFacilitesCalled.Contains(ecpd.LastTenPortFacilitiesCalled))
_sec.LastTenPortFacilitesCalled.Add(ecpd.LastTenPortFacilitiesCalled); _sec.LastTenPortFacilitesCalled.Add(ecpd.LastTenPortFacilitiesCalled);
this.dataGridLast10PortFacilities.Items.Refresh(); this.dataGridLast10PortFacilities.Items.Refresh();
ecpd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled(); ecpd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled
ecpd.LastTenPortFacilitiesCalled.SEC = this._sec; {
ecpd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled); SEC = this._sec,
Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled)
};
this.SublistElementChanged(Message.NotificationClass.SEC); this.SublistElementChanged(Message.NotificationClass.SEC);
}; };
if (ecpd.ShowDialog() ?? false) if (ecpd.ShowDialog() ?? false)
@ -305,8 +325,11 @@ namespace ENI2.DetailViewControls
private void buttonImportExcel_Click(object sender, RoutedEventArgs e) private void buttonImportExcel_Click(object sender, RoutedEventArgs e)
{ {
OpenFileDialog ofd = new OpenFileDialog(); OpenFileDialog ofd = new OpenFileDialog
ofd.Filter = "Excel Files|*.xls;*.xlsx"; {
Filter = "Excel Files|*.xls;*.xlsx"
};
if (ofd.ShowDialog() ?? false) if (ofd.ShowDialog() ?? false)
{ {
FileStream stream = null; FileStream stream = null;

2
ENI-2/ENI2/ENI2/ENI2.csproj
View File

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

BIN
Stundensheet.xlsx
View File

Binary file not shown.

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
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("5.0.13")] [assembly: AssemblyInformationalVersion("5.0.14")]
[assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

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

BIN
nsw/Source/misc/db.sqlite
View File

Binary file not shown.