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

fix controllo doppia MP

Browse Source
This commit is contained in:
Samuele Locatelli
2021-07-28 12:41:42 +02:00
parent d9505e1749
commit 17aa2a0f13
5 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/WebUserControls/cmp_ST_detail.ascx
+2 -2
View File
@@ -6,12 +6,12 @@
<asp:Repeater ID="repDetail" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="border border-bottom-secondary">
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataOggetto='<%# Eval("Oggetto") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
</div>
</ItemTemplate>
<AlternatingItemTemplate>
<div class="">
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataOggetto='<%# Eval("Oggetto") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
</div>
</AlternatingItemTemplate>
</asp:Repeater>
MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
+1 -1
View File
@@ -152,7 +152,7 @@ namespace MoonProTablet.WebUserControls
// verifico EVENTUALI deroghe
var currDeroga = DataLayerObj.getDerogaSt(tabRichieste[0].IdxST);
// se è deroga x gruppo/tipo/num corretto...
if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num)
if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num && tabRichieste[0].Oggetto == currDeroga.Oggetto)
{
// ... forzo accettazione deroga
DataLayerObj.taSTChk.upsertQuery(idxOdl, tabRichieste[0].IdxST, tabRichieste[0].Oggetto, tabRichieste[0].Num, BCodeVal, tabRichieste[0].Value, true, user_std.UtSn.utente);
MP-TAB/WebUserControls/cmp_ST_objView.ascx
+2 -1
View File
@@ -1,9 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objView.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_ST_objView" %>
<asp:HiddenField runat="server" ID="hfNum" />
<asp:HiddenField runat="server" ID="hfIdxST" />
<asp:HiddenField runat="server" ID="hfType" />
<asp:HiddenField runat="server" ID="hfGruppo" />
<asp:HiddenField runat="server" ID="hfNum" />
<asp:HiddenField runat="server" ID="hfOggetto" />
<asp:HiddenField runat="server" ID="hfLabel" />
<asp:HiddenField runat="server" ID="hfValue" />
<asp:HiddenField runat="server" ID="hfValueRead" />
MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs
+17 -2
View File
@@ -71,7 +71,6 @@ namespace MoonProTablet.WebUserControls
}
}
public int dataNum
{
get
@@ -85,6 +84,21 @@ namespace MoonProTablet.WebUserControls
hfNum.Value = $"{value}";
}
}
public int dataOggetto
{
get
{
int answ = 0;
int.TryParse(hfOggetto.Value, out answ);
return answ;
}
set
{
hfOggetto.Value = $"{value}";
}
}
public int idxST
{
get
@@ -237,7 +251,7 @@ namespace MoonProTablet.WebUserControls
answ = (currDeroga != null);
if (answ)
{
answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType);
answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto);
}
}
catch
@@ -289,6 +303,7 @@ namespace MoonProTablet.WebUserControls
{
CanForce = enableForceParamSchedaTecnica,
Num = dataNum,
Oggetto = dataOggetto,
CodTipo = dataType,
CodGruppo = dataGroup,
IdxST = idxST
MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs
Generated
+18 -9
View File
@@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class cmp_ST_objView
{
/// <summary>
/// hfNum control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfNum;
/// <summary>
/// hfIdxST control.
/// </summary>
@@ -50,6 +41,24 @@ namespace MoonProTablet.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfGruppo;
/// <summary>
/// hfNum control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfNum;
/// <summary>
/// hfOggetto control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfOggetto;
/// <summary>
/// hfLabel control.
/// </summary>