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

Continuo modifica grafica pagina

Browse Source 
Manca lettura d REDIS dei veri parametri + scrittura in task2exe
This commit is contained in:
Samuele E. Locatelli
2019-11-10 00:16:51 +01:00
parent 4b06bb09af
commit ffed949326
3 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/WebUserControls/mod_sendParameters.ascx
+47 -3
View File
@@ -8,13 +8,57 @@
</div>
<div class="card-body text-dark">
<i>Elenco parametri di configurazione ammessi per l'impianto</i>
<asp:GridView ID="grView" runat="server" DataSourceID="ods" AutoGenerateColumns="true" CssClass="table table-sm table-striped">
<asp:GridView ID="grView" runat="server" DataSourceID="ods" AutoGenerateColumns="False" CssClass="table table-sm table-striped" DataKeyNames="name">
<EmptyDataTemplate>Nessun parametro configurabile</EmptyDataTemplate>
<Columns>
<asp:CommandField ShowSelectButton="True" />
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" CssClass="btn btn-sm btn-info"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
<EditItemTemplate>
<asp:LinkButton ID="lbtSave" runat="server" CausesValidation="False" CommandName="Update" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbtCancel" runat="server" CausesValidation="False" CommandName="Cancel" CssClass="btn btn-sm btn-danger"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
</EditItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="name" SortExpression="name">
<ItemTemplate>
<div class="row">
<div class="col text-left">
<div class="font-weight-bold">
<asp:Label ID="lblName" runat="server" Text='<%# Eval("name") %>' /></div>
<asp:Label ID="lblDescr" runat="server" Text='<%# Eval("description") %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField DataField="description" HeaderText="description" SortExpression="description" />--%>
<%--<asp:BoundField DataField="tipoMem" HeaderText="tipoMem" SortExpression="tipoMem" />
<asp:BoundField DataField="index" HeaderText="index" SortExpression="index" />
<asp:BoundField DataField="memAddr" HeaderText="memAddr" SortExpression="memAddr" />
<asp:BoundField DataField="size" HeaderText="size" SortExpression="size" />
<asp:BoundField DataField="factor" HeaderText="factor" SortExpression="factor" />--%>
<%--<asp:BoundField DataField="minVal" HeaderText="minVal" SortExpression="minVal" />
<asp:BoundField DataField="maxVal" HeaderText="maxVal" SortExpression="maxVal" />--%>
<asp:TemplateField HeaderText="Richiesta" SortExpression="newValue">
<EditItemTemplate>
<asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("newValue") %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("newValue") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Attuale" SortExpression="value">
<EditItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("value") %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("value") %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" TypeName="MoonProTablet.WebUserControls.mod_sendParameters" SelectMethod="GetParameters"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="ods" runat="server" TypeName="MoonProTablet.WebUserControls.mod_sendParameters" SelectMethod="GetParameters" OldValuesParameterFormatString="original_{0}"></asp:ObjectDataSource>
</div>
<%--<div class="col">
<label for="ddlParameters">Parametro</label>
MP-TAB/WebUserControls/mod_sendParameters.ascx.cs
+13 -7
View File
@@ -15,29 +15,35 @@ namespace MoonProTablet.WebUserControls
{
}
public static ICollection GetParameters()
public static List<parameterConf> GetParameters()
{
//!!!FIXME !!!FARE recuperare VERI DATI da memoria REDIS dell'IOB...
ArrayList al = new ArrayList();
List<parameterConf> dcList = new List<parameterConf>();
plcMemMap memoria = new plcMemMap();
for (int i = 0; i < 10; i++)
{
dataConf currConf = new dataConf()
parameterConf currPar = new parameterConf()
{
name = $"Par_{i}",
description = $"Parametro {i}",
value = $"{i}"
value = $"{i * 100}",
newValue = $"{i * 100 + 5}"
};
dcList.Add(currPar);
#if false
memoria.mMapWrite.Add($"Parametro {i}", currConf);
#endif
}
#if false
foreach (var item in memoria.mMapWrite)
{
al.Add(item.Value);
}
return al;// memoria.mMapWrite;
dcList.Add(item.Value);
}
#endif
return dcList;// memoria.mMapWrite;
}
}
}
MapoSDK/Objects.cs
+9 -2
View File
@@ -114,9 +114,9 @@ namespace MapoSDK
/// </summary>
public int factor { get; set; } = 1;
/// <summary>
/// Valore parametro (come stringa, decimali con ",")
/// Valore parametro (come stringa, decimali con ",", default VUORO)
/// </summary>
public string value { get; set; } = "0";
public string value { get; set; } = "";
/// <summary>
/// Valore minimo ammesso (ove usato, es simulazione)
/// </summary>
@@ -127,6 +127,13 @@ namespace MapoSDK
public int maxVal { get; set; } = 9999;
}
/// <summary>
/// Classe estesa dei parametri da impostare sul PLC
/// </summary>
public class parameterConf: dataConf
{
public string newValue { get; set; } = "ND";
}
/// <summary>
/// Struttura conf tipo dati
/// </summary>
public class dataConfTSVC : dataConf