diff --git a/GMW/GMW.csproj.user b/GMW/GMW.csproj.user
index bc13b842..14a3bcb4 100644
--- a/GMW/GMW.csproj.user
+++ b/GMW/GMW.csproj.user
@@ -10,7 +10,7 @@
- TK_prod|Any CPU
+ Debug|Any CPU
diff --git a/GMW/WebUserControls/mod_anagLinee.ascx b/GMW/WebUserControls/mod_anagLinee.ascx
index 671e161d..0144162e 100644
--- a/GMW/WebUserControls/mod_anagLinee.ascx
+++ b/GMW/WebUserControls/mod_anagLinee.ascx
@@ -23,7 +23,7 @@
diff --git a/GMW/WebUserControls/mod_confLinea.ascx b/GMW/WebUserControls/mod_confLinea.ascx
index c689794c..180593cc 100644
--- a/GMW/WebUserControls/mod_confLinea.ascx
+++ b/GMW/WebUserControls/mod_confLinea.ascx
@@ -6,10 +6,13 @@
- No records
+ Add New
+
+
+
@@ -34,7 +37,7 @@
-
+ <%----%>
diff --git a/GMW/WebUserControls/mod_confLinea.ascx.cs b/GMW/WebUserControls/mod_confLinea.ascx.cs
index 61808759..da20752e 100644
--- a/GMW/WebUserControls/mod_confLinea.ascx.cs
+++ b/GMW/WebUserControls/mod_confLinea.ascx.cs
@@ -232,6 +232,16 @@ namespace GMW.WebUserControls
}
return answ;
}
-
+ ///
+ /// Aggiunta nuovo record...
+ ///
+ ///
+ ///
+ protected void lbtAddNew_Click(object sender, EventArgs e)
+ {
+ // creo un NUOVO record con funzionalità "PASS" di default...
+ MagClass.magazzino.taConfLin.Insert(codLinea, "Particolare", "Cod Particolare", 1);
+ grView.DataBind();
+ }
}
}
\ No newline at end of file
diff --git a/GMW/WebUserControls/mod_confLinea.ascx.designer.cs b/GMW/WebUserControls/mod_confLinea.ascx.designer.cs
index ee3395b5..9bb3d099 100644
--- a/GMW/WebUserControls/mod_confLinea.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_confLinea.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace GMW.WebUserControls {
@@ -13,29 +13,29 @@ namespace GMW.WebUserControls {
public partial class mod_confLinea {
///
- /// grView control.
+ /// Controllo grView.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.GridView grView;
///
- /// ods control.
+ /// Controllo ods.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
- /// hfCodLinea control.
+ /// Controllo hfCodLinea.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.HiddenField hfCodLinea;
}
diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs
index 87a5b490..c6db8f48 100644
--- a/GMW_data/MagClass.cs
+++ b/GMW_data/MagClass.cs
@@ -14,6 +14,7 @@ namespace GMW_data
/// Oggetto locale gestione classe datamatrix...
///
protected DataMatrix DataMatrix_mgr = new DataMatrix();
+
#region area table adapters
// variabile di tipo table adapter
@@ -50,6 +51,7 @@ namespace GMW_data
public DS_magazzinoTableAdapters.UDC_check4deleteTableAdapter taUdcChk4Del;
public DS_magazzinoTableAdapters.AnagKitTableAdapter taAK;
public DS_magazzinoTableAdapters.RelKit2PartTableAdapter taRK2P;
+ public DS_magazzinoTableAdapters.ConfLineaTableAdapter taConfLin;
///
@@ -92,6 +94,7 @@ namespace GMW_data
taUdcChk4Del = new DS_magazzinoTableAdapters.UDC_check4deleteTableAdapter();
taAK = new DS_magazzinoTableAdapters.AnagKitTableAdapter();
taRK2P = new DS_magazzinoTableAdapters.RelKit2PartTableAdapter();
+ taConfLin = new DS_magazzinoTableAdapters.ConfLineaTableAdapter();
}
///
/// effettua setup dei connection strings da web.config delal singola applicazione
@@ -133,6 +136,7 @@ namespace GMW_data
taUdcChk4Del.Connection.ConnectionString = connString;
taAK.Connection.ConnectionString = connString;
taRK2P.Connection.ConnectionString = connString;
+ taConfLin.Connection.ConnectionString = connString;
}
#endregion
diff --git a/Jenkinsfile b/Jenkinsfile
index 982167a6..86b65e55 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=2126']) {
+ withEnv(['NEXT_BUILD_NUMBER=2127']) {
// impiego numero di build del SINGOLO RAMO
// env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
// forzo numero di build x tutti rami uguali