Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix grafici

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-01-08 17:53:30 +01:00
parent 1621e00268
commit 0a9313dee0
9 changed files with 139 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/WebUserControls/mod_listaStatiEventi.ascx
+120 -30
View File
@@ -12,53 +12,143 @@
<asp:TabContainer ID="TabContLogs" runat="server" ScrollBars="Auto" Visible="True"
ActiveTabIndex="0" Width="100%">
ActiveTabIndex="0">
<asp:TabPanel ID="TabProduzione" runat="server" ScrollBars="Auto">
<HeaderTemplate>
Produzione
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_infoAggiuntive ID="mod_infoAggiuntive1" runat="server"></uc1:mod_infoAggiuntive>
</ContentTemplate>
</asp:TabPanel>
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_infoAggiuntive ID="mod_infoAggiuntive1" runat="server"></uc1:mod_infoAggiuntive>
</ContentTemplate>
</asp:TabPanel>
<asp:TabPanel ID="TabDatiConfermati" runat="server" ScrollBars="Auto">
<HeaderTemplate>
Dati Confermati
</HeaderTemplate>
<ContentTemplate>
<uc2:mod_datiConfermati ID="mod_datiConfermati1" runat="server" />
</ContentTemplate>
</asp:TabPanel>
</HeaderTemplate>
<ContentTemplate>
<uc2:mod_datiConfermati ID="mod_datiConfermati1" runat="server" />
</ContentTemplate>
</asp:TabPanel>
<asp:TabPanel ID="TabLogStati" runat="server" ScrollBars="Auto">
<HeaderTemplate>
Log Stati
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_logStati runat="server" ID="mod_logStati" />
</ContentTemplate>
</asp:TabPanel>
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_logStati runat="server" ID="mod_logStati" />
</ContentTemplate>
</asp:TabPanel>
<asp:TabPanel ID="TabLogEventi" runat="server" ScrollBars="Auto">
<HeaderTemplate>
Log Eventi
</HeaderTemplate>
<ContentTemplate>
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_logEventi runat="server" ID="mod_logEventi" />
</ContentTemplate>
</asp:TabPanel>
</ContentTemplate>
</asp:TabPanel>
<asp:TabPanel ID="TabLogControlli" runat="server" ScrollBars="Auto">
<HeaderTemplate>
Log Controlli
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_logControlli runat="server" ID="mod_logControlli" />
</ContentTemplate>
</asp:TabPanel>
</HeaderTemplate>
<ContentTemplate>
<div class="px-1">
<uc1:mod_logControlli runat="server" ID="mod_logControlli" />
</div>
</ContentTemplate>
</asp:TabPanel>
<asp:TabPanel ID="TabLogScarti" runat="server" ScrollBars="Auto">
<HeaderTemplate>
Log Scarti
</HeaderTemplate>
<ContentTemplate>
<uc1:mod_logScarti runat="server" ID="mod_logScarti" />
</ContentTemplate>
</asp:TabPanel>
</HeaderTemplate>
<ContentTemplate>
<div class="px-1">
<uc1:mod_logScarti runat="server" ID="mod_logScarti" />
</div>
</ContentTemplate>
</asp:TabPanel>
</asp:TabContainer>
MP-Site/WebUserControls/mod_logControlli.ascx
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logControlli.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logControlli" %>
<asp:GridView ID="grView" runat="server" CssClass="table table-striped table-dark table-sm" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxControllo" AllowSorting="True" AllowPaging="True" PageSize="10">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="IdxControllo" OnSorted="reportUpdt" OnPageIndexChanged="reportUpdt" DataSourceID="ods" CssClass="table table-striped table-dark table-sm">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
MP-Site/WebUserControls/mod_logEventi.ascx
+3 -2
View File
@@ -1,5 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logEventi.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logEventi" %>
<asp:GridView ID="gvEventi" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="IdxMacchina,InizioStato" OnSorted="reportUpdt" OnPageIndexChanged="reportUpdt" DataSourceID="ods_EventList" CssClass="table table-striped table-sm">
<asp:GridView ID="gvView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="IdxMacchina,InizioStato" OnSorted="reportUpdt" OnPageIndexChanged="reportUpdt" DataSourceID="ods" CssClass="table table-striped table-sm">
<HeaderStyle CssClass="table-primary" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -28,7 +29,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods_EventList" runat="server" OldValuesParameterFormatString="original_{0}"
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="GetDataFiltered" TypeName="MapoDb.DS_applicazioneTableAdapters.EventListTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="IdxMacchina" SessionField="IdxMacchina"
MP-Site/WebUserControls/mod_logEventi.ascx.cs
+2 -2
View File
@@ -11,8 +11,8 @@ namespace MP_SITE.WebUserControls
{
logger.lg.scriviLog("inizio caricamento dati LogEventi", tipoLog.INFO);
}
gvEventi.PageSize = _numRighe;
ods_EventList.DataBind();
gvView.PageSize = _numRighe;
ods.DataBind();
if (memLayer.ML.CRI("_logLevel") > 5)
{
logger.lg.scriviLog("fine caricamento dati LogEventi", tipoLog.INFO);
MP-Site/WebUserControls/mod_logEventi.ascx.designer.cs
Generated
+4 -4
View File
@@ -13,22 +13,22 @@ namespace MP_SITE.WebUserControls {
public partial class mod_logEventi {
/// <summary>
/// Controllo gvEventi.
/// Controllo gvView.
/// </summary>
/// <remarks>
/// 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 gvEventi;
protected global::System.Web.UI.WebControls.GridView gvView;
/// <summary>
/// Controllo ods_EventList.
/// Controllo ods.
/// </summary>
/// <remarks>
/// 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_EventList;
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo HyperLink2.
MP-Site/WebUserControls/mod_logScarti.ascx
+1 -1
View File
@@ -5,7 +5,7 @@
<asp:TemplateField HeaderText="Registro Scarti <i class='fa fa-sort'></i>" SortExpression="DataOra" HeaderStyle-CssClass="btn btn-sm btn-block btn-secondary text-info" HeaderStyle-ForeColor="White">
<ItemTemplate>
<div class="row">
<div class="col-5 small">
<div class="col-5 small text-left">
<div>
Art: <b>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("CodArticolo") %>' /></b>
MP-Site/WebUserControls/mod_logStati.ascx
+2 -2
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logStati.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logStati" %>
<asp:GridView ID="gvStati" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="IdxMacchina,InizioStato" DataSourceID="ods_DiarioDiBordo" OnSorted="reportUpdt" OnPageIndexChanged="reportUpdt" CssClass="table table-striped table-sm">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="IdxMacchina,InizioStato" DataSourceID="ods" OnSorted="reportUpdt" OnPageIndexChanged="reportUpdt" CssClass="table table-striped table-sm">
<HeaderStyle CssClass="table-info" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -27,7 +27,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods_DiarioDiBordo" runat="server" OldValuesParameterFormatString="Original_{0}"
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetDataFiltered" TypeName="MapoDb.DS_applicazioneTableAdapters.DiarioDiBordoTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="IdxMacchina" SessionField="IdxMacchina"
MP-Site/WebUserControls/mod_logStati.ascx.cs
+2 -2
View File
@@ -11,8 +11,8 @@ namespace MP_SITE.WebUserControls
{
logger.lg.scriviLog("inizio caricamento dati LogStati", tipoLog.INFO);
}
gvStati.PageSize = _numRighe;
ods_DiarioDiBordo.DataBind();
grView.PageSize = _numRighe;
ods.DataBind();
if (memLayer.ML.CRI("_logLevel") > 5)
{
logger.lg.scriviLog("fine caricamento dati LogStati", tipoLog.INFO);
MP-Site/WebUserControls/mod_logStati.ascx.designer.cs
Generated
+4 -4
View File
@@ -13,22 +13,22 @@ namespace MP_SITE.WebUserControls {
public partial class mod_logStati {
/// <summary>
/// Controllo gvStati.
/// Controllo grView.
/// </summary>
/// <remarks>
/// 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 gvStati;
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo ods_DiarioDiBordo.
/// Controllo ods.
/// </summary>
/// <remarks>
/// 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_DiarioDiBordo;
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo HyperLink1.