Continuo set bozza parametri da impostare

This commit is contained in:
Samuele E. Locatelli
2019-11-09 23:56:53 +01:00
parent 1b64ea0bf6
commit 4b06bb09af
4 changed files with 38 additions and 36 deletions
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1253']) {
withEnv(['NEXT_BUILD_NUMBER=1254']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+10 -16
View File
@@ -7,20 +7,16 @@
<h4>GESTIONE PARAMETRI MACCHINA</h4>
</div>
<div class="card-body text-dark">
<i>Elenco parametri di configurazione ammessi</i>
<div runat="server" id="divNoParam" class="row">
Nessun parametro configurabile sull'impianto, funzione non autorizzata
</div>
<div runat="server" id="divParams" class="row">
<div class="col-12">
<asp:GridView ID="grView" runat="server" >
<Columns>
<asp:CommandField ShowSelectButton="True" />
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server"></asp:ObjectDataSource>
</div>
<%--<div class="col">
<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">
<EmptyDataTemplate>Nessun parametro configurabile</EmptyDataTemplate>
<Columns>
<asp:CommandField ShowSelectButton="True" />
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" TypeName="MoonProTablet.WebUserControls.mod_sendParameters" SelectMethod="GetParameters"></asp:ObjectDataSource>
</div>
<%--<div class="col">
<label for="ddlParameters">Parametro</label>
<asp:DropDownList runat="server" ID="ddlParameters" CssClass="form form-control form-comtrol-sm"></asp:DropDownList>
</div>
@@ -31,8 +27,6 @@
<div class="col">
<asp:LinkButton runat="server" ID="lbtSendParam" CssClass="btn btn-block btn-sm btn-success">SEND PARAMETER</asp:LinkButton>
</div>--%>
</div>
</div>
<%--<div class="card-footer"></div>--%>
</div>
</div>
@@ -1,4 +1,6 @@
using System;
using MapoSDK;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,7 +13,31 @@ namespace MoonProTablet.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
}
public static ICollection GetParameters()
{
//!!!FIXME !!!FARE recuperare VERI DATI da memoria REDIS dell'IOB...
ArrayList al = new ArrayList();
plcMemMap memoria = new plcMemMap();
for (int i = 0; i < 10; i++)
{
dataConf currConf = new dataConf()
{
name = $"Par_{i}",
description = $"Parametro {i}",
value = $"{i}"
};
memoria.mMapWrite.Add($"Parametro {i}", currConf);
}
foreach (var item in memoria.mMapWrite)
{
al.Add(item.Value);
}
return al;// memoria.mMapWrite;
}
}
}
@@ -14,24 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class mod_sendParameters
{
/// <summary>
/// Controllo divNoParam.
/// </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.HtmlControls.HtmlGenericControl divNoParam;
/// <summary>
/// Controllo divParams.
/// </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.HtmlControls.HtmlGenericControl divParams;
/// <summary>
/// Controllo grView.
/// </summary>