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

Merge branch 'develop' into ADM

Browse Source
This commit is contained in:
Samuele Locatelli
2021-04-03 17:44:22 +02:00
parent 852ab3224e 400ffcdade
commit 518b24d8a0
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1408']) {
withEnv(['NEXT_BUILD_NUMBER=1410']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx
+2 -2
View File
@@ -130,10 +130,10 @@
<div class="d-flex">
<div class="mr-auto p-2">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lnkMoveDown" Visible='<%# checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), -1) %>' ToolTip="Diminuisci (anticipa)" OnClick="lnkMoveDown_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxPromessa") %>' CssClass="btn btn-sm btn-dark"><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkMoveDown" Visible='<%# checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), -1) %>' ToolTip="Diminuisci (ritarda)" OnClick="lnkMoveDown_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxPromessa") %>' CssClass="btn btn-sm btn-dark"><i class="fa fa-arrow-down" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNoneDx" Enabled="false" Visible='<%# !checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), -1) %>' CssClass="btn btn-sm text-light"><i class="fa fa-arrows-h" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNoneSx" Enabled="false" Visible='<%# !checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), 1) %>' CssClass="btn btn-sm text-light"><i class="fa fa-arrows-h" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkMoveUp" Visible='<%# checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), 1) %>' ToolTip="Aumenta (ritarda)" OnClick="lnkMoveUp_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxPromessa") %>' CssClass="btn btn-sm btn-secondary"><i class="fa fa-arrow-down" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkMoveUp" Visible='<%# checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), 1) %>' ToolTip="Aumenta (anticipa)" OnClick="lnkMoveUp_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxPromessa") %>' CssClass="btn btn-sm btn-secondary"><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
+3 -3
View File
@@ -302,7 +302,7 @@ namespace MP_ADM.WebUserControls
}
/// <summary>
/// Richiesto abbassamento priorità = ANTICIPA
/// Richiesto abbassamento priorità = RITARDA
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -319,7 +319,7 @@ namespace MP_ADM.WebUserControls
}
/// <summary>
/// Richiesto aumento priorità = RITARDA
/// Richiesto aumento priorità = ANTICIPA
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -396,7 +396,7 @@ namespace MP_ADM.WebUserControls
bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina;
#if false
bool onlyProgrammed = chkUnassigned.Checked;
bool onlyProgrammed = chkUnassigned.Checked;
return enableChgPrio && onlyProgrammed && singleMachine;
#endif
return enableChgPrio && singleMachine;
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+5 -3
View File
@@ -92,13 +92,15 @@ namespace MoonProTablet.WebUserControls
{
get
{
int answ = 0;
int answ = 1;
try
{
answ = cmp_selPzPallet.pzPallet;
}
catch
{ }
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in recupero PzPallet{Environment.NewLine}{exc}");
}
return answ;
}
set