From 2fca73c30a6a1b0d9debc70ee2717df5c81a3d24 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 16 Sep 2013 17:06:34 +0200
Subject: [PATCH] =?UTF-8?q?corretto=20errore=20utenti=20soloCC/User=20se?=
 =?UTF-8?q?=20vuoto=20in=20registro=20attivit=C3=A0=20di=20competenza?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROJ-ETS/PROJ-ETS/Web.config                  |   2 +-
 .../WebUserControls/mod_weekRA.ascx.cs        |  48 +++++++++++-------
 PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll            | Bin 96256 -> 96256 bytes
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index 670f7aa..4d1f1d1 100644
--- a/PROJ-ETS/PROJ-ETS/Web.config
+++ b/PROJ-ETS/PROJ-ETS/Web.config
@@ -26,7 +26,7 @@
     <add key="appName" value="PROJ-ETS" />
     <add key="SiteName" value="ETS" />
     <add key="mainRev" value="0.9" />
-    <add key="minRev" value="210" />
+    <add key="minRev" value="211" />
     <add key="stdEmail" value="info@steamware.net" />
     <add key="_safePages" value="Default.aspx#unauthorized.aspx#forceUser.aspx#login.aspx#test.aspx#Test.aspx" />
     <!--area gestione auth cookie-->
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
index 38423c3..352038e 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
@@ -131,6 +131,14 @@ namespace PROJ_ETS.WebUserControls
                 TabellaRisorse = new ETS_Data.Type.ImpiegoRes[numDip, numComm];
                 oreTotDip = new int[numDip];
                 oreTotComm = new int[numComm];
