Update gestione PODL, funzionante...

This commit is contained in:
Samuele E. Locatelli
2018-09-26 14:57:34 +02:00
parent adad7d5f21
commit dcf4d458d3
5 changed files with 28 additions and 23 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=822']) {
withEnv(['NEXT_BUILD_NUMBER=823']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+11 -6
View File
@@ -5,25 +5,30 @@
<div style="text-align: center; margin: auto; vertical-align: middle; width: 100%; background: #DCDCDC;">
<div class="bg-secondary text-light" style="white-space: nowrap; padding: 2px;">
<asp:Button runat="server" ID="btnNewPromOdl" OnClick="btnNewPromOdl_Click" Text="Nuova PROMESSA ODL" />
<div class="row">
<div class="col-4"></div>
<div class="col-4">
<asp:LinkButton ID="lbtNewPODL" runat="server" OnClick="lbtNewPODL_Click" CssClass="btn btn-block btn-success"><i class="fa fa-plus"></i> Nuova PROMESSA ODL </asp:LinkButton>
</div>
<div class="col-4"></div>
</div>
<uc1:mod_newPromessaODL runat="server" ID="mod_newPromessaODL" />
</div>
<div id="divEditQta" runat="server" visible="false" class="ctrSelRowStyle" style="white-space: nowrap; padding: 2px;">
<div class="row">
<div class="col-sm-3">
<asp:Button runat="server" ID="btnOk" Text="Ok" Width="10em" OnClick="btnOk_Click" />
<asp:LinkButton ID="lbtOk" runat="server" Text="Ok" OnClick="btnOk_Click" CssClass="btn btn-block btn-success" OnClientClick="return confirm('Sicuro di voler modificare la Promessa ODL?');"><i class="fa fa-plus"></i> Modifica </asp:LinkButton>
</div>
<div class="col-sm-3">
Pezzi ODL:
# Pezzi Richiesti:
<asp:TextBox runat="server" ID="txtNewQta" Width="6em" />
</div>
<div class="col-sm-3">
Pezzi Pallet:
<asp:TextBox runat="server" ID="txtNewPzPallet" Width="6em" />
</div>
<div class="col-sm-3">
<asp:Button runat="server" ID="btnCancel" Text="Annulla" Width="10em" OnClick="btnCancel_Click" />
<asp:LinkButton ID="lbtCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" CssClass="btn btn-block btn-warning"><i class="fa fa-ban"></i> Annulla</asp:LinkButton>
</div>
</div>
</div>
@@ -47,7 +52,7 @@
<HeaderTemplate>
<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" CausesValidation="false" Visible="true" />
</HeaderTemplate>
<ItemTemplate>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbtSel" CausesValidation="false" CommandName="Select" ToolTip="Modifica promessa" Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-info"><i class="fa fa-edit"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtClona" CausesValidation="false" CommandName="Select" OnCommand="lbt_Command" CommandArgument="Clona" ToolTip="Copia promessa" CssClass="btn btn-sm btn-warning"><i class="fa fa-clipboard"></i></asp:LinkButton>
</ItemTemplate>
@@ -91,9 +91,9 @@ namespace MoonProAdmin.WebUserControls
{
// mostro edit quantità...
divEditQta.Visible = true;
btnNewPromOdl.Visible = true;
lbtNewPODL.Visible = true;
mod_newPromessaODL.Visible = false;
var riga = DataLayer.obj.taODL.getByIdx(idxOdlSel, false)[0];
var riga = DataLayer.obj.taPODL.getByKey(idxPOdlSel)[0];
numPz = riga.NumPezzi;
pzPallet = riga.PzPallet;
}
@@ -226,7 +226,7 @@ namespace MoonProAdmin.WebUserControls
grView.DataBind();
divEditQta.Visible = false;
mod_newPromessaODL.Visible = false;
btnNewPromOdl.Visible = true;
lbtNewPODL.Visible = true;
lblWarning.Visible = false;
if (eh_resetSelezione != null)
{
@@ -275,7 +275,7 @@ namespace MoonProAdmin.WebUserControls
{
// nascondo controllo e mostro button
mod_newPromessaODL.Visible = false;
btnNewPromOdl.Visible = true;
lbtNewPODL.Visible = true;
// aggiorno!
resetSelezione();
}
@@ -309,7 +309,7 @@ namespace MoonProAdmin.WebUserControls
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNewPromOdl_Click(object sender, EventArgs e)
protected void lbtNewPODL_Click(object sender, EventArgs e)
{
showAddNewPODL();
}
@@ -319,7 +319,7 @@ namespace MoonProAdmin.WebUserControls
// mostro controllo creazione ODL
mod_newPromessaODL.Visible = true;
divEditQta.Visible = false;
btnNewPromOdl.Visible = false;
lbtNewPODL.Visible = false;
grView.SelectedIndex = -1;
grView.DataBind();
}
@@ -369,9 +369,9 @@ namespace MoonProAdmin.WebUserControls
protected void btnOk_Click(object sender, EventArgs e)
{
if (idxOdlSel > 0)
if (idxPOdlSel > 0)
{
DataLayer.obj.taODL.updateQta(numPz, pzPallet, idxOdlSel);
DataLayer.obj.taPODL.updateQta(numPz, pzPallet, idxPOdlSel);
}
updateCtrl();
}
@@ -385,7 +385,7 @@ namespace MoonProAdmin.WebUserControls
/// <summary>
/// idxOdl selezionato
/// </summary>
protected int idxOdlSel
protected int idxPOdlSel
{
get
{
+6 -6
View File
@@ -13,13 +13,13 @@ namespace MoonProAdmin.WebUserControls {
public partial class mod_gestPromODL {
/// <summary>
/// Controllo btnNewPromOdl.
/// Controllo lbtNewPODL.
/// </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.Button btnNewPromOdl;
protected global::System.Web.UI.WebControls.LinkButton lbtNewPODL;
/// <summary>
/// Controllo mod_newPromessaODL.
@@ -40,13 +40,13 @@ namespace MoonProAdmin.WebUserControls {
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEditQta;
/// <summary>
/// Controllo btnOk.
/// Controllo lbtOk.
/// </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.Button btnOk;
protected global::System.Web.UI.WebControls.LinkButton lbtOk;
/// <summary>
/// Controllo txtNewQta.
@@ -67,13 +67,13 @@ namespace MoonProAdmin.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtNewPzPallet;
/// <summary>
/// Controllo btnCancel.
/// Controllo lbtCancel.
/// </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.Button btnCancel;
protected global::System.Web.UI.WebControls.LinkButton lbtCancel;
/// <summary>
/// Controllo grView.
@@ -105,7 +105,7 @@
&nbsp;
</div>
<div class="my-0">
<asp:LinkButton ID="lbtOk" runat="server" Text="Ok" OnClick="btnOk_Click" CssClass="btn btn-block btn-success" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaCreaPromOdl") %>'><i class="fa fa-plus"></i> Crea Promessa ODL</asp:LinkButton>
<asp:LinkButton ID="lbtOk" runat="server" Text="Ok" OnClick="btnOk_Click" CssClass="btn btn-block btn-success" OnClientClick="return confirm('Sicuro di voler creare la Promessa ODL?');" ><i class="fa fa-plus"></i> Crea Promessa ODL</asp:LinkButton>
</div>
</div>
<div class="col-2 pr-0 pl-1">