Aggiunta ricerca x ODL da TABLET

This commit is contained in:
Samuele E. Locatelli
2019-03-25 19:24:15 +01:00
parent e5a5af1eb3
commit 7f4cc2b45b
5 changed files with 1936 additions and 1916 deletions
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1174']) {
withEnv(['NEXT_BUILD_NUMBER=1176']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+10 -4
View File
@@ -33,18 +33,24 @@
<asp:LinkButton runat="server" ID="lbtConfNewRevProd" OnClick="lbtConfNewRevProd_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaNuovaRev") %>' CssClass="btn btn-block"><i class="fa fa-star"></i> CONFERMA produzione nuova REV</asp:LinkButton>
</div>
</div>
<div class="row pb-3">
<div class="row pb-3">
<div class="col-sm-12 py-2" id="divDettOdl" runat="server" visible="false">
<uc1:cmp_dettODL runat="server" id="cmp_dettODL" />
<uc1:cmp_dettODL runat="server" ID="cmp_dettODL" />
</div>
<div class="col-sm-6">
<div class="col-auto px-0">
<label class="sr-only" for="inlineFormInputGroup">Username</label>
<div class="input-group mb-2">
<div class="input-group-prepend">
<asp:TextBox runat="server" ID="txtSearchODL" CssClass="form form-control bg-warning textCondens px-1" AutoPostBack="True" placeholder="cerca" Width="3em" OnTextChanged="txtSearchODL_TextChanged" />
</div>
<asp:DropDownList runat="server" ID="ddlODL" DataSourceID="odsODL" DataTextField="label" DataValueField="value" CssClass="form-control btn-default textCondens" OnSelectedIndexChanged="ddlODL_SelectedIndexChanged" AutoPostBack="True">
</asp:DropDownList>
<asp:HiddenField runat="server" ID="hfIdxMacchina" />
<asp:ObjectDataSource runat="server" ID="odsODL" OldValuesParameterFormatString="original_{0}" SelectMethod="getUnused" TypeName="MapoDb.DS_UtilityTableAdapters.v_selODLTableAdapter">
<asp:ObjectDataSource runat="server" ID="odsODL" OldValuesParameterFormatString="original_{0}" SelectMethod="getUnused" TypeName="MapoDb.DS_UtilityTableAdapters.v_selODLTableAdapter" FilterExpression=" label like '%{0}%' ">
<FilterParameters>
<asp:ControlParameter ControlID="txtSearchODL" DefaultValue="" Name="value" Type="String" PropertyName="Text" />
</FilterParameters>
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxMacchina" DefaultValue="0" Name="IdxMacchina" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="chkTutti" DefaultValue="false" Name="showAll" PropertyName="checked" Type="Boolean" />
@@ -60,7 +66,7 @@
<asp:LinkButton runat="server" ID="lbtStartAttr" OnClick="lbtStartAttr_Click" CssClass="btn btn-block btn-primary" Visible="false"><i class="fa fa-check"></i> INIZIO Attrezzaggio</asp:LinkButton>
</div>
<div class="col-sm-6">
<div runat="server" id="divNote" visible="false" >
<div runat="server" id="divNote" visible="false">
<asp:TextBox runat="server" ID="txtNote" TextMode="MultiLine" Height="4em" CssClass="form-control" placeholder="Note attrezzaggio" />
</div>
</div>
+5
View File
@@ -1130,5 +1130,10 @@ namespace MoonProTablet.WebUserControls
eh_reqUpdate(this, new EventArgs());
}
}
protected void txtSearchODL_TextChanged(object sender, EventArgs e)
{
odsODL.DataBind();
}
}
}
+9
View File
@@ -57,6 +57,15 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::MoonProTablet.WebUserControls.cmp_dettODL cmp_dettODL;
/// <summary>
/// Controllo txtSearchODL.
/// </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.TextBox txtSearchODL;
/// <summary>
/// Controllo ddlODL.
/// </summary>
+1911 -1911
View File
File diff suppressed because it is too large Load Diff