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

Merge branch 'release/UpdateFluxLogDisplaySite'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-06-29 11:46:36 +02:00
parent 8088b1b109 6713644c79
commit c7bcce7a45
10 changed files with 170 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/WebUserControls/mod_logFluxData.ascx
+35 -56
View File
@@ -1,63 +1,42 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logFluxData.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logFluxData" %>
<asp:GridView ID="grView" runat="server" CssClass="table table-striped table-sm" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxMacchina,dtEvento,CodFlux" AllowSorting="True" AllowPaging="True">
<HeaderStyle CssClass="table-dark" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
<EmptyDataTemplate>
Nessun record trovato
</EmptyDataTemplate>
<Columns>
<%--<asp:BoundField DataField="IdxMacchina" HeaderText="IdxMacchina" ReadOnly="True" SortExpression="IdxMacchina" />--%>
<asp:BoundField DataField="dtEvento" HeaderText="dtEvento" ReadOnly="True" SortExpression="dtEvento" />
<asp:BoundField DataField="CodFlux" HeaderText="CodFlux" ReadOnly="True" SortExpression="CodFlux" />
<asp:BoundField DataField="Valore" HeaderText="Valore" SortExpression="Valore" />
<asp:BoundField DataField="Cnt" HeaderText="Cnt" SortExpression="Cnt" />
<%--<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 text-left">
<div>
Art: <b>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("CodArticolo") %>' /></b>
<div class="row">
<div class="col-6 text-left">
<b>Filtro</b>
</div>
<div class="col-6 text-right">
<div class="input-group input-group-sm mb-2">
<asp:TextBox runat="server" ID="txtSearch" class="form-control" placeholder="ricerca" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged"></asp:TextBox>
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtReset" class="btn btn-info" OnClick="lbtReset_Click"><i class="fa fa-refresh" aria-hidden="true"></i></asp:LinkButton>
</div>
<div>
<asp:Label ID="Label4" runat="server" CssClass='<%# "text-" + Eval("cssClass")%>'><i class='<%# Eval("icona") %>'></i> <%# Eval("Descrizione") %>'</asp:Label>
</div>
</div>
<div class="col-2 px-0 text-center">
<span class="lead font-weight-bold">
<%# Eval("Qta") %>
</span>pz
</div>
<div class="col-5 text-right small">
<div class="text-truncate">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("DataOra","{0:ddd dd.MM.yy HH:mm:ss}") %>' />
<i class="fa fa-clock-o" aria-hidden="true"></i>
</div>
<div class="text-truncate">
<b>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("Operatore") %>' /></b>
<i class="fa fa-user" aria-hidden="true"></i>
</div>
</div>
<div class="col-12 small">
<i runat="server" id="iNote" visible='<%# Eval("Note").ToString()!="" %>'>Nota:
<b>
<asp:Label ID="Label6" runat="server" Text='<%# Eval("Note") %>' /></b></i>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>--%>
</Columns>
</div>
</div>
<asp:GridView ID="grView" runat="server" CssClass="table table-striped table-sm" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxMacchina,dtEvento,CodFlux" AllowSorting="True" AllowPaging="True">
<HeaderStyle CssClass="table-dark" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
<EmptyDataTemplate>
Nessun record trovato
</EmptyDataTemplate>
<Columns>
<%--<asp:BoundField DataField="IdxMacchina" HeaderText="IdxMacchina" ReadOnly="True" SortExpression="IdxMacchina" />--%>
<asp:BoundField DataField="dtEvento" HeaderText="dtEvento" ReadOnly="True" SortExpression="dtEvento" />
<asp:BoundField DataField="CodFlux" HeaderText="CodFlux" ReadOnly="True" SortExpression="CodFlux" />
<asp:BoundField DataField="Valore" HeaderText="Valore" SortExpression="Valore" />
<asp:BoundField DataField="Cnt" HeaderText="Cnt" SortExpression="Cnt" />
</Columns>
</asp:GridView>
<%--EnableCaching="true" CacheDuration="60"--%>
<%--EnableCaching="true" CacheDuration="60"--%>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFiltPaged" SelectCountMethod="getFiltCount" StartRowIndexParameterName="startRowIndex" MaximumRowsParameterName="maximumRows" TypeName="MapoDb.DS_applicazioneTableAdapters.FluxLogTableAdapter" EnablePaging="true">
<SelectParameters>
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchinaFluxFlog" Name="IdxMacchina" />
<asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_inizio" Name="dtFrom" />
<asp:SessionParameter Type="DateTime" SessionField="_fine" Name="dtTo" />
<asp:Parameter DefaultValue="true" Name="showMulti" Type="Boolean" />
</SelectParameters>
<SelectParameters>
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchinaFluxFlog" Name="IdxMacchina" />
<asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_inizio" Name="dtFrom" />
<asp:SessionParameter Type="DateTime" SessionField="_fine" Name="dtTo" />
<asp:Parameter DefaultValue="true" Name="showMulti" Type="Boolean" />
<asp:ControlParameter ControlID="txtSearch" Name="searchVal" DefaultValue="" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
MP-Site/WebUserControls/mod_logFluxData.ascx.cs
+34 -23
View File
@@ -1,34 +1,11 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_SITE.WebUserControls
{
public partial class mod_logFluxData : baseProdControl
{
#region Private Methods
private void fixMacchina()
{
string IdxMacc = memLayer.ML.StringSessionObj("IdxMacchina");
int idx = 0;
if (isMulti(IdxMacc))
{
idx = IdxMacc.IndexOf("#", StringComparison.OrdinalIgnoreCase);
if (idx > 0)
{
IdxMacc = IdxMacc.Substring(0, IdxMacc.IndexOf("#", StringComparison.OrdinalIgnoreCase));
}
}
memLayer.ML.setSessionVal("IdxMacchinaFluxFlog", IdxMacc);
}
#endregion Private Methods
#region Public Methods
public override void aggiornamento()
@@ -55,5 +32,39 @@ namespace MP_SITE.WebUserControls
}
#endregion Public Methods
#region Protected Methods
protected void lbtReset_Click(object sender, EventArgs e)
{
txtSearch.Text = "";
//grView.DataBind();
}
protected void txtSearch_TextChanged(object sender, EventArgs e)
{
grView.DataBind();
}
#endregion Protected Methods
#region Private Methods
private void fixMacchina()
{
string IdxMacc = memLayer.ML.StringSessionObj("IdxMacchina");
int idx = 0;
if (isMulti(IdxMacc))
{
idx = IdxMacc.IndexOf("#", StringComparison.OrdinalIgnoreCase);
if (idx > 0)
{
IdxMacc = IdxMacc.Substring(0, IdxMacc.IndexOf("#", StringComparison.OrdinalIgnoreCase));
}
}
memLayer.ML.setSessionVal("IdxMacchinaFluxFlog", IdxMacc);
}
#endregion Private Methods
}
}
MP-Site/WebUserControls/mod_logFluxData.ascx.designer.cs
Generated
+37 -17
View File
@@ -1,32 +1,52 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_SITE.WebUserControls {
public partial class mod_logFluxData {
namespace MP_SITE.WebUserControls
{
public partial class mod_logFluxData
{
/// <summary>
/// Controllo grView.
/// txtSearch control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtSearch;
/// <summary>
/// lbtReset control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtReset;
/// <summary>
/// grView control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo ods.
/// ods control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
}
MapoDb/AlarmsArchive.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace MapoDb
var collAlarmEvents = database.GetCollection<alarmEvent>("AlarmEvents");
List<rawData> lastFluxLog = new List<rawData>();
DS_applicazione.FluxLogDataTable tabDati = DataLayerObj.taFL.getFiltOrd(idxMacchina, adesso.AddMinutes(-lastMinutes), adesso, true);
DS_applicazione.FluxLogDataTable tabDati = DataLayerObj.taFL.getFiltOrd(idxMacchina, adesso.AddMinutes(-lastMinutes), adesso, true, "");
if (tabDati.Count > 0)
{
// chiamo procedura x conversione
MapoDb/DS_applicazione.Designer.cs
Generated
+24 -3
View File
@@ -28634,6 +28634,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchVal", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = "dbo.stp_FL_getFiltOrdered";
@@ -28643,6 +28644,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchVal", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = "dbo.stp_FL_getFiltPaged";
@@ -28654,6 +28656,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maximumRows", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startRowIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchVal", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = "dbo.stp_FL_InsNew";
@@ -28729,7 +28732,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_applicazione.FluxLogDataTable getFiltOrd(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti) {
public virtual DS_applicazione.FluxLogDataTable getFiltOrd(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti, string searchVal) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((IdxMacchina == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -28755,6 +28758,12 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
else {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
}
if ((searchVal == null)) {
this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(searchVal));
}
DS_applicazione.FluxLogDataTable dataTable = new DS_applicazione.FluxLogDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -28764,7 +28773,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_applicazione.FluxLogDataTable getFiltPaged(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti, global::System.Nullable<int> maximumRows, global::System.Nullable<int> startRowIndex) {
public virtual DS_applicazione.FluxLogDataTable getFiltPaged(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti, global::System.Nullable<int> maximumRows, global::System.Nullable<int> startRowIndex, string searchVal) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((IdxMacchina == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -28802,6 +28811,12 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
else {
this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
}
if ((searchVal == null)) {
this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[7].Value = ((string)(searchVal));
}
DS_applicazione.FluxLogDataTable dataTable = new DS_applicazione.FluxLogDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -28990,7 +29005,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual object getFiltCount(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti) {
public virtual object getFiltCount(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti, string searchVal) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
if ((IdxMacchina == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -29016,6 +29031,12 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
else {
command.Parameters[4].Value = global::System.DBNull.Value;
}
if ((searchVal == null)) {
command.Parameters[5].Value = global::System.DBNull.Value;
}
else {
command.Parameters[5].Value = ((string)(searchVal));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
MapoDb/DS_applicazione.xsd
+3
View File
@@ -2559,6 +2559,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtTo" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@showMulti" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@searchVal" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -2573,6 +2574,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtTo" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@showMulti" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@searchVal" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -2589,6 +2591,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@showMulti" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@maximumRows" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@startRowIndex" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@searchVal" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
MapoDb/DS_applicazione.xss
+17 -17
View File
@@ -4,21 +4,21 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="991" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="745" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="30" X="553" Y="715" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:FamiglieMacchine" ZOrder="32" X="519" Y="1007" Height="115" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:Macchine" ZOrder="11" X="619" Y="324" Height="324" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Macchine" ZOrder="11" X="619" Y="324" Height="324" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:TransizioneStati" ZOrder="28" X="870" Y="916" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:StatoMacchine" ZOrder="12" X="4" Y="770" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:AnagraficaStati" ZOrder="16" X="303" Y="454" Height="210" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:EventList" ZOrder="1" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:EventList" ZOrder="2" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:AnagraficaEventi" ZOrder="37" X="1285" Y="228" Height="134" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:DiarioDiBordo" ZOrder="23" X="230" Y="-18" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TransizioneEventi" ZOrder="34" X="1279" Y="409" Height="210" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:KeepAlive" ZOrder="20" X="1316" Y="1006" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="22" X="596" Y="1155" Height="115" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="5" X="897" Y="1162" Height="115" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="22" X="596" Y="1155" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="6" X="897" Y="1162" Height="115" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TransizioneIngressi" ZOrder="14" X="601" Y="1610" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagraficaOperatori" ZOrder="33" X="965" Y="641" Height="229" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="19" X="1339" Y="1371" Height="172" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
@@ -30,15 +30,15 @@
<Shape ID="DesignTable:SignalLog" ZOrder="24" X="18" Y="523" Height="191" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:AnagArticoli" ZOrder="27" X="627" Y="31" Height="191" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:MSFD" ZOrder="18" X="974" Y="1361" Height="343" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:FluxLog" ZOrder="9" X="2" Y="1426" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:FluxLog" ZOrder="1" X="4" Y="1406" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagraficaGruppi" ZOrder="13" X="331" Y="1133" Height="191" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:RigheMacchine" ZOrder="10" X="1293" Y="35" Height="97" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:AnagTags" ZOrder="8" X="336" Y="1347" Height="172" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:DiarioDichiarazioni" ZOrder="3" X="325" Y="1566" Height="305" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:AlarmLog" ZOrder="2" X="1" Y="1695" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:RigheMacchine" ZOrder="10" X="1293" Y="26" Height="97" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:AnagTags" ZOrder="9" X="336" Y="1347" Height="172" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:DiarioDichiarazioni" ZOrder="4" X="325" Y="1566" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:AlarmLog" ZOrder="3" X="1" Y="1695" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_AnagTags_DiarioDichiarazioni" ZOrder="7" LineWidth="11">
<Connector ID="DesignRelation:FK_AnagTags_DiarioDichiarazioni" ZOrder="8" LineWidth="11">
<RoutePoints>
<Point>
<X>456</X>
@@ -141,7 +141,7 @@
<Connector ID="DesignRelation:FK_EventList_Macchine" ZOrder="46" LineWidth="11">
<RoutePoints>
<Point>
<X>896</X>
<X>879</X>
<Y>359</Y>
</Point>
<Point>
@@ -238,15 +238,15 @@
<RoutePoints>
<Point>
<X>897</X>
<Y>1181</Y>
<Y>1216</Y>
</Point>
<Point>
<X>834</X>
<Y>1181</Y>
<X>896</X>
<Y>1216</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="4" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="5" LineWidth="11">
<RoutePoints>
<Point>
<X>1285</X>
@@ -266,7 +266,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="6" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="7" LineWidth="11">
<RoutePoints>
<Point>
<X>933</X>
MapoDb/FluxArchive.cs
+1 -1
View File
@@ -276,7 +276,7 @@ namespace MapoDb
currDateStr = tStamp.ToString("yyyyMMdd");
int.TryParse(currDateStr, out currYMD);
// leggo da DB i records...
DS_applicazione.FluxLogDataTable tabDati = DataLayerObj.taFL.getFiltOrd(macchina.IdxMacchina, tStamp, tStamp.AddDays(1), true);
DS_applicazione.FluxLogDataTable tabDati = DataLayerObj.taFL.getFiltOrd(macchina.IdxMacchina, tStamp, tStamp.AddDays(1), true, "");
// solo se ho dati...
if (tabDati.Count > 0)
{
MapoSDK/Enums.cs
+10 -1
View File
@@ -158,6 +158,10 @@ namespace MapoSDK
/// </summary>
FloatDCBA,
/// <summary>
/// Valore bitmap, inteso come array di bit ognuno da trattare come uno stato on/off indipendente e sommabile (es allarmi)
/// </summary>
BitMap
}
/// <summary>
@@ -264,7 +268,12 @@ namespace MapoSDK
/// <summary>
/// Richiesta esecuzione di un sync dei dati DB di frontiera
/// </summary>
syncDbData
syncDbData,
/// <summary>
/// Imposta Fornitore (es grower x ICOEL)
/// </summary>
setSupplier,
}
/// <summary>
MapoSDK/dataConf.cs
+8
View File
@@ -1,5 +1,6 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System.Collections.Generic;
namespace MapoSDK
{
@@ -66,6 +67,13 @@ namespace MapoSDK
/// </summary>
public string value { get; set; } = "";
/// <summary>
/// Decodifica per tipoMem = BitMap:
/// Array di valori assegnati ai singoli bit
/// </summary>
public List<string> decodeMap { get; set; } = new List<string>();
#endregion Public Properties
}