From 0deeb47508d320e67deb2d52f381efb3daecddc9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 3 Oct 2013 16:56:59 +0200 Subject: [PATCH] update x nome mostrato in tab flessibile (codHW) --- PROJ-ETS/PROJ-ETS/Web.config | 2 +- .../WebUserControls/mod_weekPlan.ascx.cs | 3 ++- .../WebUserControls/mod_weekRA.ascx.cs | 3 ++- .../WebUserControls/mod_weekVerify.ascx.cs | 3 ++- PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll | Bin 1084928 -> 1084928 bytes PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll | Bin 103424 -> 102912 bytes 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index 24e5977..4d4bdf4 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -26,7 +26,7 @@ - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs index b139e51..f328ce8 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs @@ -344,8 +344,9 @@ namespace PROJ_ETS.WebUserControls else { rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; + cell.Text = rigaDip.codHw; //cell.Text = rigaDip.SIGLA; - cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); + //cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); cell.ToolTip = string.Format("{0} {1}", rigaDip.Nome, rigaDip.Cognome); } riga.Cells.Add(cell); diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs index cabeb2f..d0019d9 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs @@ -239,8 +239,9 @@ namespace PROJ_ETS.WebUserControls else { rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; + cell.Text = rigaDip.codHw; //cell.Text = rigaDip.SIGLA; - cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); + //cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); cell.ToolTip = string.Format("{0} {1}", rigaDip.Nome, rigaDip.Cognome); } riga.Cells.Add(cell); diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs index edc81af..9863975 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs @@ -307,8 +307,9 @@ namespace PROJ_ETS.WebUserControls else { rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; + cell.Text = rigaDip.codHw; //cell.Text = rigaDip.SIGLA; - cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); + //cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); cell.ToolTip = string.Format("{0} {1}", rigaDip.Nome, rigaDip.Cognome); } riga.Cells.Add(cell); diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index bc6ef1584c781ee4d8e2279279298e98ff084e63..165212ec04a314e1638295067abbda26bae06636 100644 GIT binary patch delta 102 zcmZpeA@xo&@Q9NTt9D}H!c^Y@uYd3j`kr;Em$cwJ-#v~G#ajX0P4TjCzd5`+*tE#T< zuCAWpU%pqre7C-8RS2wn;YH9sH$k!*(FjnE0D9H9uAzG0A9_6BfRM!vEeHmWYO7hf ziJ%Z0_96r_s}#esF~WQOY8n_!=5kh!(OAKbVFXsO8yI4lLmBvI1pP@MgYr4Re?9=f zy0kTzSV90N##SWCDZUF^Rw|`^u5E+&Y^@Z5+|p zA$(F~2Sq!~96TL!=wWcoWotLK;XLPzP3ut4r*X_@?#&ieEnq=gGW83%bs?L+B`ASU zYnFXvsqii>(MRVQDV&RV#73G9{>QbLy|<+w&SIZ$=^ZO#mr!iQR4Pcf9IrpNM~+h0 zZQUAN%-856JLb{@AUYAex((`@xVvXD4RPd&aoxu71xS&1s1gam-CTSPQsiB7xzW#! z(X3_b7*AdlgCn2$)xUy;te}39VJTU{A$lMiS8rtx>y22%Jh%Ob%b0uH@3EM@v^@fs zv!&bLBwe>-A(l7`cML{+!+B(9GvW&8>|IL{OWEwo0BI#M+e-n=`qq#kWt6n&K2=qk z|0Y*|5b7$f{@A7dBvfiY@1h4?Y6q~icb{eF-nxn9Y|q=N`ZW~bs9@i|Jq_2g(R<=> z9V^;15?8SEdxm2r>$&$}PZ3f@aSBLMp+EcVn3dh$TkEreOaM2idkX^*bdG9P(-4Z) ztg^`9Vv(Jx|dt~Y_v}c$XO;j}{@|#~nGLn&y3aRgO zK34>`Q|K@Auid}ELnp3`m4zR8+AE3QFh5grAYGrn zEbl-dE@UeY6!0tLKA>Kq;rMsfaB!{9llP`?ybKmLw>gMSJLIEQsEQpqWMLZ)_3py0 zRHV^|)BCAcfp5VrdF!bec-zOCsVY`p72z&mjfXQ**He(AmWv@Ic#Hb-jndr^o(F*5$Z-tRpj5LT7)W^AwX4~ws!-O zdSIe+>f;_b>zsz0Sk%!t+|06%@*dcA^da@Y_Qu4=yT0C-M&_Vnvq-KvR!1__H36%g zg|2z1R}awn{qg5eC&MFTpRNzZ7*YBKO@S0!(^Se!-}i*}?Zui-7QLO4bI_96Vr z!w+G|69+I0w>T}Q;e+6HODx0fa6C zc%Pmhu#2tzF`jj{+Gv`TGm~}wJZ;a&dKhKV=65QF~cV~)1}f%qEGSYah0k<0-y~I zCpeYDcJj4huttZ8ZeWf^XNYd%KLwS*$03>UCHfaPt7+OP%~yC_P#OFjG8@0bPXv{M zN2nRT!HSdW6lS7t@o%RD86rcopdFRdsxO&*?f9Wa!->8_rA75kAi9IEwsI;n{Lz#J zcd@XwSjE|R`Q{fwhp3zS~dh}Qz8IfB$$NK%XH6Sa^e{-egn@mfeym`1!7k~BgiUJFT@ zsS&S*Bvq;8oN}+|sp3u8nVJRfVXpx##?^9WL==bi3uCT4-PS?zmH~ELEmsT(fTa+a6slz75?dBzV~LP!g{-sLF&i65=E{w>yI#5S zS({DCm9LOoT`chnm!`WIqj+Y+HCra+%HL4xT=^&4Or;u3_I1itX|R2pvQr*s-=$0! zi<>Lt5+PR$nIccNH!2s<5OrR;ilb8Pm?G!fFDWTD!5Yi~uq_6u6-YLRF+B|0KE*+&8soZbz?Z%73s9hQqz{gdPj~If!Y0Yfg9db!&#)<+Mo z&pQ43bAMi98*6msEyWh2tN$uoAjN2J7!oxZ{a*uN^vV!cj_~66q2q7NuvGqKQNgI@ zYp-PFlxyn( E7y9W?PXGV_ delta 3411 zcmb7{3s6+&6@bsV>|GXi7s0K(CA?GwK@bZIyTt(wKG2|5lcLdQY1tF_YG$QkiI^(JIlj#pxJKss=P*&;Q>`NNA=r*%{A0-#P#D zJTBhC{o2BV+KM+qb6=hHb5MVsAcg2r4^V~xTE!UCP}%UTM@K!vTyAJV(79BGm<*i= z2I995A_TG!X&lSKG42yfX<{&$%UCH!;alu9j=?H+14I2h8^}e!Y4lG58R~8VXf6O? z?cP#Mbj+5Dt6a2@!2VVpj;mRJbt3Ly2{qefb16+=mueEnEkbbj_OW#Uxa(|-hk}o< z@Yt4zA3>WF zPHWp%lL>TM+hPKfJY0^b;Z_@aR68wTjqphky)@cp;^1m~i5@!JTDEB0bQP;D(JJPiqxHXq0?Hn1;w>8OLvXs|NhxF38MhNH2e8e`|4*tirk(KNm zMUgqSb40Wl`&$}Ywv+-mWR1K5d&CUo++XetF5qYMl5K100T7h{ZbK#wZambpk*3&| ziFrfj@B>H@cPSF_!9!g93{pflx%$z&AEQ`BU8XA!iq5u@{j+WnZemk*E!O3eWi&)h zU?ICg*hjnc_zJta>me4fw%zlwkcICVgLXD^&t}pu@7cf#_i7!p-;PCm&0*i$j9BDI z*|!Ptb+)?PUn)jsndi^G+@F%NnU>AJPjQuU-r(v3p_Xv<;h_4pP^nUSOY{ z7|XW4(}`PH?z_oaY6W-Oo6Py{3slZQ2V$_C%{nk0i&*V}saU~o9yl^g45_4X29TsY zUzUG5gf$g(Op2o|qoTq=(OG*)_TZ9}6^W(#RVHf66c_V1( zw+C2sXuaBHA?)FyAh)HwDZP#68PstB%zQWyH?sMM*Qs6i(cvH8b!^fRJ?>{2N8U7j zzuf|2W$Z{mk>6Hkz_~z2{P8tt z78T^p1E*Awk5ISMQu)4vs-I9r1^Fwg{nCNLS>kws-eey-VsIzxb@0NO zeDX0B&ZJWb1GmmQl}hHbr&f`SI$cZh{ORYg$`RmPi&`b=4%RpcDRa@{{kTA6YeZ8Z z7PARWMQXMhn|^e*rfRDDpFClnO~Gv8nRP?okJrvj95^D+Q%v)B^5oB!G?&v!zc@OQ zd7cgbKlw_g&+BEZYc!4c;e371!}FE$om{QLI!DR57-_P|RAX1YN2iFTYsq;C0m}7wJ^ ziPJKbh6^fFDO}KTmDYywk(X7<6J$Ow*7RNB!gn}$9{B!6knLh3d?K87=n65xSLpV> zvVE$jKitPaK}EW2epbAXR+T;%^t>QDjG-9bNBEG>vxAued>^O$MIoNh2e|2?LOf|b zSl0%8eB@ra;e;J5F?7D3AG`><0be)~Rzc4Z#FeILelD8z5y zhbuo-h~K^+k6%-W-yWsQ*Eto~p)Z_c=ifOhu|Vl-m3S;r;(r)v5=(Tn_@r5$KClqDOfJ`C1=2LX<2NG{txIG_a}Xc zoE~veKOK3YOh;c!0#3(JOD5?FB<<1y%PoB+jp@>7%fGRJp+xqJvto%{7UvI}ATTk~ zkcGLH49LO)A-4!wW3gfu9w3=5J1pI9*>bBT&5%7&Zlgzu#M>@ab8(!(H4Cm<(ji;E zO-pCX4=g!`O3+(t4DC|9^&P`rIn&xu+o!>R<%_J%h6|{RY%{dujASb&$;+)*3`uf6 z*^6L>%LaWrK4Y|EJJyo7mG1Ku*<;2(AsLuB*4Qde*(y%iiu{xp#GRAma@^lb()FH&2c=$EBwwq$Zl3rVMP7T<6(l+H#k!b$&97 zuI}8PiQ~t4`WDs?JN~gfwQ+Y(i~aG7FFQN(uto2x1s4zcIk#=b_0ouePaTPhg#Nb# z&GhZkTpLn~KKN5-QYpHk2dG~uyo`bxYM!`bb6HGBNr() N+38h*-B=mx`d