From 9dcbd6678764dfecbaccbe4f548757fb4e307f90 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 30 Aug 2017 15:56:29 +0200
Subject: [PATCH] update visualizzazione principale visite

---
 ScheMe-SP/Web.config                          | 20 +++++-----
 .../mod_ElencoVisitePaziente.ascx             | 38 ++++--------------
 .../mod_ElencoVisitePaziente.ascx.cs          | 40 ++++---------------
 .../mod_ElencoVisitePaziente.ascx.designer.cs | 22 +++++-----
 4 files changed, 36 insertions(+), 84 deletions(-)

diff --git a/ScheMe-SP/Web.config b/ScheMe-SP/Web.config
index 930cc21..cb3e45e 100644
--- a/ScheMe-SP/Web.config
+++ b/ScheMe-SP/Web.config
@@ -49,18 +49,18 @@
     <!--gestione reports!-->
     <add key="ReportBasePath" value=".\bin\Reports" />
     <!--stringhe connessione-->
-    <add key="DbConfConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-    <add key="ScheMeConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-    <add key="ScheMeFilesConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA_files;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-    <add key="DevicesAuthConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-    <add key="VocabolarioConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-    <add key="DbConfConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="DbConfConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="ScheMeConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="ScheMeFilesConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP_files;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="DevicesAuthConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="VocabolarioConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="DbConfConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" />
   </appSettings>
   <connectionStrings>
-    <add name="ScheMe_Data.Properties.Settings.ScheMeConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
-    <add name="ScheMe_Data.Properties.Settings.ScheMe_filesConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA_files;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.ScheMeConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.DS_AuthConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
+    <add name="ScheMe_Data.Properties.Settings.ScheMeConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
+    <add name="ScheMe_Data.Properties.Settings.ScheMe_filesConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP_files;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
+    <add name="SteamWare.Properties.Settings.ScheMeConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
+    <add name="SteamWare.Properties.Settings.DS_AuthConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
diff --git a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx
index b9cb014..1739c68 100644
--- a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx
+++ b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx
@@ -28,16 +28,16 @@
                     <asp:Label ID="Label1" runat="server" Text='<%# Eval("DataVisita", "{0:ddd dd/MM/yy}") %>' />
                 </ItemTemplate>
             </asp:TemplateField>            
-            <asp:TemplateField HeaderText="AFA" SortExpression="VVFAnz" ItemStyle-HorizontalAlign="Center">
+            <asp:TemplateField HeaderText="SP-12" SortExpression="VVSP_12" ItemStyle-HorizontalAlign="Center">
                 <ItemTemplate>
-                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVVFAnz" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVVFAnz" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VVFAnz")) %>' />
-                    <asp:LinkButton ID="lbNewVVFAnz" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVVFAnz" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VVFAnz")) %>' />
+                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVVSP_12" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVVSP_12" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VVSP_12")) %>' />
+                    <asp:LinkButton ID="lbNewVVSP_12" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVVSP_12" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VVSP_12")) %>' />
                 </ItemTemplate>
             </asp:TemplateField>
-            <asp:TemplateField HeaderText="WHP" SortExpression="VVFGT" ItemStyle-HorizontalAlign="Center">
+            <asp:TemplateField HeaderText="SP-345" SortExpression="VVSP_345" ItemStyle-HorizontalAlign="Center">
                 <ItemTemplate>
-                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVVFGT" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVVFGT" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VVFGT")) %>' />
-                    <asp:LinkButton ID="lbNewVVFGT" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVVFGT" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VVFGT")) %>' />
+                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVVSP_345" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVVSP_345" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VVSP_345")) %>' />
+                    <asp:LinkButton ID="lbNewVVSP_345" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVVSP_345" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VVSP_345")) %>' />
                 </ItemTemplate>
             </asp:TemplateField>
             <asp:TemplateField HeaderText="VL" SortExpression="VL" ItemStyle-HorizontalAlign="Center">
@@ -52,30 +52,6 @@
                     <asp:LinkButton ID="lbNewVBMA" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVBMA" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VBMA")) %>' />
                 </ItemTemplate>
             </asp:TemplateField>
