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

Merge branch 'release/SDK_updateObjItem'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-09-22 18:57:53 +02:00
parent 50d8dcf294 9a238d43cd
commit 2e35fb6d0e
3 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/WebUserControls/mod_sendParameters.ascx
+4 -1
View File
@@ -23,7 +23,10 @@
<div class="row">
<div class="col text-left">
<div class="font-weight-bold text-uppercase">
<asp:Label ID="lblDescr" runat="server" Text='<%# Eval("name") %>' />
<asp:Label ID="lblDescr" runat="server" Text='<%# Eval("description") %>' />
</div>
<div class="small">
<sup><asp:Label ID="Label1" runat="server" Text='<%# Eval("name") %>' /></sup>
</div>
</div>
</div>
MP-TAB/WebUserControls/mod_sendParameters.ascx.designer.cs
Generated
+32 -32
View File
@@ -1,44 +1,44 @@
//------------------------------------------------------------------------------
// <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 MoonProTablet.WebUserControls
{
public partial class mod_sendParameters
{
public partial class mod_sendParameters
{
/// <summary>
/// Controllo lbtReload.
/// </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.LinkButton lbtReload;
/// <summary>
/// lbtReload 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 lbtReload;
/// <summary>
/// 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 grView;
/// <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.
/// </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;
}
/// <summary>
/// ods 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.ObjectDataSource ods;
}
}
MapoSDK/Objects.cs
+34 -26
View File
@@ -151,22 +151,7 @@ namespace MapoSDK
/// </summary>
public class BaseRawTransf
{
#region Public Properties
/// <summary>
/// Data-Ora riferimento (x ordinamento fifo)
/// </summary>
public DateTime dataRif { get; set; } = DateTime.Now;
/// <summary>
/// Messaggio in modalità raw/stringa
/// </summary>
public JObject mesContent { get; set; } = new JObject();
/// <summary>
/// Tipo di messaggio trasmesso
/// </summary>
public rawTransfType mesType { get; set; } = rawTransfType.ND;
#region Public Constructors
/// <summary>
/// Costruttore senza parametri
@@ -191,18 +176,24 @@ namespace MapoSDK
this.mesType = mesType;
}
#endregion Public Properties
}
#endregion Public Constructors
/// <summary>
/// Array valori tipo BaseRawTransf inviati come JSon
/// </summary>
public class rawTransfJsonPayload
{
#region Public Properties
public List<BaseRawTransf> rawTransfData { get; set; }
/// <summary>
/// Data-Ora riferimento (x ordinamento fifo)
/// </summary>
public DateTime dataRif { get; set; } = DateTime.Now;
/// <summary>
/// Messaggio in modalità raw/stringa
/// </summary>
public JObject mesContent { get; set; } = new JObject();
/// <summary>
/// Tipo di messaggio trasmesso
/// </summary>
public rawTransfType mesType { get; set; } = rawTransfType.ND;
#endregion Public Properties
}
@@ -385,6 +376,11 @@ namespace MapoSDK
{
#region Public Properties
/// <summary>
/// DESCRIZIONE item
/// </summary>
public string description { get; set; } = "-";
/// <summary>
/// Ultimo messaggio associato (conferma scrittura, errore, ...)
/// </summary>
@@ -403,7 +399,7 @@ namespace MapoSDK
/// <summary>
/// NOME item
/// </summary>
public string name { get; set; } = "";
public string name { get; set; } = ".";
/// <summary>
/// Indica il NUOVO valore richiesto x l'item
@@ -488,6 +484,18 @@ namespace MapoSDK
#endregion Public Properties
}
/// <summary>
/// Array valori tipo BaseRawTransf inviati come JSon
/// </summary>
public class rawTransfJsonPayload
{
#region Public Properties
public List<BaseRawTransf> rawTransfData { get; set; }
#endregion Public Properties
}
public class StCheckOverride
{
#region Public Properties