+                for (int ii = 0; ii < numDip; ii++)
+                {
+                    oreTotDip[ii] = 0;
+                }
+                for (int ii = 0; ii < numComm; ii++)
+                {
+                    oreTotComm[ii] = 0;
+                }
                 // carico i dati nell'array: di default tutto VUOTO, con posizione attiva...
                 for (int pos_y = 0; pos_y < numComm; pos_y++)
                 {
@@ -194,29 +202,33 @@ namespace PROJ_ETS.WebUserControls
             riga.Cells.Add(cell);
             // variabili accessorie x dip
             Ds_ProjEts.DipendentiRow rigaDip;
-            // preparo celle!
-            for (int pos_x = 0; pos_x < numDip; pos_x++)
+            // se ho dati
+            if (numDip > 0 && numComm > 0)
             {
-                cell = new TableCell();
-                cell.CssClass = "cBia";
-                if (showOre)
+                // preparo celle!
+                for (int pos_x = 0; pos_x < numDip; pos_x++)
                 {
-                    cell.Text = string.Format("{0:0#} h", oreTotDip[pos_x]);
-                    cell.ToolTip = "";
-                    // SE sono oltre 40h coloro di rosso!!!
-                    if (oreTotDip[pos_x] > 40)
+                    cell = new TableCell();
+                    cell.CssClass = "cBia";
+                    if (showOre)
                     {
-                        cell.CssClass = "cBia lblErrore";
+                        cell.Text = string.Format("{0:0#} h", oreTotDip[pos_x]);
+                        cell.ToolTip = "";
+                        // SE sono oltre 40h coloro di rosso!!!
+                        if (oreTotDip[pos_x] > 40)
+                        {
+                            cell.CssClass = "cBia lblErrore";
+                        }
                     }
+                    else
+                    {
+                        rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0];
+                        //cell.Text = rigaDip.SIGLA;
+                        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);
                 }
-                else
-                {
-                    rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0];
-                    //cell.Text = rigaDip.SIGLA;
-                    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);
             }
             // cella vuota finale
             cell = new TableCell();
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index 9184907c8af459504c1532eb5127b1cb884c8fa7..f2f89dda051c4402a2957a20549eb253a2b7a7c1 100644
GIT binary patch
delta 1188
zcmZXUTWk|Y6o${4jlC1cHd!w?brOs>0fHb-qa*~|1r_HeBtS?I0j1&r3IajFTq;y)
zQ4**XwF!ipc>n=14($W*KtO&l61M;;4;A7f9^e6Sk%|xx;U*Cp<UnU;S86LP`JDOA
z`DfPW*Lu2MJGx#we*KwD52kv8q~<{C^m6Z$K7@t9KN$q7qzv6Xgy80Uaz8>jGe|Z2
z2CGOzg6+i)t@r>6EiB+)0uIP$HDVqinuGNn8*mhAh2bdM(qF*>r;6B`{?nooOR?hg
z{LWcEAZ8&#f#&q5L35U@)Sa4>m`+~$SfGookNmn*%3Pnz)c?uU$Oz%Tz^~KDpJD-o
zm>#a!F<1uMi0KylX(Eo`N;L7XZzZ?@iRl$}mG!10NDuZH>{+@5RW_b(SNP*u`|&Sj
z?zZ#!<JFR%+u5H9DK4LjMKetb<;Qen)*@w3GnMQ~W^x2H%15Fa{qIPz%JEO1KvQ`~
z)l_2sJ4FmcXC?q!F<=A&e25!-jK@3&cpd~mz19gmEHz-TH~poB1zJIDhVY)PIumA(
z2gVRs*Wje=$cfu?J0D)*4cG&>j5c_KKU}rwrO{2^V)B|r{)$p~hreGJ)J>Or7IL~^
z(<aXnPQ#Lt(BUbCQJgp|m2hoB6Q_2I=trNRA8qpLf{u0C7?L<-)4dAO{L7**wkzV$
z1%FtNe?O%WM=@!WBh-lRaY#}UHYhs$jWdKDe577OhYwgMsT<}MmqH#}BqeDkFc<T<
z?nbAOCg~}ONqgfZLr72Fw2l$Z<gxsgMZ%eJtiElLa0bYtJAy1{fP80@a0bZtk}PMC
zT(o-986^2T&?q+wYmkKQTE_@$khIt&oI$eDCgBW{ec8m*k%@SetsY&xWRs@`euCXR
zZidx7ny{0{BDn6Z0UbPiT?P-88mN?UmW=hX{uPw*ZnLZ`lkr=q&yI~&5l654H}~1>
zw6VVVQzP;Ecw1ddBwSb9)EaJRY-tTg<E?YTv*VFyb8~$|Yjk#9?tT={RTV#Y8|%3o
zdenC0`Kn)THoRDxJG=%>w|jzGM5)*7_3gbxbHS|`z)91CbC!x}#Xqo|znjDS#uz@d
xIDsYT%dJnKiau)J7eW>k>rl$@EBqG89o>cs=Da)bgF<S*&S|^w6{c#{e*iAw8^8bn

delta 1095
zcmYL|TSyd97{|Zw%<j&#&W<~7X>L}I1xB>C=xUo?$g#D+E@B`>^-u)SbvGY+8OSbH
zVzsoLK#J1Q9=Z@}ZLz&{vm10Z>Y*T_=(W_Mw8E@&W(GPi-#NeY{m*wef9Bge<lZ~v
zKHfqO22-t5$gO1RQiHNRiLesbFcBmnr3K_W2r}cyF@yrDky&&N7L)rs>3-a!noP~d
zQuYyWLrYpE#%XfTMU!Vb-I6MW=F%N!i)h2y>zpd9slR>EyyzFg^tk~s`j{_(5W|Py
zYV4T=31Y}>sfzI`1aDkt;pl1rB!<GbJ@jpR6vY#*8ZGO{Ll0fiTS&KcM6&r+K4?6k
zK|+S;Bl@9Zd`@)%B;xF_cg&SLh5;s_uRCT7eD;{LthwBoH<^XPxSVnHu&E0oyXC35
zk=A!kmWbiCubtglPywo#w>luIA~8H{cg)30R!;l#_b;d(mhq?_Vu=4Uz%w)H`A*II
zgxU0vy);E=d-r-;-}Q@r@0pO^aPGzYrlYsH2m9c;Rs&xV?%Fh<9U|Y*-)B>9Q4oG$
z_#UT2QiHFS(GrKY`c^Wkv#1&N_<}Hurk#VnY@N{uM>&?m$#vhZq69e2XmYU7!etJ<
zD&on6O%rzsyy$BuH!`&XhtdDQF5@n&z!6+#Q8R270`L>BS+oz1XaV?*w`?UW@CRWO
z`)#FU=Fi7b9D2~i%QQ<DE%bAfm=`xSE{#03i90ij7oOR~o%w?|p4-Ho0rKVrC)*hy
zgAQ?Lfc&(`b_U7PeoJXNgQTS&Dy)Ot8YGwPq{OX3((e#=2FZ7axHCv5rayiBG9FLU
zm&41aZt<1C0WetH2J2WfppnHa=#xtz05V-Ll9w;Dop}&su^Qe9C9ukhYoRo~W2Bh4
zTjegfCw=Nya?$kiQa!Rb7K??d!r_`wM2}U6^m2Vps4N_=DvRo2y);&nsjb8-#r}c!
z*Xpy)&$ZVxVQ;ke>R?9Rh=!b{h+auj6eVZ>%?#a%`Irj_gLCTn!+F0Iu%EGxb#q<Y
z-8kl<Kl3(@A}S}HUgomyWZOUjgQC;lnXFwXU|U@R6B(rue+%T!!i>5b2Qd{E{{jEu
B6vY4l