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

Fix selezione subMacc x SCARTI in TAB

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-04 19:31:01 +02:00
parent d81f29a314
commit e3e1a319a9
11 changed files with 168 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=846']) {
withEnv(['NEXT_BUILD_NUMBER=847']) {
// 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'
MAPO.sln
+21 -23
View File
@@ -25,8 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
Appunti.md = Appunti.md
BranchConfSetup.md = BranchConfSetup.md
webAppSettings.config = webAppSettings.config
webConnectionString.config = webConnectionString.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MAKE", "MP-MAKE\MP-MAKE.csproj", "{E5A49351-F487-4329-8117-925A8FE662E5}"
@@ -37,8 +35,8 @@ Global
IIS01|Any CPU = IIS01|Any CPU
IIS02|Any CPU = IIS02|Any CPU
OVH-Demo|Any CPU = OVH-Demo|Any CPU
Prod|Any CPU = Prod|Any CPU
Release|Any CPU = Release|Any CPU
Staging|Any CPU = Staging|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{663F7136-F470-4911-A9B6-044447F93168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -49,10 +47,10 @@ Global
{663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Prod|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Staging|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Staging|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,10 +59,10 @@ Global
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Prod|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Staging|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Staging|Any CPU.Build.0 = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -73,10 +71,10 @@ Global
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Prod|Any CPU.Build.0 = Prod|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.Build.0 = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Staging|Any CPU.Build.0 = Staging|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -85,10 +83,10 @@ Global
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Prod|Any CPU.Build.0 = Prod|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Release|Any CPU.Build.0 = Release|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Staging|Any CPU.Build.0 = Staging|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -97,10 +95,10 @@ Global
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.Build.0 = Prod|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.Build.0 = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Staging|Any CPU.Build.0 = Staging|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -109,10 +107,10 @@ Global
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.Build.0 = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.Build.0 = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Staging|Any CPU.Build.0 = Staging|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -121,10 +119,10 @@ Global
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.Build.0 = Prod|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.Build.0 = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Staging|Any CPU.Build.0 = Staging|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
@@ -133,10 +131,10 @@ Global
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Prod|Any CPU.Build.0 = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Staging|Any CPU.ActiveCfg = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Staging|Any CPU.Build.0 = Release|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Debug|Any CPU.Build.0 = Debug|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -145,10 +143,10 @@ Global
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Prod|Any CPU.Build.0 = Prod|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.ActiveCfg = Release|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.Build.0 = Release|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Staging|Any CPU.Build.0 = Staging|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,10 +155,10 @@ Global
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS02|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.Build.0 = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Staging|Any CPU.Build.0 = Staging|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
MP-TAB/ODL.aspx
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="form-group" runat="server" id="divSelMacc">
<asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound" CssClass="form-control form-control-sm"></asp:DropDownList>
<asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound" CssClass="form-control"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
MP-TAB/WebUserControls/mod_controlliProd.ascx
+2 -2
View File
@@ -13,8 +13,8 @@
</asp:LinkButton>
</div>
<div class="col-12" runat="server" id="divSelMacc">
<asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" CssClass="form-control" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
<asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="odsMacc" CssClass="form-control" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsMacc" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
</SelectParameters>
MP-TAB/WebUserControls/mod_controlliProd.ascx.designer.cs
Generated
+2 -2
View File
@@ -67,13 +67,13 @@ namespace MoonProTablet.WebUserControls {
protected global::System.Web.UI.WebControls.DropDownList ddlSubMacc;
/// <summary>
/// Controllo ods.
/// Controllo odsMacc.
/// </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.ObjectDataSource ods;
protected global::System.Web.UI.WebControls.ObjectDataSource odsMacc;
/// <summary>
/// Controllo lbtOK.
MP-TAB/WebUserControls/mod_elencoScarti.ascx
+1 -1
View File
@@ -45,7 +45,7 @@
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_ProdTempiTableAdapters.RegistroScartiTableAdapter">
<SelectParameters>
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchina" Name="IdxMacchina" />
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchinaScarti" Name="IdxMacchina" />
<asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_inizio" Name="DataFrom" />
<asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_fine" Name="DataTo" />
</SelectParameters>
MP-TAB/WebUserControls/mod_regScarti.ascx
+8
View File
@@ -11,6 +11,14 @@
<i class="fa fa-bug"></i>
<asp:Label runat="server" ID="lblShowScarti" />
</asp:LinkButton>
</div>
<div class="col-12" runat="server" id="divSelMacc">
<asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="odsMacc" CssClass="form-control" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsMacc" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
MP-TAB/WebUserControls/mod_regScarti.ascx.cs
+100 -4
View File
@@ -1,9 +1,6 @@
using MapoDb;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
@@ -35,6 +32,7 @@ namespace MoonProTablet.WebUserControls
private void checkAll()
{
fixSelMacc();
fixData();
checkOdl();
lblOut.Text = "";
@@ -75,6 +73,25 @@ namespace MoonProTablet.WebUserControls
lblConfScarti.Visible = !odlOk;
lblMancaODL.Visible = !odlOk;
}
/// <summary>
/// Se la machcina è MULTI --> mostro selettore
/// </summary>
private void fixSelMacc()
{
divSelMacc.Visible = isMulti;
fixSelMaccScarti();
}
/// <summary>
/// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
/// </summary>
protected bool isMulti
{
get
{
return DataLayer.isMulti(idxMacchinaSession);
}
}
/// <summary>
/// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
/// </summary>
@@ -111,6 +128,7 @@ namespace MoonProTablet.WebUserControls
return answ;
}
}
/// <summary>
/// idx macchina selezionata
/// </summary>
@@ -119,8 +137,38 @@ namespace MoonProTablet.WebUserControls
get
{
string answ = memLayer.ML.StringSessionObj("IdxMacchina");
// verifoc: se multi uso selettore tendina...
if (isMulti)
{
if (ddlSubMacc.SelectedValue == "")
{
ddlSubMacc.DataBind();
}
if (ddlSubMacc.SelectedValue != "")
{
answ = ddlSubMacc.SelectedValue;
}
}
return answ;
}
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
/// <summary>
/// idx macchina selezionata
/// </summary>
public string idxMacchinaSession
{
get
{
return memLayer.ML.StringSessionObj("IdxMacchina");
}
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
/// <summary>
/// cambio stato visibilità pannello e testo button
@@ -158,6 +206,54 @@ namespace MoonProTablet.WebUserControls
// nascondo!
switchBtnConferma(false);
}
protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
{
subMaccSel = ddlSubMacc.SelectedValue;
fixSelMaccScarti();
checkAll();
}
private void fixSelMaccScarti()
{
if (isMulti)
{
memLayer.ML.setSessionVal("IdxMacchinaScarti", subMaccSel);
}
else
{
memLayer.ML.setSessionVal("IdxMacchinaScarti", idxMacchinaSession);
}
}
protected void ddlSubMacc_DataBound(object sender, EventArgs e)
{
// se ho in memoria un valore LO REIMPOSTO...
if (subMaccSel != "")
{
// provo a preselezionare...
try
{
ddlSubMacc.SelectedValue = subMaccSel;
}
catch
{ }
}
}
/// <summary>
/// Sotto sistema (macchina) selezionato
/// </summary>
public string subMaccSel
{
get
{
return memLayer.ML.StringSessionObj("subMaccSel");
}
set
{
memLayer.ML.setSessionVal("subMaccSel", value);
}
}
/// <summary>
/// salvo produzione
/// </summary>
@@ -216,7 +312,7 @@ namespace MoonProTablet.WebUserControls
if (eh_newVal != null)
{
eh_newVal(this, new EventArgs());
}
}
}
}
}
MP-TAB/WebUserControls/mod_regScarti.ascx.designer.cs
Generated
+27
View File
@@ -48,6 +48,33 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblShowScarti;
/// <summary>
/// Controllo divSelMacc.
/// </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 divSelMacc;
/// <summary>
/// Controllo ddlSubMacc.
/// </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.DropDownList ddlSubMacc;
/// <summary>
/// Controllo odsMacc.
/// </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.ObjectDataSource odsMacc;
/// <summary>
/// Controllo divDetail.
/// </summary>
MP/MP.csproj
+4 -13
View File
@@ -308,21 +308,12 @@
<None Include="Views\Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Donati.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.IIS01.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.IIS02.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Jetco.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.OVH-Demo.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Prod.config">
<DependentUpon>Web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
@@ -397,7 +388,7 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Staging|AnyCPU'">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Prod|AnyCPU' ">
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
MP/MP.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Prod|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>