diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config b/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config
deleted file mode 100644
index a11a39e..0000000
--- a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-app.config b/MP-MAG/App_Readme/SteamWare_demo/example-app.config
deleted file mode 100644
index fb42165..0000000
--- a/MP-MAG/App_Readme/SteamWare_demo/example-app.config
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt b/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt
deleted file mode 100644
index dd0ab8e..0000000
--- a/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# chiave valore valoreStd note
-_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net
-_allowForceUser true true abilita login forzato
-_commonPages menu menu pagina comune
-_emailPwd drmfsls16 drmfsls16 drmfsls16
-_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com
-_enableSSL true true true
-_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg
-_righeDataGrid 30 30 Num righe datagrid std
-_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche
-_righeDataGridLong 30 30 Num righe datagrid long
-_righeDataGridMed 15 15 Num righe datagrid med
-_righeDataGridShort 10 10 Num righe datagrid short
-_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com
-_useAIMSmtp false false impiego client posta elettronica alternativo
-_useAuthSmtp true true true
-AuthCookieName admodellingAuth admodellingAuth Cookie applicativo
-autoConfCmd true true Conferma automatica comandi barcode
-baseUrl http://site_name http://iis02/site_name URL base del sito
-cacheValSec 60 60 Validità cache dati in gestore Barcode
-cookieDayExp 365 365 Periodo validità cookie
-cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati
-enableCookie true true Abilitazione uso cookie
-enableLogOut true false Abilita button logout COMPLETO in alto a sx
-enablePlain true true Abilitazione decode plain
-maxAuth 1000 1000 num auth minimo per NON consumare tokens
-serializeSession true true Serializzazione valori in sessione (REDIS)
-SiteName iis02/site_name iis02/site_name Nome sito
-enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default
-doShrinkFolder true true Imposta compressione area LOGS
\ No newline at end of file
diff --git a/MP-MAG/Controllers/PrintQueueConfController.cs b/MP-MAG/Controllers/PrintQueueConfController.cs
index bf059a9..40f924c 100644
--- a/MP-MAG/Controllers/PrintQueueConfController.cs
+++ b/MP-MAG/Controllers/PrintQueueConfController.cs
@@ -1,12 +1,5 @@
-using Newtonsoft.Json;
-using SteamWare;
-using System;
+using SteamWare.Reports;
using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web;
using System.Web.Http;
namespace MP_API.Controllers
diff --git a/MP-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs
index ed025f4..3db9f5c 100644
--- a/MP-MAG/Controllers/PrintQueueController.cs
+++ b/MP-MAG/Controllers/PrintQueueController.cs
@@ -1,6 +1,7 @@
using MagData;
using Newtonsoft.Json;
-using SteamWare;
+using SteamWare.IO;
+using SteamWare.Reports;
using System;
using System.Collections.Generic;
using System.Data;
@@ -47,11 +48,11 @@ namespace MP_API.Controllers
switch (tipoReport)
{
case reportRichiesto.CartellinoPedane:
- tab = (DataTable)MagDataLayer.man.taCPed.GetData(keyParam);
+ tab = MagDataLayer.man.taCPed.GetData(keyParam);
answ.Add("stp_prt_PartLabel", tab);
break;
case reportRichiesto.CartellinoFinitiOdette:
- tab = (DataTable)MagDataLayer.man.taCFOdette.GetData(keyParam);
+ tab = MagDataLayer.man.taCFOdette.GetData(keyParam);
answ.Add("stp_prt_StackLabel", tab);
break;
default:
diff --git a/MP-MAG/Controllers/ReportController.cs b/MP-MAG/Controllers/ReportController.cs
index 81066fb..f42af29 100644
--- a/MP-MAG/Controllers/ReportController.cs
+++ b/MP-MAG/Controllers/ReportController.cs
@@ -1,4 +1,5 @@
-using SteamWare;
+using SteamWare.IO;
+using SteamWare.Logger;
using System;
using System.IO;
using System.Web;
@@ -42,7 +43,7 @@ namespace MP_API.Controllers
}
catch (Exception exc)
{
- logger.lg.scriviLog($"Errore in get elenco reports{Environment.NewLine}{exc}");
+ Logging.Instance.Error($"Errore in get elenco reports{Environment.NewLine}{exc}");
}
return answ;
}
@@ -82,7 +83,7 @@ namespace MP_API.Controllers
}
catch (Exception exc)
{
- logger.lg.scriviLog($"Errore in get singolo report{Environment.NewLine}{exc}");
+ Logging.Instance.Error($"Errore in get singolo report{Environment.NewLine}{exc}");
}
return answ;
}
diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj
index 05a7438..31a71fd 100644
--- a/MP-MAG/MP-MAG.csproj
+++ b/MP-MAG/MP-MAG.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
Debug
@@ -52,12 +47,6 @@
4
-
- ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll
-
-
- ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll
-
..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll
@@ -86,12 +75,6 @@
..\packages\NLog.4.6.8\lib\net45\NLog.dll
-
- ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll
-
-
- ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll
-
..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll
@@ -104,8 +87,17 @@
..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll
-
- ..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll
+
+ ..\packages\SteamWare.IO.4.0.2002.731\lib\net462\SteamWare.IO.dll
+ True
+
+
+ ..\packages\SteamWare.Logger.4.0.2002.731\lib\net462\SteamWare.Logger.dll
+ True
+
+
+ ..\packages\SteamWare.Reports.4.0.2002.731\lib\net462\SteamWare.Reports.dll
+ True
@@ -208,11 +200,6 @@
..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll
-
-
- ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
-
-
VersGen.cs
@@ -260,7 +247,6 @@
-
@@ -314,8 +300,6 @@
-
-
@@ -451,15 +435,8 @@
-
-
-
-
-
-
-
10.0
@@ -494,14 +471,9 @@
Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.
-
-
-
-
-
diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config
index 63c5525..241bad2 100644
--- a/MP-MAG/Web.config
+++ b/MP-MAG/Web.config
@@ -14,11 +14,7 @@
-
-
-
-
-
+
@@ -307,10 +303,4 @@
-
-
-
-
-
-
diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config
index 441ace8..13d1a25 100644
--- a/MP-MAG/packages.config
+++ b/MP-MAG/packages.config
@@ -1,7 +1,5 @@
-
-
@@ -23,13 +21,8 @@
-
-
-
-
-
@@ -39,14 +32,15 @@
-
-
+
+
+
diff --git a/MagData/App_Readme/README_SteamWare.txt b/MagData/App_Readme/README_SteamWare.txt
new file mode 100644
index 0000000..bf60ed1
--- /dev/null
+++ b/MagData/App_Readme/README_SteamWare.txt
@@ -0,0 +1,12 @@
+---------------------------------------------------------------
+------- SteamWareLib SDK -------
+---------------------------------------------------------------
+
+Libreria di utility base di SteamWare.
+
+Le dipendenze inserite sono necessarie al funzionamento dell'SDK.
+
+Sono inclusi a titolo di esempio vari files di conf:
+ * example-NLog.config
+
+Attenzione a configurare correttamente il file NLog.xml includendo il rule per la classe, vedere ad esempio il file example-NLog.config allegato.
\ No newline at end of file
diff --git a/MagData/App_Readme/SteamWare_demo/example-favicon.ico b/MagData/App_Readme/SteamWare_demo/example-favicon.ico
new file mode 100644
index 0000000..4f0e0ad
Binary files /dev/null and b/MagData/App_Readme/SteamWare_demo/example-favicon.ico differ