From 5d58beea00b9db6381c69de1326805283ada583b Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 25 Mar 2017 18:09:52 +0000
Subject: [PATCH] 3.4.8: Korrekturen und weiteren Kleinkruscht

---
 ENI-2/ENI2/ENI2/ENI2.csproj                   |   3 +
 ENI-2/ENI2/ENI2/SucheControl.xaml             |   2 +-
 Stundensheet.xlsx                             | Bin 26691 -> 26706 bytes
 .../bsmd.ExcelReadService/Confirmation.cs     |  29 +++++++++
 .../bsmd.ExcelReadService/ExcelReader.cs      |  30 ++++-----
 nsw/Source/bsmd.ExcelReadService/LocodeDB.cs  |   4 ++
 nsw/Source/bsmd.ExcelReadService/Util.cs      |  61 ++++++++++++++----
 nsw/Source/bsmd.database/CREW.cs              |   4 ++
 nsw/Source/bsmd.database/LADG.cs              |   2 +
 nsw/Source/bsmd.database/PAS.cs               |   4 ++
 .../Properties/AssemblyProductInfo.cs         |   2 +-
 .../Properties/AssemblyProjectInfo.cs         |   2 +-
 nsw/Source/bsmd.database/Waste.cs             |   2 +-
 13 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 827f77e8..7516ec77 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -58,6 +58,9 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\containership.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml b/ENI-2/ENI2/ENI2/SucheControl.xaml
