diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index bce7c5d..f77693d 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/MedAP/DocArchive.aspx b/MedAP/DocArchive.aspx index d5412d2..e7d025f 100644 --- a/MedAP/DocArchive.aspx +++ b/MedAP/DocArchive.aspx @@ -4,6 +4,7 @@ <%@ Register Src="~/WebUserControl/mod_DocsDetail.ascx" TagPrefix="uc1" TagName="mod_DocsDetail" %> <%@ Register Src="~/WebUserControl/mod_searchParam.ascx" TagPrefix="uc1" TagName="mod_searchParam" %> <%@ Register Src="~/WebUserControl/mod_ElencoClienti.ascx" TagPrefix="uc1" TagName="mod_ElencoClienti" %> +<%@ Register Src="~/WebUserControl/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %>
@@ -73,7 +74,14 @@ DOCUMENTI - FATTURE
- +
+
+ +
+
+ +
+
diff --git a/MedAP/DocArchive.aspx.cs b/MedAP/DocArchive.aspx.cs index e94cc94..cf72732 100644 --- a/MedAP/DocArchive.aspx.cs +++ b/MedAP/DocArchive.aspx.cs @@ -18,11 +18,19 @@ namespace MedAP mod_DocsArchive.doUpdate(); mod_ElencoClienti.DataBind(); memLayer.ML.setSessionVal("ReqUpdateDocs", false); + mod_righePag.numRowPag = 10; + mod_DocsArchive.PageSize = mod_righePag.numRowPag; } mod_DocsArchive.eh_ucev += Mod_DocsArchive_eh_ucev; mod_searchParam.eh_ucev += Mod_searchParam_eh_ucev; mod_DocsDetail.eh_ucev += Mod_DocsDetail_eh_ucev; mod_ElencoClienti.eh_ucev += Mod_ElencoClienti_eh_ucev; + mod_righePag.eh_newNum += Mod_righePag_eh_newNum; + } + private void Mod_righePag_eh_newNum(object sender, EventArgs e) + { + mod_DocsArchive.PageSize=mod_righePag.numRowPag; + mod_DocsArchive.resetSelezione(); } /// /// Gestione selezione cliente/paziente --> update fatture! diff --git a/MedAP/DocArchive.aspx.designer.cs b/MedAP/DocArchive.aspx.designer.cs index d9682b4..fa720f7 100644 --- a/MedAP/DocArchive.aspx.designer.cs +++ b/MedAP/DocArchive.aspx.designer.cs @@ -111,6 +111,15 @@ namespace MedAP { /// protected global::MedAP.WebUserControls.mod_searchParam mod_searchParam; + /// + /// Controllo mod_righePag. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MedAP.WebUserControl.mod_righePag mod_righePag; + /// /// Controllo mod_DocsArchive. /// diff --git a/MedAP/MedAP.csproj b/MedAP/MedAP.csproj index aeaa95c..ff4edf2 100644 --- a/MedAP/MedAP.csproj +++ b/MedAP/MedAP.csproj @@ -255,7 +255,6 @@ - compilerconfig.json @@ -577,13 +576,6 @@ Site.Master - - mod_barPlot.ascx - ASPXCodeBehind - - - mod_barPlot.ascx - mod_login.ascx ASPXCodeBehind diff --git a/MedAP/WebUserControl/mod_DocsArchive.ascx b/MedAP/WebUserControl/mod_DocsArchive.ascx index 6bb6b42..295e2e5 100644 --- a/MedAP/WebUserControl/mod_DocsArchive.ascx +++ b/MedAP/WebUserControl/mod_DocsArchive.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_DocsArchive.ascx.cs" Inherits="MedAP.WebUserControl.mod_DocsArchive" %> -<%@ Register Src="~/WebUserControl/mod_barPlot.ascx" TagPrefix="uc1" TagName="mod_barPlot" %>