Compare commits

..

2 Commits

Author SHA1 Message Date
Samuele Locatelli 9f6a74a63d Merge branch 'develop' into SDK 2025-09-10 18:47:39 +02:00
Samuele Locatelli 1fa27f72ba Merge branch 'develop' into SDK 2025-08-05 16:25:17 +02:00
28 changed files with 305 additions and 440 deletions
+6 -6
View File
@@ -125,11 +125,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -538,6 +538,8 @@
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.esm.min.js.map" />
@@ -560,8 +562,6 @@
<Content Include="Content\bootstrap-grid.rtl.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.slim.js" />
@@ -34,11 +34,6 @@
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPezzi","{0:N0}") %>' CssClass="fontMedio" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
<ItemTemplate>
<asp:Label ID="lblPzPallet" runat="server" Text='<%# Eval("PzPallet","{0:N0}") %>' CssClass="fontMedio" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="TC Attrezzato" SortExpression="TCRichAttr">
<ItemTemplate>
<div class='<%# "font-weight-bold fontMedio " + cssFromTempi(Eval("TCAssegnato"), Eval("TCRichAttr")) %>'>
+21 -23
View File
@@ -1,43 +1,41 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_ADM.WebUserControls
{
public partial class mod_approvazioneODL
{
namespace MP_ADM.WebUserControls {
public partial class mod_approvazioneODL {
/// <summary>
/// grView control.
/// Controllo grView.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// odsTempi control.
/// Controllo odsTempi.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsTempi;
/// <summary>
/// txtPageSize control.
/// Controllo txtPageSize.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
}
+2 -2
View File
@@ -46,8 +46,8 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
+1 -3
View File
@@ -5,11 +5,9 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Web.Mvc;
using MP_IO.Interfaces;
namespace MP_IO.Controllers
{
public class BENCHController : Controller, IBENCHService
public class BENCHController : Controller
{
/// <summary>
/// Oggetto datalayer specifico
+1 -3
View File
@@ -4,11 +4,9 @@ using System.Linq;
using System.Web;
using System.Web.Mvc;
using MP_IO.Interfaces;
namespace MP_IO.Controllers
{
public class HomeController : Controller, IHomeService
public class HomeController : Controller
{
#region Public Methods
+12 -31
View File
@@ -13,7 +13,7 @@ using System.Web.Mvc;
namespace MP_IO.Controllers
{
public class IOBController : Controller, IIOBService
public class IOBController : Controller
{
#region Public Methods
@@ -207,12 +207,9 @@ namespace MP_IO.Controllers
{
try
{
#if false
DataLayer DataLayerObj = new DataLayer();
// salvo risposta!
answ = DataLayerObj.insEnab(id) ? "OK" : "NO";
#endif
answ = DataLayerMan.insEnab(id) ? "OK" : "NO";
answ = DataLayerObj.insEnab(id) ? "OK" : "NO";
// 2025.03.04 aggiunto keepalive x evitare C101
MapoDb.MapoDb connDb = new MapoDb.MapoDb();
connDb.scriviKeepAlive(id, DateTime.Now);
@@ -226,9 +223,6 @@ namespace MP_IO.Controllers
return answ;
}
protected static DataLayer DataLayerMan = new DataLayer();
/// <summary>
/// Processa una chiamata POST per l'invio di un array Json di oggetti input (EVENTI)
/// POST: IOB/evListJson/SIMUL_03
@@ -2730,7 +2724,6 @@ namespace MP_IO.Controllers
answ = "NO";
}
// leggo parametri correnti...
DateTime adesso= DateTime.Now;
try
{
List<objItem> currParams = DataLayerObj.getCurrObjItems(id);
@@ -2746,25 +2739,15 @@ namespace MP_IO.Controllers
{
// aggiorno valore e data
trovato.value = item.valore;
trovato.lastRead = adesso;
trovato.lastMessage = item.valore;
// se fosse un valore WRITE
if (trovato.writable)
trovato.lastRead = DateTime.Now;
// se fosse un valore WRITE e mi ha dato un valore vuoto --> mando
// un fix x riscrittura
if (trovato.writable && string.IsNullOrEmpty(item.valore))
{
// ...e mi ha dato un valore vuoto --> mando un fix x riscrittura
if (string.IsNullOrEmpty(item.valore))
{
logger.lg.scriviLog($"flogJson | verifica parametri | {trovato.uid} | reqVal: {trovato.reqValue}");
taskType currTask = (taskType)Enum.Parse(typeof(taskType), trovato.uid);
DataLayerObj.addCheckTask4Machine(id, currTask, item.valore);
}
logger.lg.scriviLog($"flogJson | verifica parametri | {trovato.uid} | reqVal: {trovato.reqValue}");
taskType currTask = (taskType)Enum.Parse(typeof(taskType), trovato.uid);
DataLayerObj.addCheckTask4Machine(id, currTask, item.valore);
}
else
{
// richiesto 10 sec prima...
trovato.lastRequest= adesso.AddSeconds(-10);
}
}
// altrimenti AGGIUNGO (READ ONLY)...
else
@@ -2774,8 +2757,7 @@ namespace MP_IO.Controllers
uid = item.flux,
name = item.flux,
value = item.valore,
lastRead = adesso,
lastRequest = adesso.AddSeconds(-10),
lastRead = DateTime.Now,
writable = false
};
}
@@ -2784,11 +2766,10 @@ namespace MP_IO.Controllers
}
// faccio upsert innovations!
DataLayerObj.upsertCurrObjItems(id, innovazioni);
logger.lg.scriviLog($"processFLogJson | {id} | Updated {innovazioni.Count} par");
}
catch (Exception exc)
{
logger.lg.scriviLog($"Errore in fase salvataggio innovazioni parametri correnti da flogJson{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
logger.lg.scriviLog($"Errore in fase salvataggio innovazioni parametri correnti da flogJson{Environment.NewLine}{exc}");
answ = "NO";
}
}
@@ -2798,4 +2779,4 @@ namespace MP_IO.Controllers
#endregion Private Methods
}
}
}
-50
View File
@@ -1,50 +0,0 @@
namespace MP_IO.Interfaces
{
public interface IBENCHService
{
/// <summary>
/// GET: IOB (è un check alive)
/// </summary>
string Index();
/// <summary>
/// GET BENCH/RCLEAN/100
/// </summary>
string RCLEAN(int? id);
/// <summary>
/// GET BENCH/RSETUP/100
/// </summary>
string RSETUP(int? id);
/// <summary>
/// GET BENCH/RSH/100
/// </summary>
string RSH(int? id);
/// <summary>
/// GET BENCH/DTMAC/SIMUL_01
/// </summary>
string DTMAC(string id);
/// <summary>
/// GET BENCH/CNTKEY/test
/// </summary>
string CNTKEY(string id);
/// <summary>
/// GET BENCH/tSMI/60
/// </summary>
string tSMI(int? id);
/// <summary>
/// GET BENCH/fSMI/18?idxMS=1&valore=1
/// </summary>
string fSMI(int? id, int? idxMS, int? valore);
/// <summary>
/// GET BENCH/INSEN/2004
/// </summary>
string INSEN(string id);
}
}
-10
View File
@@ -1,10 +0,0 @@
namespace MP_IO.Interfaces
{
public interface IHomeService
{
/// <summary>
/// GET: Home
/// </summary>
string Index();
}
}
-51
View File
@@ -1,51 +0,0 @@
namespace MP_IO.Interfaces
{
public interface IIOBService
{
string addOptPar(string id, string pName, string pValue);
string addTask2Exe(string id, string taskName, string taskVal);
bool askCloseODL(string id, int idxOdl);
bool closeODL(string id, int idxOdl, string dtEve = "", string dtCurr = "");
bool closePODL(string id, int idxPOdl, string dtEve = "", string dtCurr = "");
string enabled(string id);
string evListJson(string id);
string fixDailyDossier(string id);
string fixDailyOdl(string id);
string fixDailyOdlConfPzCount(string id);
string flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt, string disabKA = "false");
string flogJson(string id, string disabKA = "false");
int forceCreatePOdl(string id, string CodArt, string CodGruppo, int numPz);
string forceSplitOdl(string id);
string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int? roundStep, string keyRichiesta = "", int matrOpr = 0);
string forceStartPOdl(string id, int idxPODL, string dtEve = "", string dtCurr = "", int matrOpr = 0);
string getArtCurrPODL();
string getArtNum(string id, string CodArt = "");
string getArtUsed();
string getCounter(string id);
string getCounterTCRec(string id);
string getCurrData(string id);
string getCurrODL(string id);
int getCurrOdlQtaReq(string id);
string getCurrOdlRow(string id);
string getCurrOdlStart(string id);
string getCurrPODL(string id);
string getCurrStatoRow(string id);
string getFiles(string id);
int getIdlePeriod(string id);
string getIob2call(string GWIP);
string getLastArtByMacc(string id);
string getLastDossArt(string id);
string getLastDossByMacc(string id);
string getLastDossPODL();
string getListValByTable(string id);
string getM2IOB(string id);
string getObjItems(string id);
string getObjItems2Write(string id);
string getOptPar(string id);
string getPOdlNext(string id);
string getTask2Exe(string id);
bool insDisab(string id, bool stato);
string processInput(string id, int valore, string dtEve, string dtCurr, string cnt);
string setProg(string id, string prog, string art, string comm, string disabKA = "false");
}
}
+4 -4
View File
@@ -124,11 +124,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+3 -1
View File
@@ -51,7 +51,9 @@
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
</connectionStrings>
<system.web>
<customErrors mode="Off" />
+2 -2
View File
@@ -45,8 +45,8 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
+8 -8
View File
@@ -131,14 +131,14 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Reports, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Reports.5.4.2509.1715\lib\net462\SteamWare.Reports.dll</HintPath>
<Reference Include="SteamWare.Reports, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Reports.5.3.2311.2908\lib\net462\SteamWare.Reports.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -881,6 +881,8 @@
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
<Content Include="Areas\HelpPage\Views\Web.config" />
<Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" />
@@ -923,8 +925,6 @@
<Content Include="Content\bootstrap-grid.rtl.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Scripts\jquery-3.7.1.intellisense.js" />
<Content Include="Scripts\jquery-3.7.1.js" />
<Content Include="Scripts\jquery-3.7.1.min.js" />
+3 -3
View File
@@ -55,9 +55,9 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Reports" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Reports" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
+6 -6
View File
@@ -121,11 +121,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -376,6 +376,8 @@
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.esm.min.js.map" />
@@ -398,8 +400,6 @@
<Content Include="Content\bootstrap-grid.rtl.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
+3 -1
View File
@@ -43,7 +43,9 @@
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
</connectionStrings>
<system.web>
<httpHandlers>
+2 -2
View File
@@ -44,8 +44,8 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
+6 -6
View File
@@ -158,11 +158,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -341,6 +341,8 @@
<Content Include="Content\bootstrap\mixins\_nav-divider.scss" />
<Content Include="Content\bootstrap\mixins\_hover.scss" />
<Content Include="Content\bootstrap\mixins\_grid-framework.scss" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Content\bootstrap.rtl.min.css.map" />
<Content Include="Content\bootstrap.rtl.css.map" />
<Content Include="Content\bootstrap.min.css.map" />
@@ -357,8 +359,6 @@
<Content Include="Content\bootstrap-grid.rtl.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Content\typeahead.less" />
<Content Include="Content\typeahead.css">
<DependentUpon>typeahead.less</DependentUpon>
+3 -1
View File
@@ -75,7 +75,9 @@
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+2 -2
View File
@@ -36,8 +36,8 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
+6 -6
View File
@@ -97,14 +97,14 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare.IO, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.IO.5.4.2509.1715\lib\net462\SteamWare.IO.dll</HintPath>
<Reference Include="SteamWare.IO, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.IO.5.3.2311.2908\lib\net462\SteamWare.IO.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Reports, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Reports.5.4.2509.1715\lib\net462\SteamWare.Reports.dll</HintPath>
<Reference Include="SteamWare.Reports, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Reports.5.3.2311.2908\lib\net462\SteamWare.Reports.dll</HintPath>
</Reference>
<Reference Include="System">
<HintPath>..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll</HintPath>
+3 -3
View File
@@ -19,9 +19,9 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare.IO" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Reports" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.IO" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Reports" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
+180 -195
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -136,11 +136,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+23 -8
View File
@@ -5,14 +5,29 @@
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<connectionStrings>
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa; password=keyhammer16; MultipleActiveResultSets=True; App=EntityFramework; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa; password=keyhammer16; MultipleActiveResultSets=True; App=EntityFramework; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+2 -2
View File
@@ -24,8 +24,8 @@
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
+2 -2
View File
@@ -389,12 +389,12 @@ namespace MapoSDK
/// <summary>
/// DataOra ultima lettura
/// </summary>
public DateTime lastRead { get; set; } = DateTime.Now.AddMinutes(-5);
public DateTime lastRead { get; set; } = DateTime.Now.AddHours(-1);
/// <summary>
/// DataOra ultima richiesta scrittura
/// </summary>
public DateTime lastRequest { get; set; } = DateTime.Now.AddMinutes(-5);
public DateTime lastRequest { get; set; } = DateTime.Now.AddDays(-1);
/// <summary>
/// NOME item