From d4978b371ae3fc913475385de201545fc75224fd Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 28 Aug 2013 16:18:35 +0200
Subject: [PATCH] =?UTF-8?q?fix=20ordinamenti=20in=20elenco=20commese=20spo?=
 =?UTF-8?q?stata=20data=20anno=20x=20template=20a=201900=20(cos=C3=AC=20in?=
 =?UTF-8?q?=20coda=20ad=20elenco=20commesse)=20vers=20183!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROJ-ETS/PROJ-ETS/Web.config                  |   2 +-
 .../WebUserControls/mod_commesse.ascx.cs      |   8 ++++----
 .../WebUserControls/mod_commesseFull.ascx     |   7 +++----
 PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll            | Bin 902656 -> 902656 bytes
 PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll            | Bin 66560 -> 66560 bytes
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index de0f21e..8332ba8 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.6"/>
-        <add key="minRev" value="182"/>
+        <add key="minRev" value="183"/>
         <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_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
index 1e47508..8093329 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
@@ -241,8 +241,8 @@ namespace PROJ_ETS.WebUserControls
             // verifico se il progetto selezionato sia quello dei template
             if (isTemplate())
             {
-                // in questo caso imposto anno 9999
-                anno = 9999;
+                // in questo caso imposto anno 1900
+                anno = 1900;
                 nomeComm = string.Format("Nuovo Template del {0:dd/MM/yyyy} creata da {1}", DateTime.Now, utils.obj.currUserCognomeNome);
             }
             // creo direttamente record con valori "standard"
@@ -299,8 +299,8 @@ namespace PROJ_ETS.WebUserControls
             // verifico se il progetto selezionato sia quello dei template
             if (isTemplate())
             {
-                // in questo caso imposto anno 9999
-                anno = 9999;
+                // in questo caso imposto anno 1900
+                anno = 1900;
                 nomeComm = string.Format("Nuovo Template del {0:dd/MM/yyyy} creata da {1}", DateTime.Now, utils.obj.currUserCognomeNome);
             }
             DataProxy_ProjEts.DP.taAF.InsertCommessa(anno, idxProgetto, nomeComm, false);
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx
index 65cb760..93fff99 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx
@@ -19,8 +19,7 @@
                 <asp:Button ID="btnNewEmpty" runat="server" OnClick="btnNewEmpty_Click" Text="Nuova Commessa" CssClass="btnNew"
                     ToolTip="Aggiungi una nuova commessa al progetto" Visible='<%# isWritable() && enableNewFromEmpty %>' Width="200px" />
                 &nbsp;&nbsp;
-       <asp:Button ID="btnNewEmptyZero" runat="server" OnClick="btnNewEmptyZero_Click" Text="Nuova 0000-anno" CssClass="btnNew"
-           ToolTip="Aggiungi una nuova commessa generica (0000-anno) al progetto" Visible='<%# isWritable() && enableNewFromEmpty && zeroIsAvailable %>' Width="200px" />
+                <asp:Button ID="btnNewEmptyZero" runat="server" OnClick="btnNewEmptyZero_Click" Text="Nuova 0000-anno" CssClass="btnNew" ToolTip="Aggiungi una nuova commessa generica (0000-anno) al progetto" Visible='<%# isWritable() && enableNewFromEmpty && zeroIsAvailable %>' Width="200px" />
             </EmptyDataTemplate>
             <Columns>
                 <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Wrap="false">
@@ -45,7 +44,7 @@
                     </HeaderTemplate>
                     <ItemStyle HorizontalAlign="Center"></ItemStyle>
                 </asp:TemplateField>
-                <asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Cliente / Progetto">
+                <asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Cliente / Progetto" SortExpression="RagSociale">
                     <ItemTemplate>
                         <div class="divSx">
                             <div style="text-align: left; padding: 2px 3px 2px 3px;" class='<%# classByCod(Eval("codFase")) %>'>
@@ -70,7 +69,7 @@
                     </EditItemTemplate>
                     <ItemStyle HorizontalAlign="Center"></ItemStyle>
                 </asp:TemplateField>
-                <asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Commessa / Fasi">
+                <asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Commessa / Fasi" SortExpression="nomeProj">
                     <ItemTemplate>
                         <div class="divSx">
                             <asp:Image runat="server" ID="imgSpaz" Width='<%# widthByCod(Eval("codFase")) %>' ImageUrl="~/images/EmptyImg.png" />
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 96c67802f0e0d6fd55bd9aebe4929a778affe509..4c5c4a48fd91de1443f5894de67c740548668bff 100644
GIT binary patch
delta 108
zcmV-y0F(cKj5mOcH;{+|y9I%Yg^B@%iUNg-1BHqNg^C4*iUx&>2Zf3Vg^CG<iVB5_
z3x$ddwTcZ|a1aw;n+(B%4M(4NSW@fud|9{ja1BIE0=os5I=u}V5OU#iy)RLzMUC%}
OmQ-RVnzv-V4V(!7rYnp9

delta 108
zcmV-y0F(cKj5mOcH;{+|WdMPSg^B@%iUNg-1BHqNg^C4*iUx&>2Zf3Vg^CG<iVB5_
z3x$ddwTcZ|a1e1D@MqHVG((`<8poxgWRSP?a1BIE0%ZV~I=u}V5K{7hmeY>VPql;9
Oq2Bj<TeoDr4V(x%sxFTJ

diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index d9e86f50a2d4768e4835868a6ba34b3e49cc9b73..2e91ae8964604dc1fd5109fa3e9a10d1daed2296 100644
GIT binary patch
delta 153
zcmZqZU}@-Jnb5(sk9A|0pCnTb`{rAcU5r3_@-0c9$(}O&n-5Aa-=$*eYybqVmbxZJ
zhK4}G%v{&P(#TQQ$ko)+!qwQ>*u~s&bI-L5DS?*^3^9UE=}w(mdXarLwpE*1KHlNf
z*~cmu!~g_LKrF+^!0<zYk>STL28N(um*729CTiV3yxeKO`>kh_>Mj&*=K1}F0{}{Z
BGNAwf

delta 153
zcmZqZU}@-Jnb5(M&akn|Pm+mWee*5JE=C|d`Ie;5WKS9X%?G8I?@}=~aW;2ybaB=-
zFg7;QH8C|d)U|Lnb=GyUba6H`cQiLNGB?=Vb1g$k;Lfh&CPvJLu01g~?}#rKD%i~O
z@eZd>I)hvg0}wC)u?!;v!w(5Yh9AEe7=nUbg1>I;{+3<K=e$|$F5jf>pJF!i{QklL
E09oHMt^fc4