diff --git a/ES3/ES3.csproj b/ES3/ES3.csproj index 49aae246..aa2b0b66 100644 --- a/ES3/ES3.csproj +++ b/ES3/ES3.csproj @@ -30,7 +30,7 @@ - 3.7 + Latest true diff --git a/ES3/mongocrypt.dll b/ES3/mongocrypt.dll new file mode 100644 index 00000000..3cc36341 Binary files /dev/null and b/ES3/mongocrypt.dll differ diff --git a/Jenkinsfile b/Jenkinsfile index 45ec31bc..21383cac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1405']) { + withEnv(['NEXT_BUILD_NUMBER=1407']) { // env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 7214e323..97275da3 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -1317,7 +1317,7 @@ True 5332 / - http://localhost:5332/ + http://localhost:5333/ False False diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx index cd0cf040..7ad87a36 100644 --- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx @@ -6,10 +6,10 @@
-
+

PODL attivi

-
+ <%--
@@ -18,7 +18,7 @@
-
+
--%>
@@ -29,7 +29,7 @@ - +
Riassegna
@@ -169,7 +169,8 @@ - + + <%----%>
diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs index 0db5ea0f..05dc849d 100644 --- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs @@ -252,26 +252,6 @@ namespace MP_ADM.WebUserControls setPromAttivabili(true); } -#if false - /// - /// elimina commento - /// - /// - /// - protected void lbtDel_Click(object sender, EventArgs e) - { - LinkButton imgBtn = (LinkButton)sender; - int IdxProm = 0; - int.TryParse(imgBtn.CommandArgument, out IdxProm); - if (IdxProm > 0) - { - DataLayerObj.taPromOut.deleteQuery(IdxProm); - } - doUpdate(); - raiseNewVal(); - } -#endif - protected void lbtDisattiva_Click(object sender, EventArgs e) { setPromAttivabili(false); @@ -414,9 +394,12 @@ namespace MP_ADM.WebUserControls // è ok SE sono ENTRO i 2 limiti enableChgPrio = ((priorita + delta) >= LPI && (priorita + delta) <= LPS); - bool onlyProgrammed = chkUnassigned.Checked; bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina; +#if false + bool onlyProgrammed = chkUnassigned.Checked; return enableChgPrio && onlyProgrammed && singleMachine; +#endif + return enableChgPrio && singleMachine; } public string cssByAtt(object currAtt) @@ -446,6 +429,7 @@ namespace MP_ADM.WebUserControls public void doUpdate() { grView.DataBind(); + checkActions(); } /// diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs index d180156f..8a1a011c 100644 --- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MP_ADM.WebUserControls @@ -15,182 +15,164 @@ namespace MP_ADM.WebUserControls { /// - /// Controllo chkUnassigned. + /// divMachine control. /// /// - /// 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.CheckBox chkUnassigned; - - /// - /// Controllo lblUnass. - /// - /// - /// 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.Label lblUnass; - - /// - /// Controllo divMachine. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMachine; /// - /// Controllo chkReassign. + /// chkReassign control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkReassign; /// - /// Controllo ddlSelMacchina. + /// ddlSelMacchina control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlSelMacchina; /// - /// Controllo odsMac. + /// odsMac control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsMac; /// - /// Controllo lbtReassignMachine. + /// lbtReassignMachine control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtReassignMachine; /// - /// Controllo divActions. + /// divActions control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divActions; /// - /// Controllo lbtAttiva. + /// lbtAttiva control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtAttiva; /// - /// Controllo lbtDisattiva. + /// lbtDisattiva control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtDisattiva; /// - /// Controllo lbtElimina. + /// lbtElimina control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtElimina; /// - /// Controllo grView. + /// grView control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grView; /// - /// Controllo hfIdxMacc. + /// hfIdxMacc control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc; /// - /// Controllo hfCodGrp. + /// hfCodGrp control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfCodGrp; /// - /// Controllo hfCodArt. + /// hfCodArt control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfCodArt; /// - /// Controllo hfCodCli. + /// hfCodCli control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfCodCli; /// - /// Controllo ods. + /// ods control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; /// - /// Controllo lblNumRec. + /// lblNumRec control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNumRec; /// - /// Controllo lblWarning. + /// lblWarning control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblWarning; /// - /// Controllo txtPageSize. + /// txtPageSize control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtPageSize; } diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs index 08a4ed69..bfa3f946 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs @@ -174,7 +174,7 @@ namespace MP_ADM.WebUserControls grView.SelectedIndex = -1; grView.DataBind(); // segnalo update - raiseSelNew(); + raiseNewVal(); } private void toggleVisibility() diff --git a/MP-ADM/WebUserControls/cmp_planStats.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs index d3f3ab90..3959d388 100644 --- a/MP-ADM/WebUserControls/cmp_planStats.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs @@ -230,6 +230,7 @@ namespace MP_ADM.WebUserControls public void doUpdate() { frmView.DataBind(); + cmp_planStats_Mac.doUpdate(); } public string showData(object valOre, object valNum) diff --git a/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs index 4320baa2..804fc864 100644 --- a/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs @@ -86,6 +86,11 @@ namespace MP_ADM.WebUserControls grView.DataBind(); } + public void doUpdate() + { + grView.DataBind(); + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Cli.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Cli.ascx.cs index b2e17a10..fa492b81 100644 --- a/MP-ADM/WebUserControls/cmp_planStats_Cli.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats_Cli.ascx.cs @@ -86,6 +86,11 @@ namespace MP_ADM.WebUserControls grView.DataBind(); } + public void doUpdate() + { + grView.DataBind(); + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs index 7e5e691b..14e066e8 100644 --- a/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs @@ -74,6 +74,11 @@ namespace MP_ADM.WebUserControls grView.DataBind(); } + public void doUpdate() + { + grView.DataBind(); + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs index b038edf7..5d1892e2 100644 --- a/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs @@ -86,6 +86,11 @@ namespace MP_ADM.WebUserControls grView.DataBind(); } + public void doUpdate() + { + grView.DataBind(); + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-ADM/images/Thumbs.db b/MP-ADM/images/Thumbs.db new file mode 100644 index 00000000..ef6bea01 Binary files /dev/null and b/MP-ADM/images/Thumbs.db differ diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index a28c1363..746a3acc 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -26,7 +26,7 @@ - 4.0 + Latest true diff --git a/MP-SITE/Resources/Donati/macchine/Thumbs.db b/MP-SITE/Resources/Donati/macchine/Thumbs.db new file mode 100644 index 00000000..e11fb7b8 Binary files /dev/null and b/MP-SITE/Resources/Donati/macchine/Thumbs.db differ diff --git a/MP-SITE/images/Thumbs.db b/MP-SITE/images/Thumbs.db new file mode 100644 index 00000000..ef6bea01 Binary files /dev/null and b/MP-SITE/images/Thumbs.db differ diff --git a/MagData/Core/Compression/Snappy/lib/win/snappy32.dll b/MagData/Core/Compression/Snappy/lib/win/snappy32.dll new file mode 100644 index 00000000..afc82ca4 Binary files /dev/null and b/MagData/Core/Compression/Snappy/lib/win/snappy32.dll differ diff --git a/MagData/Core/Compression/Snappy/lib/win/snappy64.dll b/MagData/Core/Compression/Snappy/lib/win/snappy64.dll new file mode 100644 index 00000000..36cd5fe7 Binary files /dev/null and b/MagData/Core/Compression/Snappy/lib/win/snappy64.dll differ diff --git a/MagData/Core/Compression/Zstandard/lib/win/libzstd.dll b/MagData/Core/Compression/Zstandard/lib/win/libzstd.dll new file mode 100644 index 00000000..e669123c Binary files /dev/null and b/MagData/Core/Compression/Zstandard/lib/win/libzstd.dll differ diff --git a/VersGen/MoonPro.cs b/VersGen/MoonPro.cs index 386a6be3..e6b4bab4 100644 --- a/VersGen/MoonPro.cs +++ b/VersGen/MoonPro.cs @@ -1,11 +1,11 @@ -// +// // This code was generated by a tool. Any changes made manually will be lost // the next time this code is regenerated. -// +// using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyCopyright("Steamware ©")] -[assembly: AssemblyCompany("Steamware")] \ No newline at end of file +[assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/VersGen.csproj b/VersGen/VersGen.csproj index 7705a224..74560788 100644 --- a/VersGen/VersGen.csproj +++ b/VersGen/VersGen.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,8 +9,9 @@ Properties VersGen VersGen - v3.5 + v4.6.1 512 + AnyCPU @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -30,6 +32,7 @@ TRACE prompt 4 + false