Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into Giancarlo

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-12 12:13:39 +02:00
parent e9c5ca99ce 1c724a840b
commit 9609d9760e
43 changed files with 695 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1300']) {
withEnv(['NEXT_BUILD_NUMBER=1306']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-ADM/App_Start/MP_Startup.cs
+3 -3
View File
@@ -7,16 +7,16 @@ namespace MP_ADM
{
public static void Init()
{
logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP);
SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()");
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP);
SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf");
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}");
}
}
}
MP-ADM/MP-ADM.csproj
+7 -14
View File
@@ -119,8 +119,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\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>
@@ -464,8 +467,6 @@
<Content Include="Scripts\esm\popper.js.map" />
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<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.bundle.min.js.map" />
@@ -476,6 +477,8 @@
<Content Include="Content\bootstrap-reboot.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" />
@@ -854,7 +857,6 @@
</Compile>
<Compile Include="WebUserControls\cmp_numRow.ascx.cs">
<DependentUpon>cmp_numRow.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_numRow.ascx.designer.cs">
<DependentUpon>cmp_numRow.ascx</DependentUpon>
@@ -868,7 +870,6 @@
</Compile>
<Compile Include="WebUserControls\mod_aperturaImpianti.ascx.cs">
<DependentUpon>mod_aperturaImpianti.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_aperturaImpianti.ascx.designer.cs">
<DependentUpon>mod_aperturaImpianti.ascx</DependentUpon>
@@ -896,7 +897,6 @@
</Compile>
<Compile Include="WebUserControls\mod_calChiusura.ascx.cs">
<DependentUpon>mod_calChiusura.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_calChiusura.ascx.designer.cs">
<DependentUpon>mod_calChiusura.ascx</DependentUpon>
@@ -952,14 +952,12 @@
</Compile>
<Compile Include="WebUserControls\mod_login.ascx.cs">
<DependentUpon>mod_login.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_login.ascx.designer.cs">
<DependentUpon>mod_login.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_main_help.ascx.cs">
<DependentUpon>mod_main_help.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_main_help.ascx.designer.cs">
<DependentUpon>mod_main_help.ascx</DependentUpon>
@@ -973,7 +971,6 @@
</Compile>
<Compile Include="WebUserControls\mod_menuSx.ascx.cs">
<DependentUpon>mod_menuSx.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_menuSx.ascx.designer.cs">
<DependentUpon>mod_menuSx.ascx</DependentUpon>
@@ -1008,28 +1005,24 @@
</Compile>
<Compile Include="WebUserControls\mod_pageTitleAndSearch.ascx.cs">
<DependentUpon>mod_pageTitleAndSearch.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_pageTitleAndSearch.ascx.designer.cs">
<DependentUpon>mod_pageTitleAndSearch.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_planCreate.ascx.cs">
<DependentUpon>mod_planCreate.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_planCreate.ascx.designer.cs">
<DependentUpon>mod_planCreate.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_planStats.ascx.cs">
<DependentUpon>mod_planStats.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_planStats.ascx.designer.cs">
<DependentUpon>mod_planStats.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_ricercaGenerica.ascx.cs">
<DependentUpon>mod_ricercaGenerica.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_ricercaGenerica.ascx.designer.cs">
<DependentUpon>mod_ricercaGenerica.ascx</DependentUpon>
MP-ADM/Web.config
+4
View File
@@ -115,6 +115,10 @@
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
MP-ADM/packages.config
+2 -1
View File
@@ -42,7 +42,8 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-IO/App_Start/MP_Startup.cs
+15 -15
View File
@@ -3,21 +3,21 @@ using System;
namespace MP_IO
{
public class MP_Startup
{
public static void Init()
public class MP_Startup
{
logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP);
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP);
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
public static void Init()
{
SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()");
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf");
}
catch (Exception exc)
{
SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}");
}
}
}
}
}
MP-IO/MP-IO.csproj
+7 -4
View File
@@ -116,8 +116,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\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>
@@ -360,11 +363,11 @@
<Content Include="logs\.PlaceHolder.file" />
<Content Include="packages.config" />
<Content Include="fileUpload\.PlaceHolder.file" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
MP-IO/Web.config
+4
View File
@@ -113,6 +113,10 @@
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
MP-IO/packages.config
+2 -1
View File
@@ -42,7 +42,8 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-LAND/App_Start/MP_Startup.cs
+15 -15
View File
@@ -3,21 +3,21 @@ using System;
namespace MP
{
public class MP_Startup
{
public static void Init()
public class MP_Startup
{
logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP);
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP);
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
public static void Init()
{
SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()");
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf");
}
catch (Exception exc)
{
SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}");
}
}
}
}
}
MP-LAND/MP-LAND.csproj
+9 -6
View File
@@ -117,8 +117,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\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">
@@ -233,11 +236,11 @@
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="zxing, Version=0.16.5.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.5\lib\net461\zxing.dll</HintPath>
<Reference Include="zxing, Version=0.16.6.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.6\lib\net461\zxing.dll</HintPath>
</Reference>
<Reference Include="zxing.presentation, Version=0.16.5.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.5\lib\net461\zxing.presentation.dll</HintPath>
<Reference Include="zxing.presentation, Version=0.16.6.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.6\lib\net461\zxing.presentation.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
MP-LAND/Web.OVH-Demo.config
+9 -10
View File
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="Environment" value="Steamware DEMO" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
</appSettings>
<connectionStrings>
<add name="MPModel" connectionString="data source=localhost\sql2012;initial catalog=MoonPro_DemoWeb;persist security info=True;user id=sa;password=keyhammer16;MultipleActiveResultSets=True;App=EntityFramework" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MapoModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=localhost\sql2012;initial catalog=MoonPro_DemoWeb;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
</connectionStrings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
</system.web>
<appSettings>
<add key="Environment" value="Steamware DEMO" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
</appSettings>
<connectionStrings>
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MapoModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=localhost\sql2012;initial catalog=MoonPro_DemoWeb;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
</connectionStrings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
</system.web>
</configuration>
MP-LAND/Web.Prod.config
+1 -2
View File
@@ -2,7 +2,7 @@
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="appVers" value="stable" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="appVers" value="stable" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="Environment" value="PROD" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="baseAuthUrl" value="http://192.168.51.77/MP/TAB/jumper?" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_smtpCli" value="192.168.48.1" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
@@ -11,7 +11,6 @@
<add key="_enableSSL" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
</appSettings>
<connectionStrings>
<add name="MPModel" connectionString="data source=localhost\sqlexpress;initial catalog=MoonPro;persist security info=True;user id=steamware;password=viadante16;MultipleActiveResultSets=True;App=EntityFramework" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=localhost\sqlexpress;initial catalog=MoonPro;persist security info=True;user id=steamware;password=viadante16;multipleactiveresultsets=True;application name=EntityFramework&quot;" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
</connectionStrings>
<system.web>
MP-LAND/Web.config
+4
View File
@@ -113,6 +113,10 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
MP-LAND/packages.config
+3 -2
View File
@@ -46,7 +46,8 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
@@ -63,5 +64,5 @@
<package id="System.Threading.Channels" version="4.7.1" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="WebGrease" version="1.6.0" targetFramework="net462" />
<package id="ZXing.Net" version="0.16.5" targetFramework="net462" />
<package id="ZXing.Net" version="0.16.6" targetFramework="net462" />
</packages>
MP-MON/App_Start/MP_Startup.cs
+15 -15
View File
@@ -3,21 +3,21 @@ using System;
namespace MP_MON
{
public class MP_Startup
{
public static void Init()
public class MP_Startup
{
logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP);
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP);
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
public static void Init()
{
SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()");
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf");
}
catch (Exception exc)
{
SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}");
}
}
}
}
}
MP-MON/Content/Site.css
+26 -3
View File
@@ -17,9 +17,10 @@ body .ui-overlay-c {
/* Set padding to keep content from hitting the edges */
.body-content {
padding: 0.1em 0.2em;
margin-top: 1.6em;
}
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
*/
.dl-horizontal dt {
white-space: normal;
@@ -79,6 +80,28 @@ body .ui-overlay-c {
height: 40px;
}
}
@media all and (min-width: 2000px) {
.mainHead {
font-size: 1.6em;
}
body {
font-size: 2.4em;
}
.logoImg {
height: 60px;
}
}
@media all and (min-width: 2600px) {
.mainHead {
font-size: 1.6em;
}
body {
font-size: 3.2em;
}
.logoImg {
height: 80px;
}
}
@media all and (max-width: 425px) {
.mainHead {
font-size: 1em;
@@ -224,7 +247,7 @@ textarea {
}
.shortcuts .shortcut-label {
display: block;
margin-top: .75em;
margin-top: 0.75em;
font-weight: 400;
color: #666;
}
MP-MON/Content/Site.less
+133 -106
View File
@@ -3,170 +3,197 @@
/* Gestione blocchi base */
body {
font-family: 'Open Sans', sans-serif;
background-color: #5d5d5d;
padding: 25px 0 20px 0;
font-family: 'Open Sans', sans-serif;
background-color: #5d5d5d;
padding: 25px 0 20px 0;
}
body .ui-body-a, body .ui-body-c, body .ui-overlay-c {
body .ui-body-a, body .ui-body-c, body .ui-overlay-c {
text-shadow: 0 0 0;
}
}
.logoImg {
height: 40px;
height: 40px;
}
/* Set padding to keep content from hitting the edges */
.body-content {
padding: 0.1em 0.2em;
padding: 0.1em 0.2em;
margin-top: 1.6em;
}
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
*/
.dl-horizontal dt {
white-space: normal;
white-space: normal;
}
@media all and (min-width: 425px) {
.mainHead {
font-size: 1.3em;
}
.mainHead {
font-size: 1.3em;
}
body {
font-size: 0.8em;
}
body {
font-size: 0.8em;
}
.logoImg {
height: 30px;
}
.logoImg {
height: 30px;
}
}
@media all and (min-width: 768px) {
.mainHead {
font-size: 1.4em;
}
.mainHead {
font-size: 1.4em;
}
body {
font-size: 1em;
}
body {
font-size: 1em;
}
.logoImg {
height: 35px;
}
.logoImg {
height: 35px;
}
}
@media all and (min-width: 1024px) {
.mainHead {
font-size: 1.5em;
}
.mainHead {
font-size: 1.5em;
}
body {
font-size: 1.2em;
}
body {
font-size: 1.2em;
}
.logoImg {
height: 40px;
}
.logoImg {
height: 40px;
}
}
@media all and (min-width: 1440px) {
.mainHead {
font-size: 1.6em;
}
.mainHead {
font-size: 1.6em;
}
body {
font-size: 1.4em;
}
body {
font-size: 1.4em;
}
.logoImg {
height: 40px;
}
.logoImg {
height: 40px;
}
}
@media all and (min-width: 1600px) {
.mainHead {
font-size: 1.6em;
}
.mainHead {
font-size: 1.6em;
}
body {
font-size: 1.6em;
}
body {
font-size: 1.6em;
}
.logoImg {
height: 40px;
}
.logoImg {
height: 40px;
}
}
@media all and (min-width: 2000px) {
.mainHead {
font-size: 1.6em;
}
body {
font-size: 2.4em;
}
.logoImg {
height: 60px;
}
}
@media all and (min-width: 2600px) {
.mainHead {
font-size: 1.6em;
}
body {
font-size: 3.2em;
}
.logoImg {
height: 80px;
}
}
@media all and (max-width: 425px) {
.mainHead {
font-size: 1em;
}
.mainHead {
font-size: 1em;
}
body {
font-size: 0.7em;
}
body {
font-size: 0.7em;
}
.logoImg {
height: 25px;
}
.logoImg {
height: 25px;
}
}
/* Set width on the form input elements since they're 100% wide by default */
input,
select,
textarea {
max-width: 280px;
max-width: 280px;
}
.deleted {
text-decoration: line-through;
text-decoration: line-through;
}
.padZL {
padding-left: 0.2em;
padding-left: 0.2em;
}
.padZR {
padding-right: 0.2em;
padding-right: 0.2em;
}
.padZRL {
.padZL;
.padZR;
.padZL;
.padZR;
}
.colAlt {
color: #C93;
color: #C93;
}
.fontSmall {
font-size: 0.66em;
font-size: 0.66em;
}
.fontSmaller {
font-size: 0.5em;
font-size: 0.5em;
}
.fontBig {
font-size: 2em;
font-size: 2em;
}
.tNote {
color: #8a8a8a;
font-style: italic;
color: #8a8a8a;
font-style: italic;
}
.tNoWrap {
white-space: nowrap;
white-space: nowrap;
}
.navbar {
min-height: 0;
/*z-index: 0; // commentare quando in prod?!?*/
color: #696969;
background-color: #000;
min-height: 0;
/*z-index: 0; // commentare quando in prod?!?*/
color: #696969;
background-color: #000;
}
/*------------------------------------------------------------------
@@ -176,10 +203,10 @@ textarea {
@blSCut: 20px;
.shortcuts {
text-align: center;
text-align: center;
}
.shortcuts .shortcut {
.shortcuts .shortcut {
min-width: @blSCut * 9;
min-height: @blSCut * 5;
display: inline-block;
@@ -197,9 +224,9 @@ textarea {
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: @blSCut/2;
}
}
.shortcuts .shortcut-sm {
.shortcuts .shortcut-sm {
min-width: @blSCut * 4.5;
min-height: @blSCut * 3;
display: inline-block;
@@ -217,25 +244,25 @@ textarea {
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: @blSCut/2;
}
}
.shortcuts .shortcut .shortcut-icon {
.shortcuts .shortcut .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: @blSCut*2;
color: #333;
}
}
.shortcuts .shortcut-sm .shortcut-icon {
.shortcuts .shortcut-sm .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: @blSCut*2;
color: #333;
}
}
.shortcuts .shortcut:hover {
.shortcuts .shortcut:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
@@ -243,9 +270,9 @@ textarea {
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
}
}
.shortcuts .shortcut-sm:hover {
.shortcuts .shortcut-sm:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
@@ -253,27 +280,27 @@ textarea {
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
}
}
.shortcuts .shortcut:active {
.shortcuts .shortcut:active {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
}
.shortcuts .shortcut-sm:active {
.shortcuts .shortcut-sm:active {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
}
.shortcuts .shortcut:hover .shortcut-icon {
.shortcuts .shortcut:hover .shortcut-icon {
color: #C93;
}
}
.shortcuts .shortcut-sm:hover .shortcut-icon {
.shortcuts .shortcut-sm:hover .shortcut-icon {
color: #666;
}
}
.shortcuts .shortcut-label {
.shortcuts .shortcut-label {
display: block;
margin-top: .75em;
font-weight: 400;
color: #666;
}
}
MP-MON/Content/Site.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:25px 0 20px 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.logoImg{height:40px;}.body-content{padding:.1em .2em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:1024px){.mainHead{font-size:1.5em;}body{font-size:1.2em;}.logoImg{height:40px;}}@media all and (min-width:1440px){.mainHead{font-size:1.6em;}body{font-size:1.4em;}.logoImg{height:40px;}}@media all and (min-width:1600px){.mainHead{font-size:1.6em;}body{font-size:1.6em;}.logoImg{height:40px;}}@media all and (max-width:425px){.mainHead{font-size:1em;}body{font-size:.7em;}.logoImg{height:25px;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}
@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:25px 0 20px 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.logoImg{height:40px;}.body-content{padding:.1em .2em;margin-top:1.6em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:1024px){.mainHead{font-size:1.5em;}body{font-size:1.2em;}.logoImg{height:40px;}}@media all and (min-width:1440px){.mainHead{font-size:1.6em;}body{font-size:1.4em;}.logoImg{height:40px;}}@media all and (min-width:1600px){.mainHead{font-size:1.6em;}body{font-size:1.6em;}.logoImg{height:40px;}}@media all and (min-width:2000px){.mainHead{font-size:1.6em;}body{font-size:2.4em;}.logoImg{height:60px;}}@media all and (min-width:2600px){.mainHead{font-size:1.6em;}body{font-size:3.2em;}.logoImg{height:80px;}}@media all and (max-width:425px){.mainHead{font-size:1em;}body{font-size:.7em;}.logoImg{height:25px;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}
MP-MON/MP-MON.csproj
+9 -6
View File
@@ -117,8 +117,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\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">
@@ -340,10 +343,6 @@
<Content Include="Global.asax" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="compilerconfig.json" />
<None Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
</None>
<Content Include="Content\fonts.less" />
<Content Include="Content\OpenSans.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -360,6 +359,10 @@
<Content Include="Content\bootstrap-reboot.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<None Include="compilerconfig.json" />
<None Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
</None>
<None Include="Content\Site.less" />
<EntityDeploy Include="Models\MapoModel.edmx">
<Generator>EntityModelCodeGenerator</Generator>
MP-MON/Views/Shared/_Layout.cshtml
+62 -64
View File
@@ -1,76 +1,75 @@
<!DOCTYPE html>
<html lang="it-it">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>MP-MON</title>
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
@Scripts.Render("~/bundles/jquery")
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>MP-MON</title>
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
@Scripts.Render("~/bundles/jquery")
</head>
<body>
<nav class="navbar fixed-top navbar-expand-sm px-2 py-0 m-0">
<a href="@Url.Action("", "Home")" class="navbar-brand m-0 pr-4" style="vertical-align: bottom; text-align: left; font-size: 1em;">
<img class="logoImg" src="~/images/logoMapo.png" style="margin-top: -10px;" />
</a>
<button class="navbar-toggler navbar-dark" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo01" aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarTogglerDemo01">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<span class="mainHead"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
</li>
</ul>
<div class="px-2">
<div id="divClock text-right">
@{Html.RenderPartial("_mmClock");}
<nav class="navbar fixed-top navbar-expand-sm px-2 py-0 m-0 mb-1 mb-xl-5">
<a href="@Url.Action("", "Home")" class="navbar-brand m-0 pr-4" style="vertical-align: bottom; text-align: left; font-size: 1em;">
<img class="logoImg" src="~/images/logoMapo.png" style="margin-top: -10px;" />
</a>
<button class="navbar-toggler navbar-dark" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo01" aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarTogglerDemo01">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<span class="mainHead"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
</li>
</ul>
<div class="px-2">
<div id="divClock text-right">
@{Html.RenderPartial("_mmClock");}
</div>
<div class="fontSmall text-right">
@Request.UserHostAddress | v: @typeof(MP_MON.MvcApplication).Assembly.GetName().Version
</div>
</div>
</div>
<div class="fontSmall text-right">
@Request.UserHostAddress | v: @typeof(MP_MON.MvcApplication).Assembly.GetName().Version
</div>
</div>
</nav>
<div class="container-fluid body-content">
@RenderBody()
@{
// recupero variabile ambiente...
ViewBag.envir = System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"];
string cssFixFooter = "";
}
@if (ViewBag.envir != "Dev")
{
cssFixFooter = "fixed-bottom";
}
<footer class="navbar p-0 m-0 @cssFixFooter">
@Html.Partial("_footer")
</footer>
</div>
</nav>
<div class="container-fluid body-content mt-2 mt-lg-3 mt-xl-4">
@RenderBody()
@Scripts.Render("~/bundles/bootstrap")
<!-- Code to wire up your DatePicker -->
<script type="text/javascript">
// fix datekeeper
if (!Modernizr.inputtypes.date) {
$('input[type=date]').datepicker({
// Consistent format with the HTML5 picker
dateFormat: 'yy-mm-dd'
});
}
</script>
@{
// recupero variabile ambiente...
ViewBag.envir = System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"];
string cssFixFooter = "";
}
@if (ViewBag.envir != "Dev")
{
cssFixFooter = "fixed-bottom";
}
@*@Scripts.Render("~/bundles/jqbootgrid")*@
<footer class="navbar p-0 m-0 @cssFixFooter">
@Html.Partial("_footer")
</footer>
</div>
@Scripts.Render("~/bundles/jqueryval")
@Scripts.Render("~/bundles/bootstrap")
<!-- Code to wire up your DatePicker -->
<script type="text/javascript">
// fix datekeeper
if (!Modernizr.inputtypes.date) {
$('input[type=date]').datepicker({
// Consistent format with the HTML5 picker
dateFormat: 'yy-mm-dd'
});
}
</script>
@RenderSection("scripts", required: false)
@*@Scripts.Render("~/bundles/jqbootgrid")*@
@Scripts.Render("~/bundles/jqueryval")
@RenderSection("scripts", required: false)
<script type="text/javascript">
<script type="text/javascript">
function reloadDT() {
$("#divClock").load('@(Url.Action("GetClock", "Home", null, Request.Url.Scheme))');
@@ -79,7 +78,6 @@
// ciclo reload infinito ogni 10 secondi x aggiornare clock...
myTimer = setInterval(reloadDT, 10000);
});
</script>
</script>
</body>
</html>
</html>
MP-MON/Web.config
+4
View File
@@ -101,6 +101,10 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
MP-MON/compilerconfig.json
+4 -4
View File
@@ -1,14 +1,14 @@
[
{
"outputFile": "Content/Site.css",
"inputFile": "Content/Site.less"
"outputFile": "Content/baseStyle.css",
"inputFile": "Content/baseStyle.less"
},
{
"outputFile": "Content/fonts.css",
"inputFile": "Content/fonts.less"
},
{
"outputFile": "Content/baseStyle.css",
"inputFile": "Content/baseStyle.less"
"outputFile": "Content/Site.css",
"inputFile": "Content/Site.less"
}
]
MP-MON/compilerconfig.json.defaults
+14
View File
@@ -13,6 +13,7 @@
"sourceMap": false
},
"sass": {
"autoPrefix": "",
"includePath": "",
"indentType": "space",
"indentWidth": 2,
@@ -20,6 +21,7 @@
"Precision": 5,
"relativeUrls": true,
"sourceMapRoot": "",
"lineFeed": "",
"sourceMap": false
},
"stylus": {
@@ -32,6 +34,18 @@
"bare": false,
"runtimeMode": "node",
"sourceMap": false
},
"handlebars": {
"root": "",
"noBOM": false,
"name": "",
"namespace": "",
"knownHelpersOnly": false,
"forcePartial": false,
"knownHelpers": [],
"commonjs": "",
"amd": false,
"sourceMap": false
}
},
"minifiers": {
MP-MON/packages.config
+2 -1
View File
@@ -37,7 +37,8 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-Site/App_Start/MP_Startup.cs
+3 -3
View File
@@ -7,16 +7,16 @@ namespace MP_SITE
{
public static void Init()
{
logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP);
SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()");
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP);
SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf");
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}");
}
}
}
MP-Site/MP-Site.csproj
+7 -5
View File
@@ -121,8 +121,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\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>
@@ -335,8 +338,6 @@
<Content Include="Scripts\esm\popper.js.map" />
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<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.bundle.min.js.map" />
@@ -347,6 +348,8 @@
<Content Include="Content\bootstrap-reboot.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" />
@@ -577,7 +580,6 @@
</Compile>
<Compile Include="erroreComunicazione.aspx.cs">
<DependentUpon>erroreComunicazione.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="erroreComunicazione.aspx.designer.cs">
<DependentUpon>erroreComunicazione.aspx</DependentUpon>
MP-Site/Web.config
+4
View File
@@ -123,6 +123,10 @@
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
MP-Site/packages.config
+2 -1
View File
@@ -45,7 +45,8 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-TAB/App_Start/MP_Startup.cs
+15 -15
View File
@@ -3,21 +3,21 @@ using System;
namespace MoonProTablet
{
public class MP_Startup
{
public static void Init()
public class MP_Startup
{
logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP);
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP);
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
public static void Init()
{
SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()");
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf");
}
catch (Exception exc)
{
SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}");
}
}
}
}
}
MP-TAB/MP-TAB.csproj
+13 -35
View File
@@ -21,9 +21,11 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<IISExpressSSLPort>44328</IISExpressSSLPort>
<IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressSSLPort>44384</IISExpressSSLPort>
<IISExpressAnonymousAuthentication>
</IISExpressAnonymousAuthentication>
<IISExpressWindowsAuthentication>
</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
@@ -176,8 +178,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\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>
@@ -339,8 +344,6 @@
<Content Include="Content\themes\base\tabs.css" />
<Content Include="Content\themes\base\theme.css" />
<Content Include="Content\themes\base\tooltip.css" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Content\bootstrap.min.css.map" />
<Content Include="Content\bootstrap.css.map" />
<Content Include="Content\bootstrap-reboot.min.css.map" />
@@ -437,6 +440,8 @@
<Content Include="Content\bootstrap\bootstrap.scss" />
<Content Include="Content\bootstrap\bootstrap-reboot.scss" />
<Content Include="Content\bootstrap\bootstrap-grid.scss" />
<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>
@@ -744,7 +749,6 @@
</Compile>
<Compile Include="About.aspx.cs">
<DependentUpon>About.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="About.aspx.designer.cs">
<DependentUpon>About.aspx</DependentUpon>
@@ -752,19 +756,15 @@
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\MP_Startup.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="BasePage.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BasePage.cs" />
<Compile Include="Commenti.aspx.cs">
<DependentUpon>Commenti.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Commenti.aspx.designer.cs">
<DependentUpon>Commenti.aspx</DependentUpon>
</Compile>
<Compile Include="Controlli.aspx.cs">
<DependentUpon>Controlli.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Controlli.aspx.designer.cs">
<DependentUpon>Controlli.aspx</DependentUpon>
@@ -778,7 +778,6 @@
</Compile>
<Compile Include="DettaglioMacchina.aspx.cs">
<DependentUpon>DettaglioMacchina.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DettaglioMacchina.aspx.designer.cs">
<DependentUpon>DettaglioMacchina.aspx</DependentUpon>
@@ -792,7 +791,6 @@
</Compile>
<Compile Include="fixODL.aspx.cs">
<DependentUpon>fixODL.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="fixODL.aspx.designer.cs">
<DependentUpon>fixODL.aspx</DependentUpon>
@@ -802,14 +800,12 @@
</Compile>
<Compile Include="HwSwInfo.aspx.cs">
<DependentUpon>HwSwInfo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HwSwInfo.aspx.designer.cs">
<DependentUpon>HwSwInfo.aspx</DependentUpon>
</Compile>
<Compile Include="IOB-info.aspx.cs">
<DependentUpon>IOB-info.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="IOB-info.aspx.designer.cs">
<DependentUpon>IOB-info.aspx</DependentUpon>
@@ -823,28 +819,24 @@
</Compile>
<Compile Include="Logout.aspx.cs">
<DependentUpon>Logout.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Logout.aspx.designer.cs">
<DependentUpon>Logout.aspx</DependentUpon>
</Compile>
<Compile Include="MappaStato.aspx.cs">
<DependentUpon>MappaStato.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="MappaStato.aspx.designer.cs">
<DependentUpon>MappaStato.aspx</DependentUpon>
</Compile>
<Compile Include="ODL.aspx.cs">
<DependentUpon>ODL.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ODL.aspx.designer.cs">
<DependentUpon>ODL.aspx</DependentUpon>
</Compile>
<Compile Include="PianoProd.aspx.cs">
<DependentUpon>PianoProd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PianoProd.aspx.designer.cs">
<DependentUpon>PianoProd.aspx</DependentUpon>
@@ -852,91 +844,78 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="regNewDevice.aspx.cs">
<DependentUpon>regNewDevice.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="regNewDevice.aspx.designer.cs">
<DependentUpon>regNewDevice.aspx</DependentUpon>
</Compile>
<Compile Include="RepProd_GG.aspx.cs">
<DependentUpon>RepProd_GG.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="RepProd_GG.aspx.designer.cs">
<DependentUpon>RepProd_GG.aspx</DependentUpon>
</Compile>
<Compile Include="Reset.aspx.cs">
<DependentUpon>Reset.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Reset.aspx.designer.cs">
<DependentUpon>Reset.aspx</DependentUpon>
</Compile>
<Compile Include="Scarti.aspx.cs">
<DependentUpon>Scarti.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Scarti.aspx.designer.cs">
<DependentUpon>Scarti.aspx</DependentUpon>
</Compile>
<Compile Include="SendParameters.aspx.cs">
<DependentUpon>SendParameters.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SendParameters.aspx.designer.cs">
<DependentUpon>SendParameters.aspx</DependentUpon>
</Compile>
<Compile Include="StoricoTC.aspx.cs">
<DependentUpon>StoricoTC.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="StoricoTC.aspx.designer.cs">
<DependentUpon>StoricoTC.aspx</DependentUpon>
</Compile>
<Compile Include="SheetTech.aspx.cs">
<DependentUpon>SheetTech.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SheetTech.aspx.designer.cs">
<DependentUpon>SheetTech.aspx</DependentUpon>
</Compile>
<Compile Include="Test.aspx.cs">
<DependentUpon>Test.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Test.aspx.designer.cs">
<DependentUpon>Test.aspx</DependentUpon>
</Compile>
<Compile Include="tryLogin.aspx.cs">
<DependentUpon>tryLogin.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="tryLogin.aspx.designer.cs">
<DependentUpon>tryLogin.aspx</DependentUpon>
</Compile>
<Compile Include="Turni.aspx.cs">
<DependentUpon>Turni.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Turni.aspx.designer.cs">
<DependentUpon>Turni.aspx</DependentUpon>
</Compile>
<Compile Include="Update.aspx.cs">
<DependentUpon>Update.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Update.aspx.designer.cs">
<DependentUpon>Update.aspx</DependentUpon>
</Compile>
<Compile Include="User.aspx.cs">
<DependentUpon>User.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="User.aspx.designer.cs">
<DependentUpon>User.aspx</DependentUpon>
</Compile>
<Compile Include="UserList.aspx.cs">
<DependentUpon>UserList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="UserList.aspx.designer.cs">
<DependentUpon>UserList.aspx</DependentUpon>
@@ -1010,7 +989,6 @@
</Compile>
<Compile Include="WebUserControls\mod_checkHttps.ascx.cs">
<DependentUpon>mod_checkHttps.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_checkHttps.ascx.designer.cs">
<DependentUpon>mod_checkHttps.ascx</DependentUpon>
MP-TAB/Web.config
+4
View File
@@ -114,6 +114,10 @@
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
MP-TAB/packages.config
+2 -1
View File
@@ -43,7 +43,8 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MapoDb/MapoDb.csproj
+3 -4
View File
@@ -126,8 +126,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.743, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -162,8 +162,6 @@
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
@@ -386,6 +384,7 @@
<Name>MapoSDK</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
MapoDb/app.config
+1 -1
View File
@@ -26,7 +26,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
MapoDb/libzstd.dll
BIN
View File
Binary file not shown.
MapoDb/mongocrypt.dll
BIN
View File
Binary file not shown.
MapoDb/packages.config
+1 -1
View File
@@ -22,7 +22,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.743" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" 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="4.7.0" targetFramework="net462" />
MapoDb/snappy32.dll
BIN
View File
Binary file not shown.
MapoDb/snappy64.dll
BIN
View File
Binary file not shown.
MapoSDK/Enums.cs
+275 -236
View File
@@ -1,258 +1,297 @@
namespace MapoSDK
{
public enum DataItemCategory
{
CONDITION = 0,
EVENT = 1,
SAMPLE = 2
}
/// <summary>
/// tipologia evento inviato
/// </summary>
public enum tipoInputEvento
{
barcode,
hw
}
/// <summary>
/// Tipo di esito (generico)
/// </summary>
public enum esitoExec
{
undone,
ok,
error
}
/// <summary>
/// Tipologia di elaborazione/funzione da applicare a VC
/// </summary>
public enum VC_func
{
/// <summary>
/// Valore puntuale
/// Tipo di IOB
/// </summary>
POINT = 0,
/// <summary>
/// Valore medio del periodo
/// </summary>
AVG,
/// <summary>
/// Valore massimo del periodo
/// </summary>
MAX,
/// <summary>
/// Valore minimo del periodo
/// </summary>
MIN
}
/// <summary>
/// Elenco dei tipi di valore gestiti da PLC (inizialmente SIEMENS)
/// </summary>
public enum plcDataType
{
/// <summary>
/// Tipo boolean
/// </summary>
Boolean,
/// <summary>
/// Tipo Int16 intero 16bit
/// </summary>
Int,
/// <summary>
/// Tipo Int32 intero 32bit
/// </summary>
DInt,
/// <summary>
/// Tipo UInt16, intero 16bit
/// </summary>
Word,
/// <summary>
/// Tipo UInt32, intero Unsigned 32bit
/// </summary>
DWord,
/// <summary>
/// Tipo REAL 32 bit
/// </summary>
Real,
/// <summary>
/// Tipo stringa
/// </summary>
String
}
/// <summary>
/// Finestra temporale di aggregazione dati VC
/// </summary>
public enum timeWindow
{
free,
hour,
day,
week,
month
}
/// <summary>
/// Tipo di esito (generico)
/// </summary>
public enum esitoExec
{
undone,
ok,
error
}
public enum IobType
{
/// <summary>
/// Non definito
/// </summary>
ND,
/// <summary>
/// Elenco task ammessi (x IOB-WIN da eseguire...)
/// </summary>
public enum taskType
{
/// <summary>
/// Task nullo / fake
/// </summary>
nihil,
/// <summary>
/// Rimanda a PLC eventuale segnale NON in setup (MA NON RESETTA)
/// </summary>
fixStopSetup,
/// <summary>
/// Indica al PLC di forzare il reset del contapezzi
/// </summary>
forceResetPzCount,
/// <summary>
/// Indica al PLC di forzare il NUOVO valore di contapezzi (impostato come value)
/// </summary>
forceSetPzCount,
/// <summary>
/// Imposta Articolo su PLC
/// </summary>
setArt,
/// <summary>
/// Imposta Commessa su PLC
/// </summary>
setComm,
/// <summary>
/// Set di un PARAMETRO su PLC (in value avremo un JSON object)
/// </summary>
setParameter,
/// <summary>
/// Set Programma CNC su PLC
/// </summary>
setProg,
/// <summary>
/// Indica al PLC di impostare il numero di pezzi da produrre per la commessa (impostato come value)
/// </summary>
setPzComm,
/// <summary>
/// Indica al PLC iniziato setup (e secondo casi ferma contapezzi /resetta)
/// </summary>
startSetup,
/// <summary>
/// Indica al PLC finito setup (e secondo casi ferma contapezzi /resetta)
/// </summary>
stopSetup,
/// <summary>
/// Richiesta invio watchdog a PLC
/// </summary>
sendWatchDogMes2Plc
}
/// <summary>
/// Tipologia di selettore
/// </summary>
public enum tipoSelettore
{
articoli
}
/// <summary>
/// Tipo di IOB
/// </summary>
public enum IobType
{
/// <summary>
/// Non definito
/// </summary>
ND,
/// <summary>
/// IOB rPI
/// </summary>
rPi,
/// <summary>
/// IOB Windows
/// </summary>
WIN
}
/// <summary>
/// IOB rPI
/// </summary>
rPi,
/// <summary>
/// tipologia di evento (generico) segnalato
/// </summary>
public enum tipoEvento
{
/// <summary>
/// evento di reset
/// </summary>
reset,
/// <summary>
/// richiesta editing
/// </summary>
edit,
/// <summary>
/// nuova selezione
/// </summary>
selection,
/// <summary>
/// eliminazione record(s)
/// </summary>
delete
}
public enum DataItemCategory
{
CONDITION = 0,
EVENT = 1,
SAMPLE = 2
}
/// <summary>
/// IOB Windows
/// </summary>
WIN
}
public enum tipoBarcode
{
/// <summary>
/// tipo non riconosciuto
/// Elenco dei tipi di valore gestiti da PLC (inizialmente SIEMENS)
/// </summary>
nd,
/// <summary>
/// identifica una matricola operatore nel formato OPxxxxx (xxxxx è un intero che rappresenta la matricola, std fino a 8 cifre)
/// </summary>
matrOperatore,
/// <summary>
/// identifica un cartellino di tipo CodArticolo
/// </summary>
codArticolo,
/// <summary>
/// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione
/// </summary>
attrezzaggio,
/// <summary>
/// identifica un codice per le attività di conferma produzione/fermi
/// </summary>
confermaProduzione,
/// <summary>
/// identifica un cartellino di dichiarazione fermata nel formato FExxxx dove xxxx è idxEvento dichiarato...
/// </summary>
dichiaraFermata,
/// <summary>
/// indentifica un codice di modifica turno
/// </summary>
modificaTurno
}
public enum plcDataType
{
/// <summary>
/// Tipo boolean
/// </summary>
Boolean,
/// <summary>
/// Tipo Int16 intero 16bit
/// </summary>
Int,
/// <summary>
/// Tipo Int32 intero 32bit
/// </summary>
DInt,
/// <summary>
/// Tipo UInt16, intero 16bit
/// </summary>
Word,
/// <summary>
/// Tipo UInt32, intero Unsigned 32bit
/// </summary>
DWord,
/// <summary>
/// Tipo REAL 32 bit
/// </summary>
Real,
/// <summary>
/// Tipo stringa
/// </summary>
String
}
/// <summary>
/// Enumerazione tipi di semaforo
/// </summary>
public enum Semaforo
{
/// <summary>
/// Stato non definito
/// Enumerazione tipi di semaforo
/// </summary>
ND,
public enum Semaforo
{
/// <summary>
/// Stato non definito
/// </summary>
ND,
/// <summary>
/// Verde
/// </summary>
SV,
/// <summary>
/// Giallo
/// </summary>
SG,
/// <summary>
/// Rosso
/// </summary>
SR,
/// <summary>
/// Grigio/Spento
/// </summary>
SS
}
/// <summary>
/// Verde
/// Elenco task ammessi (x IOB-WIN da eseguire...)
/// </summary>
SV,
public enum taskType
{
/// <summary>
/// Task nullo / fake
/// </summary>
nihil,
/// <summary>
/// Rimanda a PLC eventuale segnale NON in setup (MA NON RESETTA)
/// </summary>
fixStopSetup,
/// <summary>
/// Indica al PLC di forzare il reset del contapezzi
/// </summary>
forceResetPzCount,
/// <summary>
/// Indica al PLC di forzare il NUOVO valore di contapezzi (impostato come value)
/// </summary>
forceSetPzCount,
/// <summary>
/// Imposta Articolo su PLC
/// </summary>
setArt,
/// <summary>
/// Imposta Commessa su PLC
/// </summary>
setComm,
/// <summary>
/// Set di un PARAMETRO su PLC (in value avremo un JSON object)
/// </summary>
setParameter,
/// <summary>
/// Set Programma CNC su PLC
/// </summary>
setProg,
/// <summary>
/// Indica al PLC di impostare il numero di pezzi da produrre per la commessa (impostato come value)
/// </summary>
setPzComm,
/// <summary>
/// Indica al PLC iniziato setup (e secondo casi ferma contapezzi /resetta)
/// </summary>
startSetup,
/// <summary>
/// Indica al PLC finito setup (e secondo casi ferma contapezzi /resetta)
/// </summary>
stopSetup,
/// <summary>
/// Richiesta invio watchdog a PLC
/// </summary>
sendWatchDogMes2Plc
}
/// <summary>
/// Giallo
/// Finestra temporale di aggregazione dati VC
/// </summary>
SG,
public enum timeWindow
{
free,
hour,
day,
week,
month
}
public enum tipoBarcode
{
/// <summary>
/// tipo non riconosciuto
/// </summary>
nd,
/// <summary>
/// identifica una matricola operatore nel formato OPxxxxx (xxxxx è un intero che rappresenta la matricola, std fino a 8 cifre)
/// </summary>
matrOperatore,
/// <summary>
/// identifica un cartellino di tipo CodArticolo
/// </summary>
codArticolo,
/// <summary>
/// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione
/// </summary>
attrezzaggio,
/// <summary>
/// identifica un codice per le attività di conferma produzione/fermi
/// </summary>
confermaProduzione,
/// <summary>
/// identifica un cartellino di dichiarazione fermata nel formato FExxxx dove xxxx è idxEvento dichiarato...
/// </summary>
dichiaraFermata,
/// <summary>
/// indentifica un codice di modifica turno
/// </summary>
modificaTurno
}
/// <summary>
/// Rosso
/// tipologia di evento (generico) segnalato
/// </summary>
SR,
public enum tipoEvento
{
/// <summary>
/// evento di reset
/// </summary>
reset,
/// <summary>
/// richiesta editing
/// </summary>
edit,
/// <summary>
/// nuova selezione
/// </summary>
selection,
/// <summary>
/// eliminazione record(s)
/// </summary>
delete
}
/// <summary>
/// Grigio/Spento
/// tipologia evento inviato
/// </summary>
SS
}
}
public enum tipoInputEvento
{
barcode,
hw
}
/// <summary>
/// Tipologia di selettore
/// </summary>
public enum tipoSelettore
{
articoli
}
/// <summary>
/// Tipologia di elaborazione/funzione da applicare a VC
/// </summary>
public enum VC_func
{
/// <summary>
/// Valore puntuale
/// </summary>
POINT = 0,
/// <summary>
/// Valore medio del periodo
/// </summary>
AVG,
/// <summary>
/// Valore massimo del periodo
/// </summary>
MAX,
/// <summary>
/// Valore minimo del periodo
/// </summary>
MIN
}
}
MapoSDK/GlobalSuppressions.cs
+8
View File
@@ -0,0 +1,8 @@
// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project.
// Project-level suppressions either have no target or are given
// a specific target and scoped to a namespace, type, member, etc.
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Naming", "CA1707:Gli identificatori non devono contenere caratteri di sottolineatura", Justification = "<In sospeso>", Scope = "type", Target = "~T:MapoSDK.VC_func")]
MapoSDK/MapoSDK.csproj
+1
View File
@@ -54,6 +54,7 @@
<Link>MoonPro.cs</Link>
</Compile>
<Compile Include="Enums.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Objects.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MSDK_utils.cs" />