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

Merge branch 'develop' into ES3

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-20 11:35:02 +01:00
parent 1851af8258 a9cffdf2bd
commit 43bd8a3dbb
5 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1329']) {
withEnv(['NEXT_BUILD_NUMBER=1330']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/WebUserControls/cmp_dettODL.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="card text-dark textCondens">
<div class="card-header bg-warning text-light">
<h4 class="card-title">Verifica parametri attrezzaggio</h4>
<h4 class="card-title">Dati ODL attrezzato</h4>
</div>
<asp:FormView ID="frmView" runat="server" DataKeyNames="idxODL" DataSourceID="ods">
<ItemTemplate>
MP-TAB/WebUserControls/mod_ODL.ascx
+3 -3
View File
@@ -36,9 +36,6 @@
<div class="col-sm-12 py-2" id="divDettPOdl" runat="server" visible="false">
<uc1:cmp_dettPODL runat="server" ID="cmp_dettPODL" />
</div>
<div class="col-sm-12 py-2" id="divDettOdl" runat="server" visible="false">
<uc1:cmp_dettODL runat="server" id="cmp_dettODL" />
</div>
<div class="col-sm-6">
<div class="col-auto px-0">
<label class="sr-only" for="inlineFormInputGroup">Username</label>
@@ -68,6 +65,9 @@
<asp:LinkButton runat="server" ID="lbtShowOdlDet" CssClass="btn btn-block btn-outline-warning" OnClick="lbtShowOdlDet_Click"><i class="fa fa-star"></i> Dettaglio ODL</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtStartAttr" OnClick="lbtStartAttr_Click" CssClass="btn btn-block btn-primary" Visible="false"><i class="fa fa-check"></i> INIZIO Attrezzaggio</asp:LinkButton>
</div>
<div class="col-sm-12 py-2" id="divDettOdl" runat="server" visible="false">
<uc1:cmp_dettODL runat="server" ID="cmp_dettODL" />
</div>
<div class="col-sm-6">
<div runat="server" id="divNote" visible="false">
<asp:TextBox runat="server" ID="txtNote" TextMode="MultiLine" Height="4em" CssClass="form-control" placeholder="Note attrezzaggio" />
MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs
Generated
+18 -18
View File
@@ -59,24 +59,6 @@ namespace MoonProTablet.WebUserControls
/// </remarks>
protected global::MoonProTablet.WebUserControls.cmp_dettPODL cmp_dettPODL;
/// <summary>
/// Controllo divDettOdl.
/// </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 divDettOdl;
/// <summary>
/// Controllo cmp_dettODL.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.cmp_dettODL cmp_dettODL;
/// <summary>
/// Controllo txtSearchODL.
/// </summary>
@@ -140,6 +122,24 @@ namespace MoonProTablet.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtStartAttr;
/// <summary>
/// Controllo divDettOdl.
/// </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 divDettOdl;
/// <summary>
/// Controllo cmp_dettODL.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.cmp_dettODL cmp_dettODL;
/// <summary>
/// Controllo divNote.
/// </summary>
MP-TAB/WebUserControls/mod_confProd.ascx
+3 -14
View File
@@ -2,21 +2,10 @@
<script type="text/javascript">
function hideConfirmButton() {
//console.log('hide confirm');
document.getElementById('<%= lbtSalva.ClientID %>').hidden = true;
////document.getElementById('<%= lblUpdating.ClientID %>').hidden = false;
}
function showConfirmButton() {
//console.log('show confirm');
document.getElementById('<%= lbtSalva.ClientID %>').hidden = false;
////document.getElementById('<%= lblUpdating.ClientID %>').hidden = true;
}
function fixDelayed() {
//console.log('start delay');
setTimeout(function () {
//console.log('after');
////document.getElementById('<%= lblUpdating.ClientID %>').hidden = true;
}, 300);
}
</script>
@@ -28,7 +17,7 @@
<i class="fa fa-check"></i> MOSTRA Conferma
</asp:Label>
<asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: conferma NON permessa</asp:Label>
<asp:LinkButton runat="server" ID="lbtShowConfProd" OnClick="lbtShowConfProd_Click" CssClass="btn btn-dark btn-lg btn-block" OnClientClick="fixDelayed()">
<asp:LinkButton runat="server" ID="lbtShowConfProd" OnClick="lbtShowConfProd_Click" CssClass="btn btn-dark btn-lg btn-block">
<i class="fa fa-check"></i>
<asp:Label runat="server" ID="lblShowConfProd" />
</asp:LinkButton>
@@ -71,11 +60,11 @@
<div class="col-6 col-sm-3 pr-1 align-self-end font-weight-bold">
<asp:Label runat="server" ID="lblNumLasciati" CssClass="mb-0" AssociatedControlID="txtNumPezzi" Text="Pz Prodotti LASCIATI" />
<asp:TextBox runat="server" ID="txtNumLasciati" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-secondary py-0 mb-0" Enabled="true" AutoPostBack="True" OnTextChanged="txtNumLasciati_TextChanged" onfocus="hideConfirmButton()" onblur="showConfirmButton()" />
<asp:Label runat="server" ID="lblEmptyNumLasciati" CssClass="btn btn-secondary text-light btn-lg btn-block" Visible="false">&nbsp;</asp:Label>
<asp:Label runat="server" ID="lblEmptyNumLasciati" CssClass="btn btn-dark text-light btn-lg btn-block" Visible="false">&nbsp;</asp:Label>
</div>
<div class="col-6 col-sm-3 pl-1 align-self-end font-weight-bold">
<asp:LinkButton runat="server" ID="lbtSalva" CssClass="btn btn-success text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
<asp:Label runat="server" ID="lblUpdating" CssClass="btn btn-secondary text-light btn-lg btn-block" Visible="false"><i class="fa fa-circle-o-notch fa-spin"></i> USER INPUT</asp:Label>
<asp:Label runat="server" ID="lblUpdating" CssClass="btn btn-dark text-light btn-lg btn-block" Visible="false"><i class="fa fa-circle-o-notch fa-spin"></i> USER INPUT</asp:Label>
</div>
</div>
</div>