From 40908e1bb329af749df000b1aa8a47ccbbd0848c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 12 Aug 2024 15:27:14 +0200
Subject: [PATCH] Remove DEWHV as a valid code for declaration classes, but
 leave it for initial application

---
 .../CopyDeclarationDialog.xaml.cs             |   2 +-
 ENI2/EditControls/VisitIdDialog.xaml.cs       |   2 +-
 ENI2/Excel/ExcelUtil.cs                       |   4 +---
 misc/db.sqlite                                | Bin 14426112 -> 14426112 bytes
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
index 9bdeb82c..9242543d 100644
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
@@ -57,7 +57,7 @@ namespace ENI2.EditControls
             isComplete &= imo_OR_eni;
 
             string locode = this.locodePoC.LocodeValue;
-            bool validLocode = (locode?.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK"));
+            bool validLocode = (locode?.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK") || locode.Equals("DEWHV"));
 
             isComplete &= validLocode;
 
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index 1f72f918..c1a8289b 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -133,7 +133,7 @@ namespace ENI2.EditControls
             isComplete &= imo_OR_eni;
 
             string locode = this.locodePoC.LocodeValue;
-            bool validLocode = (locode != null) && (locode.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK"));
+            bool validLocode = (locode != null) && (locode.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK") || locode.Equals("DEWHV"));
 
             isComplete &= validLocode;
 
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 4eb0c169..eead0e8b 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -1897,9 +1897,7 @@ namespace ENI2.Excel
                 string tDraft = string.Format("TOWD.TowageOnDepartureDraught_DMT_{0}", i);
                 string tLen = string.Format("TOWD.TowageOnDepartureLengthOverall_MTR_{0}", i);
                 string tBeam = string.Format("TOWD.TowageOnDepartureBeam_MTR_{0}", i);
-                string tOp = string.Format("TOWD.TowageOnDepartureOperatorCompanyName_{0}", i);
-                string tPoc = string.Format("TOWD.TowageOnArrivalPurposeOfCall_{0}", i);
-                string tgt = string.Format("TOWD.TowageOnArrivalGrossTonnage_{0}", i);
+                string tOp = string.Format("TOWD.TowageOnDepartureOperatorCompanyName_{0}", i);                
 
                 string towageName = reader.ReadText(tName);
                 if (towageName.IsNullOrEmpty()) continue;
diff --git a/misc/db.sqlite b/misc/db.sqlite
index 34e237b9e95cf92d580033c80bcde71008f0b378..2933573cf10fb053b25cf190302f4bd838ff0053 100644
GIT binary patch
delta 986
zcmWO0XI#ty7{Kv6jq8faEQ(Y}Mp+?*w3UpEZ1LD6o2-h**$Q>G>^;L@iq4E=o|)eE
zT7A6o&hN$d{Ws6i=$?nd0CQ$hV4Pc~DIzx~UsTL0%~V`eTvgmu+*K?p9x7H9PZckf
z<|-{zyj6Tud{tViv{GrU(nh7NN;?%l6@QiXDjie;R035xs&rBbQt7M`{6IoV|9IB9
zrJAgvRzItk;oBHeX|~lgg&-7N&=uVfhVBSQ5A;MY^hN|C(Fc9e5B)I!Q5c9p7>sBP
z!B7lC42EL_Mj{rY5QlgqAQ4GOMhZqF6=@iQbd1F~jK>6IU?L`AGNvFCQ!x$GF#|I(
z3$rl?S(uA?5X{E{EW{!##u6;WGAu_nRv-r}u?nlP25Yen>#+eFk&8{(j4jxTZOB7D
z3a}kJpx6l;c40U6U@!JzKMvp^3Q>eZIE*7GMhWaVieosA6F7-eIE^zX#aW!gd0fCn
zT*75s!Bt$tb=<&B+`?_#!Cl-#8Sdi&9>OqcnjQ^`uvl-Kqnj0&49~`jP_sR<sUp_M
z&U)l+HgZGCqb#l_lgZ0g7G93Ws6Zv2;3=x$z%x9@3%tZDyhb(N;4NzK4z+lX5BP{r
z_>3<`S-3O3#MM$|O0v5-oN4w9hcmG_<64wa>u~;c_u`V`7ZcDkEIz>=>|Y;XYp8bO
eE56}7e&8p5q0VTi{vDL;(#d0@Vezg1=kp(T)jLW6

delta 972
zcmWN=S2)!H7{K9kaO}{ejuI-QG^9<*tRzkC`L*}nMfExDXgKX?Y7gm8DW|ESdD`5%
zj>lDZ{odz!a~uusIn1}3vkQWgEZL@*w31v=F{`+!xT?6RSXA6qJXAbYyi~kZd{lf@
znyL7y_^Sk{G*@Y%(o&_BN^6xiDuF6NDs5HTsaRElRobg`Pzh1#s1jNxVMTv^Yb^;T
zuW+wGFCR;S;nxsWX|~lghB2I-*qL1z!AM52E2G(s-5J9k?8#p2%~<wf9Q(2#`*Q#X
zau5eIo(UYnp-kj3CNY^QOl2C=Ih-Rnk{KMuOpaz2$8apiaXcq*BC|P(lR1S`IgQgf
zgEKjcvpI)zDV)doT)>4~#Kl~~rCi44T)~xG#noKHwOq&b+`x_8#Le8ot=z`#+`$~?
zawm6jH<fv`aS!)$ANTVB5AqNXGoJ-K!lOLK<1D0|CwP*lc$#N;mgjh$MJ(n8UgRZS
z<`rIL39s=wZ}28>@iy=9F7NR^OZk9hd`QEnX)KS6G0Y9+c`k-6tRm9G&D%B5#a0?s
z!AE?|N<QIJR?)#{e9jkq$ya>MYQEuHzT<n=@B=^c6F>6{zZ#`c&dfqLlgX5Bw>X>`
z<|=!Z!<lApN{o#)Y8=iccc0W^t9xL)H98_W#U2_|XSLN=JNb>@`GY_Ci@*8DsIRUK
QNp}tLv=|-%b^rYT16V&ddH?_b