index 8cead552..146979c5 100644
--- a/ENI-2/ENI2/ENI2/SucheControl.xaml
+++ b/ENI-2/ENI2/ENI2/SucheControl.xaml
@@ -6,7 +6,7 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:local="clr-namespace:ENI2"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="600" d:DesignWidth="800">
     <Grid>
         <!--Label x:Name="label" Content="Platzhalter für Suche    " HorizontalAlignment="Left" Margin="48,128,0,0" VerticalAlignment="Top"/-->
 
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 36db0cd068515df6ec1fc3d1db82dc9d3a3c65f8..f463b495667573d0c981d9640882fa8fcb55e784 100644
GIT binary patch
delta 11417
zcmYj%by!th&@YV$(jW~|(jAhAt^;xi>F(~5+H^~&bayvMcSuM{D@ZpSK>8lv?>^tX
z`>*}XTC--Y-^7}ky$5FCf6Tzw9g$%2yj7kfV1k1ad<_pr1ee5VK>}py+dGm8xI9x(
zy@=10cEP<@YP9sWz*t3{sJ<YNM+~xKyQ^v*G5F0gk<irHdUtJ{^hx@X(Zl`fW?<#?
zbH~@AR_}Lr=hwN<7w6YoOILGOPus2hY3mESms^h~+uNlNj)oh0&nG<}0bxA@;hr_W
z2e;eni`BdDJ7;@)6Cj}LX$koJw7NaFnG1;K8nS&0ah!H!1N=YVJs;lR-)&Ftg?H{%
zj-2f|KBrB`DPwuEKj$hN*5vkpvd=_A(<r(PI=@@A`L}hxco5Tl^VXr+zPQ?Zh}*lk
z*k;Gtb7WT;ox3|)k7j?ln!er4)m|AG;oYJ*&3S&FxCQz9`T~DXr61j1uAg^qsi2oz
zzqc!UeD7}ly4}uc*4~0TPS#~p$)EEFL2H1ox3B->qsz{a{z#BbcHGj4E&IXAk@BrU
zaQO;*&Q$KEUiXoK-+uV><^9PKMDoQCcs>z$co>>kR|e(u<bb-fKzCss-@HCQKA-JP
zv!6{H_T0BV0M(t}(pUbJj*RpupFIy1@;!4;|IR+(_M|jC1w>>YPoU+|doOQtF<;I%
zyHc_CfIW#U3GnmC+>o;8^xkcp;mh9h+{AP@ZTE<;Akh7=b2I^nKHuzJJ*DLuKF(#=
zR+f(&_}%*ng8-=gPPFTeN0L7!Wsi6M^UGVTTeVW)%H8ia?tITtW!J;A*}d~A|H^Cg
z!9SP8$mjFLMcQ842<kJNd=%F=F7dFJBr~_{)ZbB_-v-ZPU*^0l4Zm^E2>D!PI|y~T
zkzZq^2yS$(b@@F(|E`9f?HK&tJM)}NKQQ<#e(ilpz+=3r^ou{ufZZ@~x?2SB>-_BZ
zbVQpCVDsZ}UcZuo(rx)k{q4Y)(xe`aIA1~QPl;I7^KWGagjH~Sl}c`J>2@XGxMEK>
z*OHb~ZKhnk{wk<`)|sKNG6${~QXp=Ds3DDgf>+wW8w~xr;W2_ZN`y9p3a7qpf7h~l
ztV)Of`lG3%J63vc{!6q0;(p34X4%c{#YvGeP;oiaGyL~Kw8Ax|qL881@#pnUcJB=K
z`7CLW)*EqbrnXf#Ehhwsq!}HS_xjd@s}kpTj>=3EgkT$4EA$|(3LGhQS1MClv97q^
ztFBRZecue~(J-RiKX|_~wU)u2wL|5el?!N>Q9GNCp#<61EZHLzIzVbj`?Wf7Xb-};
z0Yvx$hYx-gt(H8QYt_x`&RM;VY^C)NcPCh&=aX7c%;`eg%K)W;A&`SH1dlqz*!}Cf
znwP1t-s9?!!^rtb-N;+fWcI9*w;h$IqqWB#1E0=XWbfD)Y&iik-4$B|SuE-d=B$fX
zNu(@UV`#XRE!DZv&Is>%;Vmu;ekFO%0Y;VYp{ldNa##)HQ$&o90f><}_0aOxlw!v#
zo>7Un{s`$wnXzIP2WUwOagw3MkoD<|Y)rC1WaY>zM-~4jVevnzCrNqg{`<N#;Q9wl
ztvh!I#kX%R|A>{I#>s?<TQJ8{&6?C^iAqSZT7=c)vgpXbWvqXLeiW!e;sPtD1M1%U
zk){mkj`Ae%jeccgy~+!*G(W|=);UI5Kxhg(BM0HdgO`pL6PsourP|Udh6|v;$xA$$
zaRAa4j(tO9)i6)4E#G;IJ<1|tta{K#5%<XG^K4f?eCDe>?~b+EWgM^Vjhn1cyQ?h0
z@;z6{qqUOApme;a|FQwLX<h)Rsqd;8yFuakX%Ox}5nQ!msmLVqfs%%XP^QMVp&S0o
zjwbx^>!XPv)jQ{1<3ZKC%&OW-Eko23{{gDT=h=G-=i>%^*W->7BB8wco7n?1n7F2n
z4ru6tQlm`<ymh^fsa%pX74}xZcIE8#ad9DhC*8LYF4=v{_Xu)%zdQixq8WD~t7WY7
zur#=QiKVkv&DD&@AX_dx_%B~VWn#rGO!G57Y)K8ND$?wIos<$|PtBqCYJ^(R$J!Jy
zO@?H;a_S{zyxJeStmVLCk)yAm>F|ot;&4@SsC$>Kf%by~(G^dMEd(v*_oXN4elQKq
z<i;F-Mr6S7%E)<uxW*Y^9FyEVV4aHNagZ4!Wypyu603)jQH)A6>t1n+W}Mc|ildA6
z-5Ueb8{vPbL>rCxbA#7P`PyRaH(3Pv#OMklvMD)5KixO+)2~x{t7P|*#Vyt)jTYTM
z*f!vIo|f)g`n}FIDHg6fm=!odGfU0kC_m-&oK!VAuspU0Hq9InNxVPC)i4H6{s`_m
znc*hZj?%wXx@oBmG4FsfAG4w-c8vV8G7DKh%dE0DL>u>Zt0XpC6!{}5gb^!~iVFrM
zVXp8kuLKO|1Q%PzfAStK>KKVn$FW#fj{b8rcLcBBw&3t$v*s{Zi=yOkfP7Oa6z<Op
zKUllb@uT(>xZT$rAT2$Y$q70O^FKd2ybhhWU+veY`@Cd|@F7C)JccMq2VF!+W^hqq
zLA^$hPdmc?yF^*H3{_)oerPX;#~<a4#`%^p2_&9ad<-#Svs4P!5H<ADkUH?D*}ImM
zLH$}nKTX<Gt#~L|(*+I9v3A9ngq<xRf}agahC3DxpdHTVZ^l>;<+cr2U6c6BY0d6~
z!~@N$u6Q80AVODgkDKM7QQS01(~TJVfy$Fiq4~v;$ZSExRP|uC)-+`K%=0r(i{AZs
z;xeX4A(e~quo=vLr_y7n9{Ao)oVlR4>OCt6hm~h%Qn{2r62;}O6KRjD-d#o5wLhjr
zD5e2`v{cJLgkAImd5jhl;NYA#VOZZLly&XNY{E4x_p)rlGaXTUxyR?({z#B1WF*|9
zYwSv#G#>X%PLn#GtGm8)skzkvPjkN>)fU59{`kR@%cT6VeO;do7&^ryA~@6dsXttF
zS-G54^wSk^@Js_6)_20RO5I4lvR?gFBpOiM_wcx}YxvfwU>8Qp>p*0-!WQ$r#YR@E
z-iQw`^Nms}e_r1urp@$QI&k%mMydlLp~)f6pnL!OcBk8L`Z>}WEnl}=VlzTYk4iV8
ztb1(*7Jr+s4N#>p&oZJ7`1k%WW0oDL1ozP6kaz^U3femVLg85yL5afP0>@c+h65JS
z#p#$=GiGjxBnmwvW@IocOfvpRZfNgG8*<=+sbuURW_qwtr*G_{4Pg@bswXq}WBL?A
z{1st6VED4qxwHRI16ARpbe>S-4?!N}4)`y{n%f?sedglj(0vY${!<~=u|eku4YPZC
zN1}BH!!MF6Tpg$buHafZ1@x{XJOG}yn3rrqso1Y&m(;@o2;l#QwDxJ`#LqHQ-ufgn
zbpnB872T2vMcXu+v%G6Y+$6-~d@BqJO*ycW^ItRGYziZsDZ?Fpz~K6%T7t+e&0?-W
zm&g&a%@(TgGQTn6N0&7~@p*tsjn`arCf|fng*W}qVUAy2cc)}H&Q*xN5vU#XM2(3f
zGGhuUK@n+AD2C|v9b`k_6ho4(mo*VY*NDAf-0u_{Fh9K1<F|;WhjuCDstEFG7l~v<
z`Z}Kmh~oz<X3ND-;^>t2Q|}O_?7ph^Q7ES8Zmt~+MRngb4$UwTm#5>E#dm&35wUg4
z%q^uB<za|MaACFhCU}w$=!ZB%xFvCzB#PHd9Loq1)V?`%-ge_kQp}K>#FrBd$NR+e
zYrPi0KO9uQe_i2Wr2|E`;((w+6Nt>p2Z;`RZBT`1ykdKI8dssj#cD~E&SkXTSo^XZ
zqw{EmN-US7s=F}`_fe|lV{sqUC1w!sabQSEfFvq;@PdZr+5G@X#`z|ZJ;((GW?Rg^
zlR_zO_K)h5m-!Nt8)00)2ldBrntQB&TrcqJ6$!=jPvQT;^Ws$Y7fV*LjcZi>)e~yd
zPa1HBiX63BF(kT}9BcM*=iNfL&kl&K^xP?Jl(mcc9l;dMdxRoW?+2H(fPwE0l)v7v
z!+UN54iDQ4@3QBFrp)Rwl`_>31Sg?$<<AFg_isS2Q9#1p({Wq!_h`JAg_0liKq4Ir
z>^b`hn>ABgApE#-nlL54L#<^bZz<GBaSf1J%uj|UHyWD5Cl0@0cj4JWy^}4Ka*rfp
zA&p5Q2S|@`d^z7&&f`HEa354U>uQcaaYY3%%lCLLQ|}y`Cuc6fy#2PxF{)0gL{2i9
zP&}y}22CmQ!q;KQ0WlH0lp-9N4)JUm+>)YX5CoLqRL_p8TC9lh$K*3-?T1P{MMT9Z
zTxU-1)mw-zsF)yR*c9GLW%6E@TFj?97HP!Ay>7meEnZQQxzXZo*sp@2M*5{na1!WO
zwV-cZ8&$O(kquqBD^xvUBs1t5yOHa2r5M>x2!aW-NutV_o8^jOF_*FT1}*pEbwSF=
zRhmC;;2%*k*LQ39NLNh<C9b3=8Y6}4w!I_((*$vpZ1~fZDJSd6cpo%e5M(ioh|F5}
zcai2fsZzP-HX5X|WjuY=%d$aCz=DHIM{G)r`0kW6e~fs^N;)TGFI;OpW~HH&rJS6S
zz-BKlKsP@@FMqd@(Ld;W6oD<E`krDzNnbyk%~DR^Ga=sH-9OdVP!#bxQ?J!Q?P?vL
z6Rxl-?5&EtpZkaGoyl_LP{#QsOfsOHYs@{9{w-VoyUL=Edh4$y7b(|100fXP)ZxeN
z3aRFli5t_?<Cq*r<L;RyP??ZQ638DU@xy)(k%S?U-tsv^gp4aQWC%2H%{6+$FQ)P)
zklwRqRsB)G@L)82n4=Rb0K6A}HhK#mG?^g;kI$R;Bsl!ZHgBx)h;M5}evoy#AznAf
zoU>JUBItCy^S!^u&6YMLP`%2t1E&5)%PQz#pp?Q&oOG&1?C^(2%7AY#9&_?-rXCqR
z|0ULV)0jnWZotlzb~kTi-+bii10vx=%%3v<#e!9yjEh&A1H`V_2#rGA=`N+Q^pRvD
zS>Vd~QLjN^srI>(Row7DOh0JML|nZ5EubU9g}-GQkpu(G^~b&q098`OY;8ny)rDd~
zNRg{1nA(3>_J5er`XUdZeVCTLFS*^WJTmjW_V${!%}R3f3ive`M8|kQnLKc$MXW!m
zCS~f9h)_7uzP&(CsmC2D4=6T9hL_2N%-M6?#Hpsm&`sc)MmBHTrb%=Ydqx6NZ;(Zp
zOP05Yp$8>-b(Jayz~6SIFB1gL`J=c`&Uo=lJzB^bYx$3^`8}~1+KS&HC|g<ARpq=~
zIbWZdJ>Gh<Fdx*8xYS$4RQ{sQpD_%Nh^ai>w9vOP6XkuP3j^Dka{TT(i=Q4*yQ21E
zk=(uS!6eYOS$^3I9^&K6tC2xfp9S8$iyu`usqHUL#Fc9XfP2N)g!|h0z(p0=3&m3Z
z0O7CkPRMqyafxSNUJ>Xt;~cf!wKFD@{?FdGmpSI*=SH*_w)p2N$`@Y20*At7ICIp@
z*%$59{Ww`YVM?R+{^~b&CZgls0UsY5^HwlshOPcgduom{@G}|Lh0V*E6_Y^hoLJsZ
z!F8bS4}!p~fKRX8;bv}$11Ws75sv0Z$AWn}EGplX;Kb*sxTJU7+*B`mF#!r?a&0yb
zt)Wqqqv~Fb*$QttCUfA8-u0Ge+b2}4YtCjpdou<YGOhxmGj8@2MgiLx5!RTS&xuv7
z7I0cPPQfj3p{QlTdC&~I$312^{5ag2m1o$zFLaea<$ljFqM7!Om)j_1=U7JOnp=;^
zSmwE&EqL6T3SjO~Omll#RZ6J)X~`=9L*f4D!qF$-fIH)v04v_<)6=SOFNt!RXB{Vk
zQM$-8XHTAolslc~TZgjL+~_;yT0)MR5&%zS@h6Vor<f2##+<kxzEsB{T`QjujJ?4K
zzeO+rDBgrppwnjGO_mPrq?rybT6pVg>NtIXLE<-b=Leo$q2FOdjkSvyZhjrL=iBtw
z9t5=nxQVY#f3Hs#1=c1{E3;!(rivCY$-qZl0tIFW<mwh-#_gC<n+JX)bw!~TGW6W|
z&FO_pn0nwhIy1h8Eg_fkk$u)KWihE#+VZFXFHL<`XsT5slhh0nYyLNduw}uS$6Pmv
zGxCJ?O#XK+Y^AvZOdgR{L2NlU2&swSGuZ(L7)tgxjl>)8dycf@553jF!={-`IgK9@
zaj$}Yvd+q2E#O$IE#rQ5%rv$DbBxXezC#yml3vk`(w^{uM5|&ny8n|r^f>84=muEn
z>X~m<sG>F#_HpQ<M%g4`wtXow6@YQD#yK#$u((5*asDqy%7w{4`cRcrH1f9ivH)zW
z@$W3iz4aKbG43nv+>JVQK<qdIi-|q|mf{+aM-`!X4Hj`7ZMCJ@jymU0ix!N>X>o@G
zuRB7$s756WZ5rnRsbpk7`RV|U$whb;_qYt6&9ql0K8ncADZqfR=s~DVVba5S7pU$S
zG)(5Zp66;0C44v+q3`<0!hd(ZdO3gTTv*%RmqyRnrv7c2vNqP$%r{4?fH6=yMtLTH
zDZn&+IRGOuFhsNMOTAn7^lEn9uQVN-UQhCR(Ll`c9rJXc8j&c~fU|XckI>DEn`Q73
zNsu8e&A0{ANXy&3T6+Wr(LeID`e9yrnh@;7dBz9Ht5g5TU@Kfi{QW%KuP}JT1`7BU
z>$2!tMX-gc`Qru=k#!h66O3C3t#t59ZDFf4TXC}uzJ*c4|D)<bTd-0aXL477ele3T
z2;|8FqcF%`A^Mc2Mrcn3VcN@!nxy?N8Nnxu^4k}N;NCl-=oOC}ToArhz8*nXh7N}u
z3prO)9J%CiD#LzRDl2({6zo_!+%PcvdkrokJXkEn!&^AwUzLiXnpYEB90e?r2(<bM
zVbdPQf9+KCB%BA-nO6c?>~K(S#&z&&ld}npA%|d_<?wglD_gv=q}s1mxh^A~dvPh=
z4VE6hoO7-dXA!H>3b{lHYa8%q?tRQGqQ8Wau-zNMyGD|$&DsP7!e1AARV%zJYuRan
zf4`(F$2U~9QM9{@XoS})Cc5&dEl6g5LUTHkNfTsX4>bl_FwH(mp;n>SB8tN>ZDdls
zhe7R&|IfC@>fERzst3Bimmsy-pzh>zOwI?2%cG`Hn9I!@KlAnQ-B-lQ73T3XQidA0
z6Q+b>h0%%3`wnB<L~EmO4r?#qB;oJpKf;!(7PpXWg6PRzwo9|FP>UCYBCsas_H*c>
zH>d&f=qZFSv)(RX#igZZm=V8YgsC%6j^iNjn?Y)0o}@0V+@x||@TD4&#gSNo(GPLy
z#($s^>h7K8#tfJKEED;AMAzY05L=cNoVPSMN;5GXiTs|XhkaW7SkJtW?}}&a(#?y}
zFo#0Vvw51|W|~zQHLQq*;$|t~WAr8^0DSiU?E67PRAlXQ;Rz*+-Y!@Q{QR1AgX5xm
z+wx=1-C-2UjA42*pT>EkJ#{R$o|lF<W8hx~<_kByyel8Xwi!Tl6F{3zMOS*DjS|t6
z+x3~N{_Tp3eI{^_P&j||F}G0}yQ!Yvo%g;3lhN-<q{Mbgn>skDW77=(pECo+A8p-~
zqL!A9s7i_6$R>)HlPAw+mD({0=@<#><T6!o@+>svb(QX7QlzFdLFULLolxKJ&scET
z7AcA<MR&$8&TzS7;F3digs{24XU)I1lX-IjS(VqB4K(r)>a8Cz;FNcBRaBh8w5M;B
z`SwTcdj+{!W(hB~5x<oZY7h$$bI1rR&tNtUHKgk=xRb8`W5Z^+rfY5({pV!p&Kc#_
z^5OgBihF^(l6t8rZjjTrk_DJo#$)-cqi>wnbfYJ?{r&YDTNB0Q(VG{i;zLsds62Pd
zd!$TK=*Z{ksP(r>8+4Fv<Q*1L@~Gb*a<w+HoYPd36PwDqDSYk#tU%=VLZb$<Yv-O5
zXLaw}*ToclOr$Pp<90rdhzRCVo~Ov8m_^6>4|(i92eComt8=l^1<K^E%a7Cw)N|1|
z=2BRq)%+?1ed*K&ElTweaUj8%_!23CWlk~sp@eP$q3zWh7k&SZ(#R@>pkDIDlZnhU
zeI2uoqjjN^P7C<w>@A^a-s2t+Yg3rj_cp8%PV3)yH`$EH{+hGi2PaRnxIvaK+y;L%
z&ZNnu#-J+2^|}zQ<bQ9#p8L3*HlHF)K5*<2APtiPg$=;sQZBAN=6;^9!N1iC)-)Ww
zjRera*lZjtRi{cgu|9e8*L(<#P1uk_C97=!*`y@|y@}_I;QWn61=yir9vS@|)vUO_
z0dxFNs+CTvYapX+GZMWrvPCNr%Y^-cN$05cd;ue_+aMURP{LMRV{tJ^tekb`DrK4#
zT3Yg_oJNLd1|F{$0TvW(PoU`xH<nZ0XKZ!-JTb2u>Wj0*a%mLw$q1}!7u*Y}E$aag
zueM$5J3JkmK!fn!;})^#6AmG27s7kB=w{M&dY!U0N6<~}<CXXg|LOd*j6Yb|bFI|b
zB*g3VS=?FXpl(jU$k#ft;D+C0wep0EAa-xg2JM(ePswTD7j4o`!6f2h&uSZ|xO(N~
zor{Uu6jr4ew838shh0%Xz$n6Pn+UM5g%=WQITTe$z-vxND;KWS)CI?XW<dEQjT!`t
z_T?&`s>46Va^^A!kl$*Vk*oy9NR}hk^vafl=SZ)%<Q!K_zRLX>^hihB7wOc}6`Jpt
z5OzCy!0kKs5R(k%=lViDlC#!PQa6MAA=buy_G_;l`OIV)DTVY@zn2v^mm)B#c0;EJ
zc>cRXXbMl|@dZ@Ep&8WIM+li82fWHcL%n2!&%j8H?!9#oeSU_2if3ejx;X|;BJ662
zlxUJI<7so1EEESLXcJ*68Ryf)lFf(<#9=h9!VmOEVIJMsbnuyEztSw!5r~^KGqvf<
zo5%Hv_#|rCDn%*~Yl#I^UDNLfa=|VP)@JJPgz06%g2)YXx53uL_SlWui<-itpYBqv
z=c$`GBRE$~?`3F5X5lAR1Cka|eJyc={I{J)<5todwW+AIL7AVdmFDT39o|$&26!D9
zM<2W~%(f+L&?DuQ581wq?0EapXpuTTKnk^4NsMauG7^1~^vww%#;iUhk=pT^O+i0z
z2`9c7(a*v7-2^u-&z<(CL~Qpv-Q<ok<Z2H(R&~`NkSr@_Yv)uFb&Ivisz<@8PqgaW
z=3ct0E(LJ1IwiL(TlQxATwNRKZyQAhWo9}3AA#aOaHC2jL@nbY>Bkd1W93E1IrH7M
z>QAK1=*XRbJTXGR%_<u1fv8z&%4a3Gx@N@{gL{u2g^pa^&}8&SgcY?2F?oHw)X`r_
zBj7@<oj<M%k7Pc0s*2+?+8(Bp>o6?TBQ85mJUF2Gx!@aqE&7$xD%8Vt$QAp$-K+bH
z%OEGJ98OQ!12VFOw;&7n8?QTS*r>L`HL_0JbxVnYU_lLl?`A6}i!`WnjDOWGW|zx7
z<IS@Vi8h)i2#Ot(I8F@+t<KiT!uuDhmx*_A8GVv2GnXK-A5e-tAd89bz+L5E+y+0%
z%g##&B5>;>$jf>hvQ&-MZ~qoMs_*9iH}E~c;mturKoQ-!)ht7Naf~(9kXD!d5Kg!Z
zC-^o8D4YPMzZPeB2U}S8<hQR4dzkcDr*5PgPqy%ZleGM;6ECNye%L1y$F_0M8&sIN
zE;L6VaNDy@m}FMkj4V0CSU;+B7mw~;ZQ2(R=lm9yTF66Y^Fg0n3^I!(JY=c(7c8uU
zb7&~gXAt-mUQaGkqp)tU4K+vT*ZO{V&N=}G>{koE!riW(PCOSqLSP|l=Gl8zyjH4?
zY~_P6=>ksz@a<{?QVl9chDAr6_^KjgT&?lF$&+b^CBg+*UVxTzWtv`&7@UY{!y5Ds
zY+CRoauCPo74-c-dbKo$|Bv*U4Bym7e7q*-gb&oj@T~JpGy`_5CdtW7GdT3XM7^ws
z(YTf)XQUR*^u2v)oyDG6U)!AVn>pumo{+JvBpNBM^iHlS;`{L+&Tl;O@WJi3N0XA>
z23azW8Ax_CvreCI-?-mq_A0)OHIIBKR6C%HlyTso>9oIjClE3?{S9woS~Ph&4`pRi
z{Y${W87S!KF{d14(Q!f&Ae~JPoaSFYMN_R1?2*J{ne&S6)|Lf663>feCREOP{?#|D
zKv`r#t7kbt41O)MyDy{#+$olTGNvS69*Ori31b$@KsF))se#87a1-)ELuW?{hgg4F
zQ*#?ly&kK`;LRc=vy<;pbz-mILB8+|p6L(V7)p|C#q*ezmby~CnN6|-?jeWp(5kY)
zEtpVng@fB*ZUSlWI=;voQa+TgWM2%oc=O0hB9&w0T8x~eqbfH)sp_ex;tPkST_P6g
zwsu~2zL_Kc<Jw|mwaSF^tB&fx^QGLs&Y}`&BJs1>I?^GL$$O2j`=T441^v2UgE&m&
zuPkECVb^%?Rn%pB@gOih)1pn?`w7eto()Tv>$FY6HM8y=KEkeXtH#Pnw8YZ3M-Slz
zT-#%&iLF$kd26bXcx3Vw78=)}WI+bcY-0~0u?lC1rNX2BtNN=Iv>GwO#P6p^A1wuT
zi5T5g7-hqjI|5Qjol?*JDt_{CriD0CUl5Ty+x)qL{?cZ78UY5aYyT!s4vK$#2nc@*
zt16V{A1-|t9Sk$d<n6we4S<K_Uk0AX*;DQQ^t6lE2j-e|^;rl;H!yyB9O7tXB&L-F
zlb<+Y)O+e9`A4CUGd*0+pVad|w~P`v@WX6!{J?DVhZH#x6G>B92B|x5jOhk?C!LYy
zMu4W`-)H6cV&M3q`}-Qwhp(jWeUUv~u1dNA?Zj>rxjR4A+^K$8Sw)U-2=^4?e}B{H
z|C1Hocr7o^qb>^uz~q~Hd;Eu$dHW83#VWKxB3e_4vki+;STfOv&uJZiIqq%@OERo1
z@O^Sk1<bfCxl8Ql$)EXRqevrBhaHeCZ2B5h!DVZ_0IYO)^@r$47RlLK49tKU11o*%
z_#O8bFeY45EwqYGwGO(mOHr%}^*F<pS9<;L#W`05QcXKe0%;5LrG3kVBeC}L^f(GO
zIO0+SQRHh?V>}SF8wl-bDPpyF#n5;BI3^v?eyV`>d2v!3Irwx~HufVDs6A<K=bZBg
zG|1$Eos0ELU9t--uaMt^5r5<;!l<`Em?_8XbEb+)cd)OZN%(6w%l4j{0z1kXCsx~8
zPErUee0d#bQbrz#ChCQ8Qs;Yh@Qj-ypuIabZw)h_D9bz`Gm;wN^^BppFRbE;qgPnB
zI@X%XdQQ|(TxRnwo`)sOo_4wl=uTN-P6xotFz4iauDCUc>fRGk{~R_&dfWHz<cfd|
zriwf-4G;LDJ1y%^5vPb9L6;=N7MjQ_a<s@K<P)=ei71ly5DmPhskHY!Xm4#%Z3^tu
zwi4`&ali#VM?#2w$0TB%9dp@%R7Bv0=gSO5K<6C`bUHWiIVnNkG0ArReN6!<!vW9*
z5XOvV-V^PXDgWo(fUibu$Uo;!g_=_&H9V#CbcgW`aWWj#-k>BmF{YR)!K5P2f*EY7
z02E%h(xb&G<Yq03<-I34tt3GUNCjH6;oDJ7D3{!SyZc>6gnq|e7TF>!_N8NplChV_
z`;B|FDWn2k<n3fp_Gf@auH)StNR-(};u!<#2-fDt0t*l(1KnXaL!5HZO`5rSF$=O_
zXolj;xCF=Vik3Xq7f4~ug(bQAL+u!-uBxa<FhN6gcz!o%T$Q6s{U%_!_*Zvig?S9D
z-v6xU^x<#YFRxLLPzKa6!=zp~ocA(vM!zWW1N-X8YZ{JXw*d0tzl*dex1ks#l}fqx
z7#RXmTW2h`oY6S3q6HnhGDfM|_>jZb>2Nr5ehg;03HiO#m$490=8_=M_>w9QbZWhW
zIL@G6yQf*!-qYU?<l?)~B?tH()kDw`AvDmbSo}rDyL&_gUgfZV7Jx6lku_zAUnY9@
zpt^|MWZ2s_4%qG2M%$7i@B(n$@%$=>CIm(fhW63e0x|><dkLQcJzi<4HoyK#7SuhA
zu^qP-Ada0b^4iH5?iT!41@ZyOh~1%a+U(voJiz(WQzluEznZRkZ}mtwdX?4yVSEgN
zFvIU__M0&4;B-HRO8668jv5_ACAPqxoVvt@!9TUNfdBzpU_cSdd=7TtezLjS>qgim
zkmniB`ETAbHLzz~jWWYXm@b0Cq3br!ZCvkQaD*smI7rEE-)Gld=14;j<z$XN%SxE8
zjVQ;|G}0wdINCQabPbmpzk`04A_4R-c#Gks#IZvZ`OH4%d-514AuD|}7NFa>6gtK^
zO=tryVP1#hv9ntTe<uj~#hirUhAITuTeNVq2x)0`NZPXqip*`}CnR*BD;Rma4aj;i
zz)6bAYG<R$MEF4~M#s|GYZsg6X!<MCi45UTlrC`jKA633L`kLFlHlm^m;3$HCugL6
z?eZ5pi{8z@%YV=pe)>EvbGacc*4+*&KXd?Q+>p7RNsO|!h*1Xmz$j)h<cg07_BC)x
z_xLn$pW7VndDlP)3cLZN=*V1Yj8me?U;by(qF5#~#1!-L{ewEC*7oZ<mU4J^pUR$T
z-c1Zm&JYZSd$Az`D!pcu6}>=`v-kmNu}#!LiD|qnbcO}E-4P_NBaC7!b3ZD8{~=k1
zO0OCvzL8;VYRj|wE`w%+yYYTJHAf&~949ElEHJ~B_LBHy!LN$ilHTlNlYF_uzBZ>U
z;j{wj@^I+<Qd|7vvH}^UZCkulDim|_%@>5odr3tPX3$<?u&DlFZY^8jvpr*>HICAW
zLoc^AzsSJxO?XOCSAiRWfa^VQltSwdi%A}I<&Ikk-fw@8%R(HuW|cBJg``rOKqUsg
z537uY(2S}V*hE6LY|^h9iNXgm)lbc^ezaQ@%>5LIFZXs=dbVhOFq=P2KSU_$sdtMP
zyd;F9Wp8F3yZ`2ZU;6pPKqnjCLVw2DAj(M{idM6x@}pd-k@7rS9(d)zuzWL8DJdwP
zn2i=7koR4dN~gp{L|=b(fqOCs(a3hJThjn{LYx#%uu1zfwK<bJWXa<iR;~mD0JR=p
zBgsw<QgoW?#qO9(nG03)S!g)a&{I=n3NJqqHIzxuU7Lzrh>7c#@$kTME+b&r;3Pe1
zdijZwgO!)EcRw-@Kyy=h<{q%qpAoI_bG>XIBFu>CzYm26MDkiL4-+YY>6=RfXL$J@
z)%QP<ahuZxK(qYLI$hCDP4kEM%z?|Sfy)@l+)-pr>Kxsx8t+R6ZpT+uHE*D>4fe)J
zNrz{|AnnhjekyaexkLQ1&-t%2miqRFfZXDSGyv27b09!cn5qVwZ%fpSM7s??l5z%a
z1S921XRcc`R8e~jtn2bWk$hx@*Ve(Wf13Qw0Ze<XPO5|FE5SYm^TpR4=Lf>Fp{$3x
z1#<J#tevf#HrKo|tfg!xIOzh^@hY~p4xWSpH^(c(WeZD0&5tTpWD77!Fhik}eoqBU
zWORV4wV!W&bpoL?4^<m!w{AMMwIF3Osr2}^9Z%YwIB5}1>bpy^l7+jgL33WeUQhaW
z`x9q;{;q!~iO;*gh%xui@>Fz2Az65e@h}JLoKPdM<~n>m<aw{hSlY;kP@VItNkJ35
zu0acHcJZ)yeGWJy;67T+lgu=JC(1k{UOWfD+FEd^D>rgi$L<Um6Iq1|GPw(Qxdi)p
zswV$1bi!s#?7|Gy&d5$&oqSzy0&6eI8>d$zh6T%^9=S72D){RZ9V^*GwM8zp0|}V~
z24Lz(87r!C*hraPW^=?lng5B0rJiGy!I1elVn(h}EPg<qksKHBp?;o+@od~3(DLJd
z-_13q1@K!MVt=~Z@9XXs>EG1z&f_4tzdE&2dY|8TyV`(J6B=AVVI*ZH#qF(6QB=j?
z(*!5Iyg>fpX{s=$A&DR#e_31~o_OOnAHwpmR>tmCuaPYL@xXj+!F!K(p5b%Gnvk1V
z`5zw#1!A2=b|)F<i0*=8XD0RupyshwzD&h~3svtZYIVtVDFlvZ@&33N$<N5ghQTMR
zKW+R}MP_*nLvGo5&zWW3ByQ|vFiIy5&r{naWj$jwHzslJ4?CT#L4VF@p-J_7Nu8Cj
zpcm`*KZAwpse1O8nUE_w%PD%s_VFdWeu`pASQ}8~GW`cLxJIuCCf5Z}Kvx*MFmt7R
zJ=A4B#r?WT>F7bAUO0tLGj=wFOW~uu7-PFjEw=%)tv~VQFDvQlku?Ktj~#3!i7yRm
z{*dt+uJL?`-jTO|yZ`f@uRrmb!Rbc#v;XbR<5FiS`|V~9dv^}#q1K`1@fhm%Vy-iV
z3F|mMQapQ{Yi~Ndf7mg7dVHAMo|xDkn2ZDEo{47XmQebA27yGo&q0p`E6@eXY4#r9
zp1=OLPmj>;r<d$ay?gk_ziz<ujmxde%iojlJGUdHX{DVHZw<d{-sW!Ti9YS9@y`+&
zyxjbS-sbhMzMv*?qTwg$T3|OyNxw!$3#>%w2I0WL9VKZhEMZbCeox#75repZgYKvN
zMq#iHHbEzJEfLiwzpcn1(OtoKDUihV9Dx0-iiVF&yHnUC+1RE_4-XiE2RQJDHj#TI
z$9yvRTwTLj5K}}1u&WrlL;pB1^8s=N>)l<}oeP+QBR<n(XE{Fd-GZa^_b5j;)vuH3
z7^B3TS#6q`XKb5e(->TG82d=7^TcGGtUehS?yNy-ScP@%d+$l~@a4u;99}owZa`wl
zH-pXC&@c%Gt6LK9AixSaUkuPdZj@Mp&eF%-Cp<vT!AFCW9Ul}YcV(VQLG>XFg_hyW
zDb?)n(ovtn?Ow1!#s~A0IQnC^C?Run(TKu_Ux%|lTkL;K-4ne7!Z!Jp*`F$$t2=a^
z#mw10>=33ewM<?#y$ZKYzshvlwtutrOauja2i-cOzKUQ#$`g@XYrN$1@v2%ZJ9Z!{
z_2e9@aFgE)!M&XQ^37`#nS|t$=dYoO2We?z`edb@{2ZwQA>I}-$Di&;q#dmPz-(kO
zI6!^<|NaP0qO{O}XGrp}pd$TW74g8q;lus^k3>?v#e35K)Bq0$r-A?n2h-&L_cSJ5
tS%@OA8YBrCFed3)G9gs`d!<dPvSf$nO<J=QfhSBNv7$jKG5yE%e*pRMD$f7_

delta 11397
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
X`4Cyt5ACH8(bG8`n9;Irp4tBg&pXT>

diff --git a/nsw/Source/bsmd.ExcelReadService/Confirmation.cs b/nsw/Source/bsmd.ExcelReadService/Confirmation.cs
index 5d8f6358..f0fb58b3 100644
--- a/nsw/Source/bsmd.ExcelReadService/Confirmation.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Confirmation.cs
@@ -114,6 +114,35 @@ namespace bsmd.ExcelReadService
             this.ConfirmValue(lookup, value, state);
         }
 
+        public void HighlightCellWithState(string lookup, ExcelReader.ReadState state)
+        {
+            for (int i = 0; i < this.workbooks.Count; i++)
+            {
+                Workbook workbook = this.workbooks[i];
+                Dictionary<string, List<Name>> nameDict = this.nameDicts[i];
+
+                if (nameDict.ContainsKey(lookup))
+                {
+                    try
+                    {
+                        foreach (Name someName in nameDict[lookup])
+                        {
+                            Range range = someName.RefersToRange;
+                            if (range != null)
+                            {
+                                range.Interior.Color = this.ColorForState(state);             
+                            }
+                            Marshal.ReleaseComObject(range);                            
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _log.WarnFormat("cannot set highlight {0} for lookup {1}: {2}", state, lookup, ex.Message);
+                    }
+                }
+            }
+        }
+
         public List<string> SaveConfirmationSheets(string receivedFileName)
         {
 
diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
index 22997597..6cd1766c 100644
--- a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
+++ b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
@@ -365,7 +365,7 @@ namespace bsmd.ExcelReadService
             return result;
         }
 
-        internal DateTime? ReadDate(string lookup)
+        internal DateTime? ReadDate(string lookup, bool noHighlight = false)
         {
             try
             {
@@ -376,7 +376,7 @@ namespace bsmd.ExcelReadService
                     var val = _nameDict[lookup].RefersToRange.Value;
                     if (val is DateTime)
                     {
-                        this.Conf.ConfirmDate(lookup, val, ReadState.OK);
+                        this.Conf.ConfirmDate(lookup, val, noHighlight ? ReadState.NONE : ReadState.OK);
                         return val;
                     }
                     if (val is double)
@@ -410,16 +410,16 @@ namespace bsmd.ExcelReadService
                         if ((date.Value < new DateTime(1900, 1, 1)) || (date.Value > new DateTime(2030, 1, 1)))
                         {
                             date = null;
-                            this.Conf.ConfirmDate(lookup, date, ReadState.WARN);
+                            this.Conf.ConfirmDate(lookup, date, noHighlight ? ReadState.NONE : ReadState.WARN);
                         }
                         else
                         {
-                            this.Conf.ConfirmDate(lookup, date, ReadState.OK);
+                            this.Conf.ConfirmDate(lookup, date, noHighlight? ReadState.NONE : ReadState.OK);
                         }
                     }
                     else
                     {
-                        this.Conf.ConfirmDate(lookup, null, ReadState.FAIL);
+                        this.Conf.ConfirmDate(lookup, null, noHighlight ? ReadState.NONE : ReadState.FAIL);
                     }
                 }
 
@@ -427,17 +427,17 @@ namespace bsmd.ExcelReadService
             }
             catch (Exception)
             {
-                this.Conf.ConfirmDate(lookup, null, ReadState.FAIL);
+                this.Conf.ConfirmDate(lookup, null, noHighlight ? ReadState.NONE : ReadState.FAIL);
                 _log.WarnFormat("error parsing datetime for lookup {0}", lookup);
                 return null;
             }            
         }
 
-        internal DateTime? ReadDateTime(string dateField, string timeField)
+        internal DateTime? ReadDateTime(string dateField, string timeField, bool noHighlight = false)
         {
             DateTime? result = null;
-            DateTime? etaDate = this.ReadDate(dateField);
-            DateTime? etaTime = this.ReadTime(timeField);
+            DateTime? etaDate = this.ReadDate(dateField, noHighlight);
+            DateTime? etaTime = this.ReadTime(timeField, noHighlight);
             if (etaDate != null)
             {
                 result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day);
@@ -454,7 +454,7 @@ namespace bsmd.ExcelReadService
             return result;
         }
 
-        internal DateTime? ReadTime(string lookup)
+        internal DateTime? ReadTime(string lookup, bool noHighlight = false)
         {
             DateTime? result = null;
                     
@@ -518,17 +518,17 @@ namespace bsmd.ExcelReadService
 
                     if (result != null)
                     {                       
-                        this.Conf.ConfirmTime(lookup, result, ReadState.OK);
+                        this.Conf.ConfirmTime(lookup, result, noHighlight ? ReadState.NONE : ReadState.OK);
                     }
                     else
                     {
-                        this.Conf.ConfirmTime(lookup, result, ReadState.WARN);
+                        this.Conf.ConfirmTime(lookup, result, noHighlight ? ReadState.NONE : ReadState.WARN);
                     }                    
                 }
             }
             catch (Exception)
             {
-                this.Conf.ConfirmTime(lookup, null, ReadState.FAIL);
+                this.Conf.ConfirmTime(lookup, null, noHighlight ? ReadState.NONE : ReadState.FAIL);
                 _log.WarnFormat("error reading time for lookup {0}", lookup);                
             }
 
@@ -601,12 +601,12 @@ namespace bsmd.ExcelReadService
             return result.Value;
         }
 
-        internal bool? ReadBoolean(string lookup)
+        internal bool? ReadBoolean(string lookup, bool noHighlight = false)
         {
             string val = this.ReadText(lookup);
             if (val == null)
             {
-                this.Conf.ConfirmText(lookup, val, ReadState.FAIL);
+                this.Conf.ConfirmText(lookup, val, noHighlight ? ReadState.NONE : ReadState.FAIL);
                 return null;
             }
 
diff --git a/nsw/Source/bsmd.ExcelReadService/LocodeDB.cs b/nsw/Source/bsmd.ExcelReadService/LocodeDB.cs
index c2a98299..765b804c 100644
--- a/nsw/Source/bsmd.ExcelReadService/LocodeDB.cs
+++ b/nsw/Source/bsmd.ExcelReadService/LocodeDB.cs
@@ -11,6 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
+using bsmd.database;
 
 namespace bsmd.ExcelReadService
 {
@@ -103,6 +104,9 @@ namespace bsmd.ExcelReadService
         /// </summary>        
         public static string PortNameFromLocode(string locode)
         {
+            if (locode.IsNullOrEmpty()) return null;
+            if (locode.Length != 5) return null;
+
             string result = null;
             string query = string.Format("SELECT locodes.name FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port='t' AND locodes.city_code = '{0}' AND countries.code = '{1}'", 
                 locode.Substring(2), locode.Substring(0,2));
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index d0e52ade..ce305cd0 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -1155,8 +1155,8 @@ namespace bsmd.ExcelReadService
 			
 			noa_nod.ETDFromLastPort = reader.ReadDateTime("NOA_NOD.ETDDateFromLastPort", "NOA_NOD.ETDTimeFromLastPort");
 			noa_nod.ETAToNextPort = reader.ReadDateTime("NOA_NOD.ETADateToNextPort", "NOA_NOD.ETATimeToNextPort");
-			// DK
-			noa_nod.IsAnchored = reader.ReadBoolean("NOA_NOD.IsAnchored");
+            // DK
+            noa_nod.IsAnchored = reader.ReadBoolean("NOA_NOD.IsAnchored", (reader.Mode == ExcelReader.CountryMode.DE));
 
 		}
 
@@ -1244,10 +1244,12 @@ namespace bsmd.ExcelReadService
 
 				waste.WasteType = (int?) reader.ReadNumber(wasteCode);
 
+                if (waste.WasteType.HasValue && (waste.WasteType == 2313))
+                    waste.WasteType = 2600;
+
+
 				if (reader.Mode == ExcelReader.CountryMode.DE)
-				{
-					// waste.WasteType = i; // remove for V4
-													   // change for V4
+				{					
 					reader.Conf.ConfirmText(wastetype, waste.WasteTypeDisplay, ExcelReader.ReadState.OK);
 					reader.Conf.ConfirmNumber(wasteCode, waste.WasteType, ExcelReader.ReadState.OK);
 				}
@@ -1288,9 +1290,21 @@ namespace bsmd.ExcelReadService
 				waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity);				
 				waste.WasteAmountRetained_MTQ = reader.ReadNumberDefaultZero(wasteRetained);
 				
-				waste.WasteDisposalPort = reader.ReadText(wastePort); // TODO: check for LOCODE?
-				if (waste.WasteDisposalPort.IsNullOrEmpty()) waste.WasteDisposalPort = "ZZUKN";
-				reader.Conf.ConfirmText(wastePort, waste.WasteDisposalPort, waste.WasteDisposalPort.Equals("ZZUKN") ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
+				waste.WasteDisposalPort = reader.ReadText(wastePort);
+                bool isLocode;
+                ExcelReader.ReadState rs;
+                if (waste.WasteDisposalPort.IsNullOrEmpty())
+                {
+                    waste.WasteDisposalPort = "ZZUKN";
+                    rs = ExcelReader.ReadState.WARN;
+                }
+                else
+                {
+                    isLocode = (LocodeDB.PortNameFromLocode(waste.WasteDisposalPort) != null);
+                    rs = isLocode ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL;
+                }                
+				reader.Conf.ConfirmText(wastePort, waste.WasteDisposalPort, rs);
+
 				waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);				
 				waste.WasteDisposedAtLastPort_MTQ = reader.ReadNumberDefaultZero(wasteDis);
 
@@ -1313,10 +1327,32 @@ namespace bsmd.ExcelReadService
                         ((waste.WasteDisposalAmount_MTQ ?? 0) == 0) &&
                         (((waste.WasteType ?? 0) == 1300) || !waste.WasteType.HasValue))
                         was.Waste.Remove(waste);
+
+                    // 24.3.: - Für Waste-Type 15: Wenn in dieser Zeile andere Werte enthalten, als die nachfolgenden, ist die ganze Zeile rot zu markieren.
+                    bool highlightRow15 = !(waste.WasteType == null);
+                    highlightRow15 &= (waste.WasteDisposalAmount_MTQ > 0);
+                    highlightRow15 &= (waste.WasteCapacity_MTQ > 0);
+                    highlightRow15 &= (waste.WasteAmountRetained_MTQ > 0);
+                    highlightRow15 &= (waste.WasteDisposalPort != "ZZUKN");
+                    highlightRow15 &= (waste.WasteAmountGeneratedTillNextPort_MTQ > 0);
+                    highlightRow15 &= (waste.WasteDisposedAtLastPort_MTQ > 0);
+
+                    if(highlightRow15)
+                    {
+                        reader.Conf.HighlightCellWithState(wastetype, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wasteCode, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wasteDescription, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wasteAmount, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wasteCapacity, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wasteRetained, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wastePort, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(amountGen, ExcelReader.ReadState.FAIL);
+                        reader.Conf.HighlightCellWithState(wasteDis, ExcelReader.ReadState.FAIL);
+                    }
                 }
 
 
-			}
+            }
             /*
 			try
 			{
@@ -1635,8 +1671,8 @@ namespace bsmd.ExcelReadService
 			bool? secKielDeparture = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Departure");
 
 			sec.KielCanalPassagePlanned = (secKielArrival ?? false) || (secKielDeparture ?? false);
-			sec.KielCanalPassagePlannedIncomming = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedIncomming", "SEC.ETATimeKielCanalPassagePlannedIncomming");
-			sec.KielCanalPassagePlannedOutgoing = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedOutgoing", "SEC.ETATimeKielCanalPassagePlannedOutgoing");
+			sec.KielCanalPassagePlannedIncomming = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedIncomming", "SEC.ETATimeKielCanalPassagePlannedIncomming", !(secKielArrival ?? false));
+			sec.KielCanalPassagePlannedOutgoing = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedOutgoing", "SEC.ETATimeKielCanalPassagePlannedOutgoing", !(secKielDeparture ?? false));
 
 
 			// Last10PortFacilitesCalled
@@ -2577,7 +2613,8 @@ namespace bsmd.ExcelReadService
 				}
 			}
 
-            reader.Conf.ConfirmText("ID", visitTransitId, ExcelReader.ReadState.OK);
+            bool isValidId = bsmd.database.Util.IsVisitId(visitTransitId) ||bsmd.database.Util.IsTransitId(visitTransitId);
+            reader.Conf.ConfirmText("ID", visitTransitId, isValidId ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
 
             if (result == null)
 			{
diff --git a/nsw/Source/bsmd.database/CREW.cs b/nsw/Source/bsmd.database/CREW.cs
index 7a0c3dcb..fb195ea8 100644
--- a/nsw/Source/bsmd.database/CREW.cs
+++ b/nsw/Source/bsmd.database/CREW.cs
@@ -164,6 +164,8 @@ namespace bsmd.database
                     break;
             }
 
+            query += " ORDER BY Identifier";
+
             cmd.CommandText = query;
         }
 
@@ -223,6 +225,8 @@ namespace bsmd.database
                     break;
             }
 
+            query += " ORDER BY CAST(Identifier AS INT)";
+
             cmd.CommandText = query;
         }
     }
diff --git a/nsw/Source/bsmd.database/LADG.cs b/nsw/Source/bsmd.database/LADG.cs
index 9b954ca8..45f7f2ee 100644
--- a/nsw/Source/bsmd.database/LADG.cs
+++ b/nsw/Source/bsmd.database/LADG.cs
@@ -153,6 +153,8 @@ namespace bsmd.database
                     break;
             }
 
+            query += " ORDER BY CAST(Identifier AS INT)";
+
             cmd.CommandText = query;
         }
 
diff --git a/nsw/Source/bsmd.database/PAS.cs b/nsw/Source/bsmd.database/PAS.cs
index 65634a77..ddaeea95 100644
--- a/nsw/Source/bsmd.database/PAS.cs
+++ b/nsw/Source/bsmd.database/PAS.cs
@@ -180,6 +180,8 @@ namespace bsmd.database
                     break;
             }
 
+            query += " ORDER BY Identifier";
+
             cmd.CommandText = query;
         }
 
@@ -252,6 +254,8 @@ namespace bsmd.database
                     break;
             }
 
+            query += " ORDER BY CAST(Identifier AS INT)";
+
             cmd.CommandText = query;
         }
     }
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 874beaa8..ab391b04 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.4.7")]
+[assembly: AssemblyInformationalVersion("3.4.8")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index 52942cfd..b52622db 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.4.7.*")]
+[assembly: AssemblyVersion("3.4.8.*")]
 
diff --git a/nsw/Source/bsmd.database/Waste.cs b/nsw/Source/bsmd.database/Waste.cs
index ad4e3caa..4090bbcc 100644
--- a/nsw/Source/bsmd.database/Waste.cs
+++ b/nsw/Source/bsmd.database/Waste.cs
@@ -64,7 +64,7 @@ namespace bsmd.database
                     case 2300: return "Domestic wastes";
                     case 2311: return "Cooking oil";
                     case 2308: return "Incinerator ashes";
-                    case 2313: return "Operational wastes";
+                    case 2600: return "Operational wastes";
                     case 2309: return "Animal carcass(es)";
                     case 3000: return "Sewage";
                     case 5100: return "Cargo residues - Marpol Annex I";