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

Stand nach KW49

Browse Source
This commit is contained in:
Daniel Schick 2019-12-02 12:48:12 +00:00
parent 441cacfcc8
commit 7de7c71eb1
11 changed files with 89 additions and 12 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>
</setting>
<setting name="LockingServerAddress" serializeAs="String">
<!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
<value>http://192.168.2.24/LockingService/LockingService.svc</value>
<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
</setting>
<setting name="ConnectionString" serializeAs="String">
<!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
<!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
</setting>
</ENI2.Properties.Settings>
</applicationSettings>

33
ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs
View File

@ -8,6 +8,8 @@ using bsmd.database;
using ENI2.EditControls;
using System.Windows.Media;
using System.Windows.Controls;
using System.Windows.Media.Imaging;
using System;
namespace ENI2.DetailViewControls
{
@ -21,7 +23,7 @@ namespace ENI2.DetailViewControls
private Message _tiefaMessage;
private Message _pobaMessage;
private Message _bkraMessage;
private Message _brkdMessage;
public ArrivalNotificationDetailControl()
{
@ -49,6 +51,7 @@ namespace ENI2.DetailViewControls
if (aMessage.MessageNotificationClass == Message.NotificationClass.TIEFA) { this._tiefaMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.POBA) { this._pobaMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.BKRA) { this._bkraMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) { this._brkdMessage = aMessage; this.ControlMessages.Add(aMessage); }
}
#region ATA
@ -135,10 +138,35 @@ namespace ENI2.DetailViewControls
this.dataGridBKRA.DeleteRequested += DataGridBKRA_DeleteRequested;
this.dataGridBKRA.CreateRequested += DataGridBKRA_CreateRequested;
// Extra Menüpunkt um alle Bunker Positionen nach BKRD zu kopieren
this.dataGridBKRA.ContextMenu.Items.Add(new Separator());
MenuItem copyBKRItem = new MenuItem();
copyBKRItem.Header = Properties.Resources.textCopyToBKRD;
copyBKRItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
copyBKRItem.Click += this.copyBKR;
this.dataGridBKRA.ContextMenu.Items.Add(copyBKRItem);
#endregion
}
private void copyBKR(object sender, RoutedEventArgs e)
{
// aus dem aktuell selektierten IBC Element ein neues IBC Element machen und nach HAZD kopieren
foreach (BRKA brka in this.dataGridBKRA.Items)
{
BRKD copyBRKD = new BRKD();
copyBRKD.MessageHeader = this._brkdMessage;
copyBRKD.CopyFromBKRA(brka);
copyBRKD.Identifier = DatabaseEntity.GetNewIdentifier(this._brkdMessage.Elements);
this._brkdMessage.Elements.Add(copyBRKD);
this.SublistElementChanged(Message.NotificationClass.BKRD);
}
}
#region BKRA grid events
private void DataGridBKRA_CreateRequested()
@ -173,8 +201,7 @@ namespace ENI2.DetailViewControls
private void DataGridBKRA_DeleteRequested(DatabaseEntity obj)
{
BRKA brka = obj as BRKA;
if (brka != null)
if (obj is BRKA brka)
{
// are you sure dialog is in base class
DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(brka);

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

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

9
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs generated
View File

@ -1496,6 +1496,15 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Copy to BKRD.
/// </summary>
public static string textCopyToBKRD {
get {
return ResourceManager.GetString("textCopyToBKRD", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Copy to HAZD.
/// </summary>

3
ENI-2/ENI2/ENI2/Properties/Resources.resx
View File

@ -1432,6 +1432,9 @@
<data name="textCopyToHAZD" xml:space="preserve">
<value>Copy to HAZD</value>
</data>
<data name="textCopyToBKRD">
<value>Copy to BKRD</value>
</data>
<data name="hand_red_card" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\hand_red_card.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

22
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -2197,10 +2197,24 @@ namespace bsmd.ExcelReadService
}
else
{
reader.Conf.ConfirmText(lnType, ladg.CargoCodeNST, ExcelReader.ReadState.OK);
}
if (ladg.CargoCodeNST.IsNullOrEmpty())
reader.Conf.ConfirmText(lnType, null, ExcelReader.ReadState.FAIL);
if(Int32.TryParse(ladg.CargoCodeNST, out int ccnst))
{
if ((ccnst > 0) && (ccnst < 21))
{
reader.Conf.ConfirmText(lnType, ladg.CargoCodeNST, ExcelReader.ReadState.OK);
}
else
{
reader.Conf.ConfirmText(lnType, null, ExcelReader.ReadState.WARN);
ladg.CargoCodeNST = null;
}
}
else
{
ladg.CargoCodeNST = null;
reader.Conf.ConfirmText(lnType, null, ExcelReader.ReadState.FAIL);
}
}
}
ladg.CargoLACode = reader.ReadCargoLACode(lnLACode);

7
nsw/Source/bsmd.database/BRKD.cs
View File

@ -126,6 +126,13 @@ namespace bsmd.database
}
}
public void CopyFromBKRA(BRKA brka)
{
if (brka == null) return;
this.BunkerFuelType = brka.BunkerFuelType;
this.BunkerFuelQuantity_TNE = brka.BunkerFuelQuantity_TNE;
}
#endregion
}

BIN
nsw/Source/misc/SSN LOCODES 2019.1.xlsx Normal file
View File

Binary file not shown.

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

Binary file not shown.

17
nsw/Source/misc/readme.md Normal file
View File

@ -0,0 +1,17 @@
# ReadMe für misc. NSW Dateien
## PNG
die Png's in diesem Verzeichnis waren für die ehemalige dashface Ansicht gedacht (Demo / Webanwendung). Aktuell werden sie nicht gebraucht.
## db.sqlite
SQLite Datenbank für alle "gepflegten" Daten, die von ENI-2 und den zugehörigen Services verwendet werden. Dazu gehört
- SSN Locodes
- Locodes
- LADG Cargo Types
- LADG Cargo handliung codes
- LADG LA types
- INFO Port Area
- HAZ package types
- Nationalities
- Vessel types
## Update SSN Locodes
Wenn es vorkommt dass ein neues .xlsx mit SSN Locodes (oder ähnliche Excel formatierte Daten) eingelesen werden soll kann mit dem Tool "DB Browser for SQLite" die als CSV gespeicherte Datei importiert werden. Die Spaltenköpfe als Spaltennamen wählen und auf korrekte Kodierung achten. Anschließend die Tabellen einfach löschen / umbenennen oder per SQL aktualisieren.