diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index 59bf52f..15cbc39 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/MedAP/WebUserControl/mod_DocsArchive.ascx b/MedAP/WebUserControl/mod_DocsArchive.ascx index 8e6d368..7bb5630 100644 --- a/MedAP/WebUserControl/mod_DocsArchive.ascx +++ b/MedAP/WebUserControl/mod_DocsArchive.ascx @@ -28,17 +28,24 @@
/ -
+ +
+
-
+ +
+
-
- <%----%> + +
+
-
+ +
+
@@ -51,21 +58,24 @@
-
-
- - -
-
- +
+
+
- + + + + + + + +<%-- @@ -77,7 +87,7 @@ - +--%> diff --git a/MedAP/WebUserControl/mod_DocsArchive.ascx.cs b/MedAP/WebUserControl/mod_DocsArchive.ascx.cs index 2772b57..dfdf443 100644 --- a/MedAP/WebUserControl/mod_DocsArchive.ascx.cs +++ b/MedAP/WebUserControl/mod_DocsArchive.ascx.cs @@ -15,7 +15,9 @@ namespace MedAP.WebUserControl { if (!Page.IsPostBack) { - grView.Sort(sortParam, currSort); +#if false + grView.Sort(sortParam, currSort); +#endif grView.DataBind(); } } diff --git a/MedAP/WebUserControl/mod_searchParam.ascx b/MedAP/WebUserControl/mod_searchParam.ascx index f348456..940d0e5 100644 --- a/MedAP/WebUserControl/mod_searchParam.ascx +++ b/MedAP/WebUserControl/mod_searchParam.ascx @@ -10,7 +10,7 @@ -
+
diff --git a/MedAP/WebUserControl/mod_testata.ascx b/MedAP/WebUserControl/mod_testata.ascx index ea35676..f385df1 100644 --- a/MedAP/WebUserControl/mod_testata.ascx +++ b/MedAP/WebUserControl/mod_testata.ascx @@ -1,70 +1,58 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="MedAP.WebUserControls.mod_testata" %> <%if (false) - { %> + { %> <%} %>
-
-
-
-
    -
  • - -
    • -
  • - <%: nomePag %>  -
    • -
-
- -
-
-
- -
- - <%--
-
- postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %> -
-
- <%: string.Format("{0} - [{1}]", SteamWare.user_std.UtSn.CognomeNome, SteamWare.user_std.UtSn.lingua) %> -
-
--%> +
+
+
+
    +
  • + +
    • +
  • + <%: nomePag %>  +
    • +
+
+
+
+
+ +
+
diff --git a/MedAP/bin/MedAP_data.dll b/MedAP/bin/MedAP_data.dll index 07c693a..d4f5125 100644 Binary files a/MedAP/bin/MedAP_data.dll and b/MedAP/bin/MedAP_data.dll differ diff --git a/MedAP/bin/MedAP_data.pdb b/MedAP/bin/MedAP_data.pdb index b0a0e12..5c38689 100644 Binary files a/MedAP/bin/MedAP_data.pdb and b/MedAP/bin/MedAP_data.pdb differ diff --git a/MedAP/bin/SHERPA.dll b/MedAP/bin/SHERPA.dll index 8ed839e..6d9c028 100644 Binary files a/MedAP/bin/SHERPA.dll and b/MedAP/bin/SHERPA.dll differ diff --git a/MedAP/bin/SHERPA.pdb b/MedAP/bin/SHERPA.pdb index 2f84c15..9cc0770 100644 Binary files a/MedAP/bin/SHERPA.pdb and b/MedAP/bin/SHERPA.pdb differ diff --git a/MedAP/menu.aspx b/MedAP/menu.aspx index 8c85a61..7d6b29a 100644 --- a/MedAP/menu.aspx +++ b/MedAP/menu.aspx @@ -19,7 +19,7 @@ Documenti/Fatture - + <%-- Pagamenti @@ -30,7 +30,7 @@ Anag. Clienti - + --%> Anag. IVA diff --git a/MedAP/menu.aspx.designer.cs b/MedAP/menu.aspx.designer.cs index 16262d8..0be4e04 100644 --- a/MedAP/menu.aspx.designer.cs +++ b/MedAP/menu.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ diff --git a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache index ad96254..3a12326 100644 Binary files a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache and b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache differ diff --git a/MedAP/obj/Debug/SHERPA.dll b/MedAP/obj/Debug/SHERPA.dll index 8ed839e..6d9c028 100644 Binary files a/MedAP/obj/Debug/SHERPA.dll and b/MedAP/obj/Debug/SHERPA.dll differ diff --git a/MedAP/obj/Debug/SHERPA.pdb b/MedAP/obj/Debug/SHERPA.pdb index 2f84c15..9cc0770 100644 Binary files a/MedAP/obj/Debug/SHERPA.pdb and b/MedAP/obj/Debug/SHERPA.pdb differ diff --git a/MedAP_data/MedAPModel.cs b/MedAP_data/MedAPModel.cs index ea0ebad..3ef5176 100644 --- a/MedAP_data/MedAPModel.cs +++ b/MedAP_data/MedAPModel.cs @@ -114,7 +114,7 @@ namespace MedAP_data // refresh EF context ((IObjectContextAdapter)ctx).ObjectContext.Refresh(RefreshMode.StoreWins, ctx.Clienti); } - + #endregion #region funzioni Documenti @@ -169,6 +169,47 @@ namespace MedAP_data return query.Count(); } /// + /// elenco filtrato da parametro ricerca + /// + /// + /// + /// + /// + public static IEnumerable DocumentiFilt(int idxCli, int startRowIndex, int maximumRows) + { + IQueryable query; + if (idxCli > 0) + { + query = ctx.Documenti.Where(s => s.idxCli == idxCli); + } + else + { + query = ctx.Documenti; + } + var result = from r in query.OrderByDescending(s => s.anno).ThenByDescending(s => s.num).Skip(startRowIndex).Take(maximumRows) select r; + return result; + } + /// + /// elenco filtrato da parametro ricerca + /// + /// + /// + /// + /// + public static int DocumentiFiltCount(int idxCli, int startRowIndex, int maximumRows) + { + IQueryable query; + if (idxCli > 0) + { + query = ctx.Documenti.Where(s => s.idxCli == idxCli); + } + else + { + query = ctx.Documenti; + } + return query.Count(); + } + /// /// Restituisce DOCUMENTO specifico /// /// @@ -363,7 +404,7 @@ namespace MedAP_data { var result = from r in ctx.RowTemplate.OrderBy(s => s.Descrizione) select r; return result; - } + } #endregion diff --git a/MedAP_data/bin/Debug/MedAP_data.dll b/MedAP_data/bin/Debug/MedAP_data.dll index 07c693a..d4f5125 100644 Binary files a/MedAP_data/bin/Debug/MedAP_data.dll and b/MedAP_data/bin/Debug/MedAP_data.dll differ diff --git a/MedAP_data/bin/Debug/MedAP_data.pdb b/MedAP_data/bin/Debug/MedAP_data.pdb index b0a0e12..5c38689 100644 Binary files a/MedAP_data/bin/Debug/MedAP_data.pdb and b/MedAP_data/bin/Debug/MedAP_data.pdb differ diff --git a/MedAP_data/obj/Debug/MedAP_data.dll b/MedAP_data/obj/Debug/MedAP_data.dll index 07c693a..d4f5125 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.dll and b/MedAP_data/obj/Debug/MedAP_data.dll differ diff --git a/MedAP_data/obj/Debug/MedAP_data.pdb b/MedAP_data/obj/Debug/MedAP_data.pdb index b0a0e12..5c38689 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.pdb and b/MedAP_data/obj/Debug/MedAP_data.pdb differ