diff --git a/Jenkinsfile b/Jenkinsfile
index e5ca7598..5d1d90fd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+ env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "dHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
}
script {
diff --git a/MP-MAG/WebUserControls/cmp_listODL.ascx b/MP-MAG/WebUserControls/cmp_listODL.ascx
index cf91efa7..19fcd2d4 100644
--- a/MP-MAG/WebUserControls/cmp_listODL.ascx
+++ b/MP-MAG/WebUserControls/cmp_listODL.ascx
@@ -18,9 +18,14 @@
diff --git a/MP-MAG/WebUserControls/cmp_listODL.ascx.cs b/MP-MAG/WebUserControls/cmp_listODL.ascx.cs
index 83b9bd8b..61881623 100644
--- a/MP-MAG/WebUserControls/cmp_listODL.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_listODL.ascx.cs
@@ -102,6 +102,17 @@ namespace MP_MAG.WebUserControls
resetSelezione();
}
+ protected void lbtResetSearch_Click(object sender, EventArgs e)
+ {
+ // reset ricerca!
+ txtSearch.Text = "";
+ }
+
+ protected void lbtSearch_Click(object sender, EventArgs e)
+ {
+ // ricerca senza fare nulla
+ }
+
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
@@ -131,6 +142,11 @@ namespace MP_MAG.WebUserControls
return answ;
}
+ protected void txtSearch_TextChanged(object sender, EventArgs e)
+ {
+ // esegue update senza fare nulla
+ }
+
#endregion Protected Methods
}
}
\ No newline at end of file
diff --git a/MP-MAG/WebUserControls/cmp_listODL.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_listODL.ascx.designer.cs
index c59a9678..b30fb43e 100644
--- a/MP-MAG/WebUserControls/cmp_listODL.ascx.designer.cs
+++ b/MP-MAG/WebUserControls/cmp_listODL.ascx.designer.cs
@@ -32,6 +32,15 @@ namespace MP_MAG.WebUserControls
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchina;
+ ///
+ /// lbtSearch control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbtSearch;
+
///
/// txtSearch control.
///
@@ -41,6 +50,15 @@ namespace MP_MAG.WebUserControls
///
protected global::System.Web.UI.WebControls.TextBox txtSearch;
+ ///
+ /// lbtResetSearch control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbtResetSearch;
+
///
/// grView control.
///