From 82bfd4df58a9729b9926ae7ad88ecb789e0c95fc Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 19 Jan 2017 14:59:36 +0100
Subject: [PATCH] completato update versione ADMIN...

---
 .vs/MP-Admin/v14/.suo                         | Bin 234496 -> 233984 bytes
 MP-Admin/Web.config                           |   4 +---
 .../mod_caricaOperatoriCSV.ascx.cs            |   8 ++++----
 MapoDb/MapoDb.cs                              |   4 ++--
 MapoDb/utility.cs                             |   4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.vs/MP-Admin/v14/.suo b/.vs/MP-Admin/v14/.suo
index c52bca4ed2a88dca257bb39939c80d0368a31c65..94c16d21dc41a8f5dacb27202a4def3a8379a704 100644
GIT binary patch
delta 2190
zcmb7F3v84{5Z;-+JC44*JIg_7Y0E>X^jeByDO%viRz(Ba%0orOo-JyL^lE#MJ}6ua
z0@bSRt?8I(wEPl$OWRBP8wI(Fs0j%VEgHcW7E?6F7z2$VN}X+sf{&<^eA(IAZ)SIA
z=HEZ`VnS#~LUT@zI4>?C5?GgvbAy9}+6;^s#so$pgDD~cliDDRi_{`VdVI9-&E0oa
zeF&HHf>5=NdbmoRaSX<P!qZ%bHVWZXU`yLHhP7nIuN+#7o%L~yI7ZTl-Qw|m-czq@
z-dLWeGU6GN8C{G^7~>iHn5Q`tS=W3mlUVOz`{)tdw2_golR8B3jTkQDv28@3!DCKj
zk8Ky&+9Q+ijZ`|Gg3I*Lb#$EwEg3w2W5i+DGB{{cS<YnpyS!hPTI`$wv8utDX}^?N
zZ$(~nPPW;#^SKs(a{OH8%wx=Foa^vQ2q&J7oX&^?GXcYiHCQH9U1FW1f|qyCQfD*j
z;A6FJ%%-@b9Lvej(wT4?VzOBo=+jem&b`s5H&7v0j%xR$gIgW(Tnc+4-*}Rt)8)cA
zy}E^|L#!0f{c5x812rYpMJofaRJD&)svzsGNZYs)FjHf~Ifbe)Yvs^1oR>aYJ3YeZ
ziK^n_+gd6^6TBQLg~9eg&&a4rTJ{f<n!?kA(5u!>AGBY?uKlVubE}z+VP6oos&&3i
z@NndeFBZZ+Z^XMW3)DWGse(5)nX}Mbgq>FuLY(d|y^#*8j!c-Mf>$<~S7VF+RD2^x
z%x4VcQk^N<>(aXi*iy-OkfGi!&Nt`9m`l;T3C$Jk<x{?!PmbQtYwt0*6#e0ph0b{w
zY(T*pI1~?a*`%B2k9{XJb>3P7xMa4f%iLnFLUXyzEWyr&1-~D=^PYjem?{wv_lYXu
z7v0xGGzqJL-nko|^q_Dp7DXaUED&X4ttb~2G|vwQ;2C=F9@r1PWcZ<r()^H4)n%}Z
zz9@y1*440F^#qe>S1Guy&|6p}>0miH=-6IdN-rmYhYnXll{Gbr9-T2OF9=R(t;2LG
zX@Dtocn$cdw-#@rhxX&!lu(b;X-y5blCch=-4DPij2p#w+|AIbvrbn)9CU9011MY$
z`IKLaoBy#2^mQd9Qb`^9EMq-JL1%dd{*QFF)}YZ{$DW<52Kudm)fnTVXg&Vqo+AoG
zF5`O6)>V8qK`r$-J3b&PIIFiG($9~e?X@_Ej0Vi0Ya3u3g&NR^>AzYC{k3@nebtCR
zz!^Hxh<oUjmv9aYXuZo*>aQv<^#>|fSNVehR;$-jdn4x1(am_2inroHI6xgc@M$VC
zakRDTAg-5iQoEY8_aiI-CLO_NY3@YnqC2+W&sN$t>;d?0C^}U(VJw9VX|tj!@+=IU
z!YX+j3lgyKg1E$SGpt9qqZ`~2{kjgx%;=}A-)OZxgI=^cOgtgI=J`dD6YXbx7NhWj
z^H`6)fF<xRmz$WnHc)o=@Xc>IfAfMR%d`E}r8U{5)!U%84R56{U&fS_|HShCJ&Rgi
z#2dW&i5`)te#W^bqHwqp7FS{!T4~qF>+IdH;$hD}b@O<6aTAZ4De|}>=2-LhAs~et
z;984YdZROT$?V~hyTwPk1UqQ)2^>YQ_u}P$Tg@eQt{~TU1)VTt8ucH;hVBJ2+2MAd
zKePC1ul}*5QT*4KrndJc?feD-7Fci+%Y6_>ZioC_H6P06QW@5LE_n#~D`exh<g&|2
z)ZB+o`+N>?R(0&|BBPHRv^_z3>H7h6T2~~>5~Q3q%(VJ9$|RsDw{7<ZX-H~+4h!kH
zSLRbsGiw($ScM(_d^;Ft`5(t+F6;9d@(b|%rHcf0Oq0)9i=W5q{#zGS+jL!iiM=Qj
z`cF7@I1@*D#;8?Ov#r)XTr+Fu2I=U2LK<Kho1}rt$Th5J<B&EjkAAdE4;jDUcq-c>
zKck6lXjq{~We9gROWV#S2`ZYKJ3dfU6<D*nG+4dz%Va20nFsQ^>W}-sD?S#cqQ_+W
EZ>CfMC;$Ke

delta 1758
zcmb7EZERCz6z(~<EnU}^yA7`ex(^3i#^^>F1jgK!hBY!+g>At>Vl>Wy3X(aYKV%NJ
z5Q1~5g!WZlqZ79~Q~04FX+y6;kO2dh%;3f{O#FyMF)T!rnG`fespstnE`mQi$<uT0
z`M&3z-ky(aJtu5OTrSk5NY?4{Nt6ip;_<l93OPzxOeiLhi!K6%0}w<nAAB0-F&A2_
zN8TPfzh(C|C?~6%?ZpkO&bFMzjE$B@NK;0jba57t7c<`+KV&e_=Xd`_s(EBGq|A2W
zqO6(te1fo_C4LE#;Ud+eggn9`LJ{E<A(tS0N61gaKSs~Q5>!a?Mba-x>E@<5`R64Z
zEGdPPxHTm&Bd$iy>Q92c=b0C!NQd!VD9RzFs3Ix|`jnpaseq&=9xr2MriF&fRIh|R
zX<7zz*gn%zLne8hiF{&Oq>qf7U7*Ssw#&$5Wf$wRoAe?f>s9JOV-rdaWJP{b7DCV#
zgIC!d+a@-GF6Nu-SM3;d)LB845-%mVm}kW2@Iz1@HBr&~%AuGH78fb*{zyMW!Nz)%
zLOdPCe2tq;wX+qm#!ZQx`I`J{o>{eFxY-AWTFUBVd&}MkRwxmr<u<70)P~1WL!l3J
z5w7$A8<DBqHGXv^hWru+OA9jIq#S*Odx6%k?B_{HH{zfq*@OjzK<l(xh4S|cp^+^e
zt337kH?6muz77Uj9n86Lvqj8ErO+V)^KaZ*BoqQ?Qu)%k#0#eBG;6Ba66hFEYt7+`
zI<SJc-Lx@zi!1!<22@vJpw&rrZf2#eS19c$;U1m(6|g=|Vl|<LFwE{$pOf23dWFzI
zNGx!qraIjG8eqd})>(EaxL%IP^)sNh=v6N!tEa~;YNV@2_ru*==I!mi@~7523tF~E
z*TV38ZTJ+rjntLqeh$Wwdv}17D{ZiW+uGoCbQesc#YnFr>V8ICi?xFVcy$|;b8jnD
zYUSJDJqTCUL2{#O{JeQPc(~;y_>;R|hGDfHA94_1T6JQr=^-Usq-*eEv;*A0-Ca<?
zOLo9wzI7)wb7d!#hW5kn{J`^I*X);ZdQPUZN~aV5lWg4tpXkP8+*Kr*VGsXs5|_aE
zeN`r3_ZF6D-U&PoFecRR^B#`N`FJ-@X`_?)9q?P7I0aLQ5Uun8ngG5?I_^7$W`6hs
z5kFsQH^76Hw1Hl%vuW4Lq#S&RnV)<IZPe7We(8l2<C})i!{tG=7&55+N$ti_`~j46
zwA>`koEsxqT)gLMvW@(Hv}ipQ(i%w-H=Ly6;Yt$r5Ii^eM6NWbb*z#!ee`1-&;DnP
z+SSkT59zr3BI3V>s$IW?rKZe=)yXkt>1GW_>m0|WhS_uBG?zXOCoq?f9mJB*aWwD&
zhg6^yTt{xq5?}5#iO*#oAN>~dx$75vLfd@<4@0P4TFK8dY~b+&xZ=O&JF5lS^I$Ko
zO^o(eN$JOQddKhulEwA>|M5iRhj&`YJjM0e(RI?!s!*4t=NEp)3V!4_H1e4^W^?yl
cT%c_`B=rLi$FNK5>X8mY=#Ye=z66Ya1NXpgs{jB1

diff --git a/MP-Admin/Web.config b/MP-Admin/Web.config
index 05ed9624..02913511 100644
--- a/MP-Admin/Web.config
+++ b/MP-Admin/Web.config
@@ -33,7 +33,7 @@
     <add key="_smtpCli" value="localhost"/>
     <add key="keepAliveMin" value="60"/>
     <add key="MinCharAutocomplete" value="1"/>
-    <add key="_pdwUpdateKanban" value="colmecc"/>
+    <add key="_pdwUpdateForzato" value="colmecc"/>
     <add key="_pdwRefreshDb" value="steamware"/>
     <!--area codici per barcode, dichiarazioni produzione-->
     <add key="prefDichProd" value="XX"/>
@@ -46,8 +46,6 @@
     <add key="prefDichFerm" value="FE"/>
     <!--area codici per barcode, dichiarazioni operatore-->
     <add key="prefDichOp" value="OP"/>
-    <!--area codici per barcode, dichiarazioni operatore-->
-    <add key="prefDichKanban" value="KA"/>
     <!--area codici per barcode, attrezzaggi-->
     <add key="prefDichAttrezzaggio" value="AT"/>
     <add key="StartSetup" value="AT02"/>
diff --git a/MP-Admin/WebUserControls/mod_caricaOperatoriCSV.ascx.cs b/MP-Admin/WebUserControls/mod_caricaOperatoriCSV.ascx.cs
index 0e52d220..f561a558 100644
--- a/MP-Admin/WebUserControls/mod_caricaOperatoriCSV.ascx.cs
+++ b/MP-Admin/WebUserControls/mod_caricaOperatoriCSV.ascx.cs
@@ -23,7 +23,7 @@ namespace MoonPro_site.WebUserControls
         private void checkAuth()
         {
             // se in session č auth alora mostro pannello caricamento..
-            if (Convert.ToBoolean(Session["isAuthKanban"]))
+            if (Convert.ToBoolean(Session["isAuthUpdForced"]))
             {
                 pnlUpload.Visible = true;
                 pnlPasswd.Visible = false;
@@ -73,16 +73,16 @@ namespace MoonPro_site.WebUserControls
         }
         protected void txtPwd_TextChanged(object sender, EventArgs e)
         {
-            string _pwdOk = ConfigurationManager.AppSettings.Get("_pdwUpdateKanban");
+            string _pwdOk = ConfigurationManager.AppSettings.Get("_pdwUpdateForzato");
             // verifico la password ed eventualmente mostro pannello caricamento..
             if (txtPwd.Text != "" && txtPwd.Text == _pwdOk)
             {
-                Session["isAuthKanban"] = true;
+                Session["isAuthUpdForced"] = true;
                 checkAuth();
             }
             else
             {
-                Session["isAuthKanban"] = false;
+                Session["isAuthUpdForced"] = false;
                 checkAuth();
             }
         }
diff --git a/MapoDb/MapoDb.cs b/MapoDb/MapoDb.cs
index 76735846..0fb8b511 100644
--- a/MapoDb/MapoDb.cs
+++ b/MapoDb/MapoDb.cs
@@ -978,12 +978,12 @@ namespace MapoDb
             return inserito;
         }
 
-        public int scriviRigaEventoSimulata(DateTime dataOra, string IdxMacchina, int IdxTipo, string matrKanban, string Value)
+        public int scriviRigaEventoSimulata(DateTime dataOra, string IdxMacchina, int IdxTipo, string CodArticolo, string Value)
         {
             // verifico se esista la macchina altrimenti la creo...
             verificaIdxMacchina(IdxMacchina);
             // inserisco evento
-            int inserito = taEvList.Insert(IdxMacchina, dataOra, IdxTipo, matrKanban, Value, 0, "-");
+            int inserito = taEvList.Insert(IdxMacchina, dataOra, IdxTipo, CodArticolo, Value, 0, "-");
             return inserito;
         }
         public int scriviRigaStatoSimulata(DateTime dataOra, string IdxMacchina, int IdxStato, string CodArticolo, string Value)
diff --git a/MapoDb/utility.cs b/MapoDb/utility.cs
index 16c7817d..c8fc6814 100644
--- a/MapoDb/utility.cs
+++ b/MapoDb/utility.cs
@@ -229,9 +229,9 @@ public enum tipoBarcode
     /// </summary>
     matrOperatore,
     /// <summary>
-    /// identifica un cartellino di tipo KANBAN
+    /// identifica un cartellino di tipo CodArticolo
     /// </summary>
-    kanban,
+    CodArticolo,
     /// <summary>
     /// identifica un codice per le attivitā di inizio/fine attrezzaggio e inizio/fine produzione
     /// </summary>