Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v 3.5.905: fix pagina sblocco trattati con selettore del CodBlocco (hard coded come selettore in pagina aspx!!!)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-09-12 18:06:45 +02:00
parent 3767c1347b
commit 23f5c0f72c
16 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/POST_FinitiMult_IN.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" preCodLineNT="W25" preCodLineDT="W25" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" preCodLineNT="W25" formatoDmtx="IN" preCodLineDT="W25" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
GMW/POST_FinitiMult_OUT.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" preCodLineNT="W25" preCodLineDT="W25" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" preCodLineNT="W25" formatoDmtx="OUT" preCodLineDT="W25" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
GMW/SbloccoUdcTrattati.aspx
+14 -1
View File
@@ -1,4 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="SbloccoUdcTrattati.aspx.cs" Inherits="GMW.SbloccoUdcTrattati" %>
<%@ Register Src="WebUserControls/mod_selLineaNtDt.ascx" TagName="mod_selLineaNtDt" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_storicoAzioniOperatore.ascx" TagName="mod_storicoAzioniOperatore" TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_sbloccoUdc.ascx" TagPrefix="uc1" TagName="mod_sbloccoUdc" %>
@@ -9,6 +10,18 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<div class="row" style="background-color: #dedede;">
<div class="col-xs-12 text-center">
Linee origine UDC da sbloccare:
<asp:DropDownList runat="server" ID="dlSelCodBlocco" AutoPostBack="true" OnSelectedIndexChanged="dlSelCodBlocco_SelectedIndexChanged">
<asp:ListItem Text="Linee finiti std" Value="W20"></asp:ListItem>
<asp:ListItem Text="Linea GRZ/LVT" Value="W21"></asp:ListItem>
<asp:ListItem Text="Linee FSC" Value="W23"></asp:ListItem>
<asp:ListItem Text="Linee Finiti IN/OUT" Value="W24"></asp:ListItem>
<asp:ListItem Text="Linee Finiti Multi IN/OUT" Value="W25"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="SbloccoUdcTrattati" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="false" showSelPostazione="false" showStorico="false" preCodLineNT="W21" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
@@ -31,7 +44,7 @@
</div>
</div>
<div class="col-xs-12">
<uc1:mod_sbloccoUdc runat="server" id="mod_sbloccoUdc" flusso="TT" statoUDC="Tratt" eventoUDC="UDC_SBTRT" />
<uc1:mod_sbloccoUdc runat="server" ID="mod_sbloccoUdc" flusso="TT" statoUDC="Tratt" eventoUDC="UDC_SBTRT" />
</div>
</div>
</div>
GMW/SbloccoUdcTrattati.aspx.cs
+14 -1
View File
@@ -24,7 +24,8 @@ namespace GMW
reportPrinter.obj.pulisciDir();
// imposto posizione e blocco da web.config
mod_sbloccoUdc.idxPosizioneIn = memLayer.ML.CRI("IdxPosizioneTrattati");
mod_sbloccoUdc.codBloccoIn = memLayer.ML.CRS("CodBloccoTrattati");
//mod_sbloccoUdc.codBloccoIn = memLayer.ML.CRS("CodBloccoTrattati");
refreshCodBloccoChild();
}
// update vari...
doUpdate();
@@ -121,5 +122,17 @@ namespace GMW
lblWarning.Text = traduci("lblWarnPostNonConf");
}
}
protected void dlSelCodBlocco_SelectedIndexChanged(object sender, EventArgs e)
{
refreshCodBloccoChild();
}
private void refreshCodBloccoChild()
{
// cambio codBlocco x selettore e x modulo sblocco UDC trattati...
mod_selLineaNtDt1.preCodLineNT = dlSelCodBlocco.SelectedValue;
mod_sbloccoUdc.codBloccoIn = dlSelCodBlocco.SelectedValue;
}
}
}
GMW/SbloccoUdcTrattati.aspx.designer.cs
Generated
+9
View File
@@ -12,6 +12,15 @@ namespace GMW {
public partial class SbloccoUdcTrattati {
/// <summary>
/// dlSelCodBlocco 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.DropDownList dlSelCodBlocco;
/// <summary>
/// mod_selLineaNtDt1 control.
/// </summary>
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/GMW.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("3.5.904.2442")]
[assembly: AssemblyFileVersion("3.5.904.2442")]
[assembly: AssemblyVersion("3.5.905.2446")]
[assembly: AssemblyFileVersion("3.5.905.2446")]
[assembly: AssemblyCopyright("Steamware © 2007-2016")]
[assembly: AssemblyCompany("Steamware")]
VersGen/GMW.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("3.5.904.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.904.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("3.5.905.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.905.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+