-            <asp:TemplateField HeaderText="VSV" SortExpression="VSV" ItemStyle-HorizontalAlign="Center">
-                <ItemTemplate>
-                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVSV" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVSV" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VSV")) %>' />
-                    <asp:LinkButton ID="lbNewVSV" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVSV" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VSV")) %>' />
-                </ItemTemplate>
-            </asp:TemplateField>
-            <asp:TemplateField HeaderText="VP" SortExpression="VP" ItemStyle-HorizontalAlign="Center">
-                <ItemTemplate>
-                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVP" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVP" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VP"))%>' />
-                    <asp:LinkButton ID="lbNewVP" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVP" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VP"))%>' />
-                </ItemTemplate>
-            </asp:TemplateField>
-            <asp:TemplateField HeaderText="VCP" SortExpression="VCP" ItemStyle-HorizontalAlign="Center">
-                <ItemTemplate>
-                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVCP" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVCP" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VCP")) %>' />
-                    <asp:LinkButton ID="lbNewVCP" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVCP" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VCP")) %>' />
-                </ItemTemplate>
-            </asp:TemplateField>
-            <asp:TemplateField HeaderText="VAC" SortExpression="VAC" ItemStyle-HorizontalAlign="Center">
-                <ItemTemplate>
-                    <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVAC" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVAC" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VAC")) %>' />
-                    <asp:LinkButton ID="lbNewVAC" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-notext ui-btn-inline" runat="server" CausesValidation="False" CommandArgument="NewVAC" CommandName="Select" Visible='<%# !Convert.ToBoolean(Eval("VAC")) %>' />
-                </ItemTemplate>
-            </asp:TemplateField>
             <asp:TemplateField HeaderText="VRF" SortExpression="VRF" ItemStyle-HorizontalAlign="Center">
                 <ItemTemplate>
                     <asp:LinkButton CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" ID="lbSelVRF" data-icon="star" runat="server" CausesValidation="False" CommandArgument="SelVRF" CommandName="Select" Visible='<%# Convert.ToBoolean(Eval("VRF")) %>' />
@@ -84,7 +60,7 @@
             </asp:TemplateField>
         </Columns>
     </asp:GridView>
-    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="ScheMe_Data.DS_ApplicazioneTableAdapters.ElencoVisiteTableAdapter">
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="ScheMe_Data.DS_ApplicazioneTableAdapters.ElencoVisite_SPTableAdapter">
         <SelectParameters>
             <asp:SessionParameter Name="IdxPaziente" SessionField="IdxPaziente" Type="Int32" DefaultValue="0" />
         </SelectParameters>
diff --git a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.cs b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.cs
index 0be1fde..a2c0de1 100644
--- a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.cs
+++ b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.cs
@@ -50,23 +50,17 @@ namespace ScheMe.WebUserControls
 
             switch (lastCmd)
             {
-                case "SelVVFAnz":
-                    Response.Redirect(String.Format("VVFAnz?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
+                case "SelVVSP_12":
+                    Response.Redirect(String.Format("VVSP_12?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
-                case "NewVVFAnz":
-                    Response.Redirect(String.Format("VVFAnz?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
+                case "NewVVSP_12":
+                    Response.Redirect(String.Format("VVSP_12?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
-                case "SelVVFGT":
-                    Response.Redirect(String.Format("VVFGT?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
+                case "SelVVSP345":
+                    Response.Redirect(String.Format("VVSP_345?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
-                case "NewVVFGT":
-                    Response.Redirect(String.Format("VVFGT?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
-                case "SelVAC":
-                    Response.Redirect(String.Format("VAC?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
-                case "NewVAC":
-                    Response.Redirect(String.Format("VAC?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
+                case "NewVVSP_345":
+                    Response.Redirect(String.Format("VVSP_345?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
                 case "SelVBMA":
                     Response.Redirect(String.Format("VBMA?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
@@ -74,30 +68,12 @@ namespace ScheMe.WebUserControls
                 case "NewVBMA":
                     Response.Redirect(String.Format("VBMA?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
-                case "SelVCP":
-                    Response.Redirect(String.Format("VCP?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
-                case "NewVCP":
-                    Response.Redirect(String.Format("VCP?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
                 case "SelVL":
                     Response.Redirect(String.Format("VL?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
                 case "NewVL":
                     Response.Redirect(String.Format("VL?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
-                case "SelVP":
-                    Response.Redirect(String.Format("VP?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
-                case "NewVP":
-                    Response.Redirect(String.Format("VP?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
-                case "SelVSV":
-                    Response.Redirect(String.Format("VSV?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
-                case "NewVSV":
-                    Response.Redirect(String.Format("VSV?cmd=new&DataVisita={0:yyyy-MM-dd}", dataVisita));
-                    break;
                 case "SelVRF":
                     Response.Redirect(String.Format("VRF?cmd=sel&DataVisita={0:yyyy-MM-dd}", dataVisita));
                     break;
diff --git a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.designer.cs b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.designer.cs
index 8817ccb..0d1ef4d 100644
--- a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.designer.cs
+++ b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx.designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
+// <generato automaticamente>
+//     Codice generato da uno strumento.
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
 //------------------------------------------------------------------------------
 
 namespace ScheMe.WebUserControls {
@@ -13,20 +13,20 @@ namespace ScheMe.WebUserControls {
     public partial class mod_ElencoVisitePaziente {
         
         /// <summary>
-        /// grView control.
+        /// Controllo grView.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView grView;
         
         /// <summary>
-        /// ods control.
+        /// Controllo ods.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource ods;
     }