diff --git a/Jenkinsfile b/Jenkinsfile index de195e23..fd6543bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1348']) { + withEnv(['NEXT_BUILD_NUMBER=1349']) { // env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 90b8f1b5..79ff6322 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -123,12 +123,11 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll True - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll - True + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -451,14 +450,11 @@ - - - @@ -570,8 +566,6 @@ - - diff --git a/MP-ADM/README.txt b/MP-ADM/README.txt deleted file mode 100644 index bf60ed18..00000000 --- a/MP-ADM/README.txt +++ /dev/null @@ -1,12 +0,0 @@ ---------------------------------------------------------------- -------- SteamWareLib SDK ------- ---------------------------------------------------------------- - -Libreria di utility base di SteamWare. - -Le dipendenze inserite sono necessarie al funzionamento dell'SDK. - -Sono inclusi a titolo di esempio vari files di conf: - * example-NLog.config - -Attenzione a configurare correttamente il file NLog.xml includendo il rule per la classe, vedere ad esempio il file example-NLog.config allegato. \ No newline at end of file diff --git a/MP-ADM/libzstd.dll b/MP-ADM/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-ADM/libzstd.dll and /dev/null differ diff --git a/MP-ADM/mongocrypt.dll b/MP-ADM/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MP-ADM/mongocrypt.dll and /dev/null differ diff --git a/MP-ADM/packages.config b/MP-ADM/packages.config index d24f1078..fb5ba3e4 100644 --- a/MP-ADM/packages.config +++ b/MP-ADM/packages.config @@ -42,8 +42,8 @@ - - + + diff --git a/MP-ADM/snappy32.dll b/MP-ADM/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-ADM/snappy32.dll and /dev/null differ diff --git a/MP-ADM/snappy64.dll b/MP-ADM/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-ADM/snappy64.dll and /dev/null differ diff --git a/MP-IO/Default.aspx b/MP-IO/Default.aspx deleted file mode 100644 index 911eb3a0..00000000 --- a/MP-IO/Default.aspx +++ /dev/null @@ -1,26 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="MP_IO.Default" %> - - - - - - - - -
-
-

MoonPro IO Landing Page

- Questo sito e queste pagine di servizio sono riservate all'uso dei dispositivi di acquisizione MapoIOB
-
- per una semplice diagnostica dello stato degli acquisitori consultare questa pagina
-
- Note setup: possono essere sono necessari più siti reali (es: MP-IO e MP-IO-2) e 1 sito virtuale (MPIO) che punti normalmente al primo ed al secondo in fase di web.deploy -
-
-
- -
-
-
- - \ No newline at end of file diff --git a/MP-IO/Default.aspx.cs b/MP-IO/Default.aspx.cs deleted file mode 100644 index 43e2933d..00000000 --- a/MP-IO/Default.aspx.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Configuration; -using System.Web.UI; - -namespace MP_IO -{ - public partial class Default : System.Web.UI.Page - { - #region Protected Methods - - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - lblVers.Text = string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); - Response.Redirect("status"); - } - } - - #endregion Protected Methods - } -} \ No newline at end of file diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 816686cb..fe9f8301 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -120,12 +120,13 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll True - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll True - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll + True ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -232,10 +233,7 @@ - - - Always @@ -273,12 +271,9 @@ - - - Always @@ -290,8 +285,6 @@ - - Designer @@ -316,13 +309,6 @@ - - Default.aspx - ASPXCodeBehind - - - Default.aspx - enabled.aspx ASPXCodeBehind @@ -377,8 +363,6 @@ PreserveNewest - - @@ -386,12 +370,6 @@ - - Designer - - - Designer - Web.config diff --git a/MP-IO/README.txt b/MP-IO/README.txt deleted file mode 100644 index bf60ed18..00000000 --- a/MP-IO/README.txt +++ /dev/null @@ -1,12 +0,0 @@ ---------------------------------------------------------------- -------- SteamWareLib SDK ------- ---------------------------------------------------------------- - -Libreria di utility base di SteamWare. - -Le dipendenze inserite sono necessarie al funzionamento dell'SDK. - -Sono inclusi a titolo di esempio vari files di conf: - * example-NLog.config - -Attenzione a configurare correttamente il file NLog.xml includendo il rule per la classe, vedere ad esempio il file example-NLog.config allegato. \ No newline at end of file diff --git a/MP-IO/Web-Sql2012.config b/MP-IO/Web-Sql2012.config deleted file mode 100644 index a95efb22..00000000 --- a/MP-IO/Web-Sql2012.config +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/Web-Sql2016.config b/MP-IO/Web-Sql2016.config deleted file mode 100644 index 30328b3f..00000000 --- a/MP-IO/Web-Sql2016.config +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/example-NLog.config b/MP-IO/example-NLog.config deleted file mode 100644 index a11a39e6..00000000 --- a/MP-IO/example-NLog.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/example-app.config b/MP-IO/example-app.config deleted file mode 100644 index fb421650..00000000 --- a/MP-IO/example-app.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/MP-IO/example-config-table.txt b/MP-IO/example-config-table.txt deleted file mode 100644 index dd0ab8ef..00000000 --- a/MP-IO/example-config-table.txt +++ /dev/null @@ -1,30 +0,0 @@ -# chiave valore valoreStd note -_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net -_allowForceUser true true abilita login forzato -_commonPages menu menu pagina comune -_emailPwd drmfsls16 drmfsls16 drmfsls16 -_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com -_enableSSL true true true -_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg -_righeDataGrid 30 30 Num righe datagrid std -_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche -_righeDataGridLong 30 30 Num righe datagrid long -_righeDataGridMed 15 15 Num righe datagrid med -_righeDataGridShort 10 10 Num righe datagrid short -_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com -_useAIMSmtp false false impiego client posta elettronica alternativo -_useAuthSmtp true true true -AuthCookieName admodellingAuth admodellingAuth Cookie applicativo -autoConfCmd true true Conferma automatica comandi barcode -baseUrl http://site_name http://iis02/site_name URL base del sito -cacheValSec 60 60 Validità cache dati in gestore Barcode -cookieDayExp 365 365 Periodo validità cookie -cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati -enableCookie true true Abilitazione uso cookie -enableLogOut true false Abilita button logout COMPLETO in alto a sx -enablePlain true true Abilitazione decode plain -maxAuth 1000 1000 num auth minimo per NON consumare tokens -serializeSession true true Serializzazione valori in sessione (REDIS) -SiteName iis02/site_name iis02/site_name Nome sito -enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default -doShrinkFolder true true Imposta compressione area LOGS \ No newline at end of file diff --git a/MP-IO/example-favicon.ico b/MP-IO/example-favicon.ico deleted file mode 100644 index 4f0e0ad0..00000000 Binary files a/MP-IO/example-favicon.ico and /dev/null differ diff --git a/MP-IO/libzstd.dll b/MP-IO/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-IO/libzstd.dll and /dev/null differ diff --git a/MP-IO/mongocrypt.dll b/MP-IO/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MP-IO/mongocrypt.dll and /dev/null differ diff --git a/MP-IO/packages.config b/MP-IO/packages.config index f3c83b05..f1dba422 100644 --- a/MP-IO/packages.config +++ b/MP-IO/packages.config @@ -42,8 +42,8 @@ - - + + diff --git a/MP-IO/snappy32.dll b/MP-IO/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-IO/snappy32.dll and /dev/null differ diff --git a/MP-IO/snappy64.dll b/MP-IO/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-IO/snappy64.dll and /dev/null differ diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index 518f2f1c..7f293d81 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -120,11 +120,13 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll + True - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll + True @@ -321,7 +323,6 @@ Always - diff --git a/MP-LAND/mongocrypt.dll b/MP-LAND/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MP-LAND/mongocrypt.dll and /dev/null differ diff --git a/MP-LAND/packages.config b/MP-LAND/packages.config index 06556ccf..0bb02081 100644 --- a/MP-LAND/packages.config +++ b/MP-LAND/packages.config @@ -48,8 +48,8 @@ - - + + diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj index eba0a182..343c574c 100644 --- a/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON.csproj @@ -124,12 +124,11 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll True - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll - True + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll @@ -392,7 +391,6 @@ MapoModel.Designer.cs - MapoModel.edmx @@ -419,7 +417,6 @@ MapoModel.edmx MapoModel.cs - @@ -539,8 +536,6 @@ - - Designer diff --git a/MP-MON/libzstd.dll b/MP-MON/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-MON/libzstd.dll and /dev/null differ diff --git a/MP-MON/mongocrypt.dll b/MP-MON/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MP-MON/mongocrypt.dll and /dev/null differ diff --git a/MP-MON/packages.config b/MP-MON/packages.config index df5355b0..d31bd857 100644 --- a/MP-MON/packages.config +++ b/MP-MON/packages.config @@ -43,8 +43,8 @@ - - + + diff --git a/MP-MON/snappy32.dll b/MP-MON/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-MON/snappy32.dll and /dev/null differ diff --git a/MP-MON/snappy64.dll b/MP-MON/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-MON/snappy64.dll and /dev/null differ diff --git a/MP-SITE/libzstd.dll b/MP-SITE/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-SITE/libzstd.dll and /dev/null differ diff --git a/MP-SITE/mongocrypt.dll b/MP-SITE/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MP-SITE/mongocrypt.dll and /dev/null differ diff --git a/MP-SITE/snappy32.dll b/MP-SITE/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-SITE/snappy32.dll and /dev/null differ diff --git a/MP-SITE/snappy64.dll b/MP-SITE/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-SITE/snappy64.dll and /dev/null differ diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index c6c0093c..e1aded7e 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -125,12 +125,11 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll True - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll - True + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -317,11 +316,9 @@ - - @@ -444,8 +441,6 @@ - - diff --git a/MP-Site/packages.config b/MP-Site/packages.config index 9db523b3..5c96b6d6 100644 --- a/MP-Site/packages.config +++ b/MP-Site/packages.config @@ -45,8 +45,8 @@ - - + + diff --git a/MP-TAB/About.aspx b/MP-TAB/About.aspx index f61473f6..b19ba77f 100644 --- a/MP-TAB/About.aspx +++ b/MP-TAB/About.aspx @@ -1,192 +1,23 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="MoonProTablet.About" %> +<%@ Register Src="~/WebUserControls/cmp_HwSwInfo.ascx" TagPrefix="uc1" TagName="cmp_HwSwInfo" %> + -
-

SteamWare's stats page

-
-
-

- -

-
-
-
-
-
-
-
Module
- <%--3 days ago--%> -
-

<%: SteamWare.memLayer.ML.CRS("CodModulo") %>

- <%--Altro.--%> -
-
-
-
.net framework
- <%--3 days ago--%> -
-

<%: runtimeImg %>

- <%--Donec id elit non mi porta.--%> -
-
-
-
Main Assembly
- <%--3 days ago--%> -
-

<%: mainAssembly %>

- <%--Donec id elit non mi porta.--%> -
-
+
+
+

MAPO

-
-
-
-
-

- -

-
-
-
-
-
-
-
Server Stats
- <%--3 days ago--%> -
-

- 

<%: ServerStats %>
-

- <%--Donec id elit non mi porta.--%> +
+
+
+
-
-
-
IIS Stats
- <%--3 days ago--%> -
-

- 

<%: IISStats %>
-

- <%--Donec id elit non mi porta.--%> -
-
+
-
-
-
-
-

- -

-
-
-
-
-
-
-
Redis Servers Data
- <%--3 days ago--%> -
-

- 

<%: redisServersData %>
-

- <%--Donec id elit non mi porta.--%> -
-
+
+

MoonPro / MAPO sono una suite di applicazioni e dispositivi hw dedicati per l'IOT,l'industry 4.0 e la gestione automatizzata dei processi produttivi.

+

Per maggiori informazioni visita il link sul nostro sito.

+
-
-
-
-

- -

-
-
-
-
-
-
-
Windows size data
- <%--3 days ago--%> -
-

- 

<%: paretoBrowserSize %>
-

- <%--Donec id elit non mi porta.--%> -
-
-
-
Screen size data
- <%--3 days ago--%> -
-

- 

<%: paretoScreenSize %>
-

- <%--Donec id elit non mi porta.--%> -
-
-
-
Pixel Ratio + Windows size data
- <%--3 days ago--%> -
-

- 

<%: paretoWinPixRat %>
-

- <%--Donec id elit non mi porta.--%> -
-
-
-
-
-
-
-

- -

-
-
-
-
-
-
-
Elenco librerie
- <%: numLibraries %> -
-

- 

<%: librariesVers %>
-

- <%--Altro.--%> -
-
-
-
-
-
-
-

- -

-
-
-
-

-

-

-
-
-
-
- + \ No newline at end of file diff --git a/MP-TAB/About.aspx.cs b/MP-TAB/About.aspx.cs index e419e816..994da97c 100644 --- a/MP-TAB/About.aspx.cs +++ b/MP-TAB/About.aspx.cs @@ -12,67 +12,87 @@ namespace MoonProTablet { public partial class About : BasePage { + #region Protected Fields + protected Assembly assembly = Assembly.GetExecutingAssembly(); - protected void Page_Load(object sender, EventArgs e) + + #endregion Protected Fields + + #region Public Properties + + public string IISStats { - if (!Page.IsPostBack) + get { - // faccio reset... sessioni e vocabolario.. - doReset(); + StringBuilder sb = new StringBuilder(); + using (var iis = Process.GetCurrentProcess()) + { + //Process iis = Process.GetCurrentProcess(); + sb.AppendLine(string.Format("UPTIME: {0}", ToDateString(DateTime.Now - iis.StartTime))); + sb.AppendLine(string.Format("Priority: {0}", iis.PriorityClass)); + sb.AppendLine(string.Format("Physical Memory Used: {0}", memFormat(iis.WorkingSet64))); + sb.AppendLine(string.Format("Virtual Memory Used: {0}", memFormat(iis.VirtualMemorySize64))); + } + return sb.ToString(); } } - private void doReset() + public string librariesVers { - string action = memLayer.ML.QSS("Action"); - string testo = "

Reset Actions

"; - long recPrev = 0; - long recPost = 0; - if (action != "") + get { - if (action.Contains("C")) + string answ = ""; + try { - recPrev = Cache.Count; - // reset dati in cache... - memLayer.ML.flushRegisteredCache(); - recPost = Cache.Count; - testo += string.Format("Reset Cache: {0} --> {1}
", recPrev, recPost); - } - if (action.Contains("D")) - { - recPrev = memLayer.ML.numRecAppConf; - // reset dati in cache x DbConfig... - memLayer.ML.resetAppConf(); - recPost = memLayer.ML.numRecAppConf; - testo += string.Format("Reset DB AppConf: {0} --> {1}
", recPrev, recPost); - } - if (action.Contains("R")) - { - recPrev = memLayer.ML.numRecRedis; - // reset dati in cache x DbConfig... - memLayer.ML.redFlushKey("**"); - recPost = memLayer.ML.numRecRedis; - testo += string.Format("Reset Redis: {0} --> {1}
", recPrev, recPost); - } - if (action.Contains("S")) - { - recPrev = Session.Count; - // reset dati in sessione... - Session.Clear(); - recPost = Session.Count; - testo += string.Format("Reset Sessione: {0} --> {1}
", recPrev, recPost); - } - if (action.Contains("V")) - { - recPrev = DataWrap.DW.numRecVoc; - // aggiorno vocabolario - DataWrap.DW.resetVocabolario(); - recPost = DataWrap.DW.numRecVoc; - testo += string.Format("Reset Vocabolario: {0} --> {1}
", recPrev, recPost); + AssemblyName[] referencedAssemblyNames = assembly.GetReferencedAssemblies(); + foreach (AssemblyName referencedAssemblyName in referencedAssemblyNames.OrderBy(n => n.Name)) + { + answ += referencedAssemblyName.FullName + Environment.NewLine; + } } + catch + { } + return answ; } - lblOut.Text = testo; } + + public string mainAssembly + { + get + { + string answ = ""; + try + { + answ = assembly.FullName; + } + catch + { } + return answ; + } + } + + /// + /// Num di librerie inserite + /// + public int numLibraries + { + get + { + int numLib = 0; ; + try + { + AssemblyName[] referencedAssemblyNames = assembly.GetReferencedAssemblies(); + foreach (AssemblyName referencedAssemblyName in referencedAssemblyNames.OrderBy(n => n.Name)) + { + numLib++; + } + } + catch + { } + return numLib; + } + } + /// /// Restitusice l'elenco pareto (decrescente) delle dimensioni FINESTRA browser registrate /// @@ -94,6 +114,7 @@ namespace MoonProTablet return sb.ToString(); } } + /// /// Restitusice l'elenco pareto (decrescente) delle dimensioni SCHERMO registrate /// @@ -115,6 +136,7 @@ namespace MoonProTablet return sb.ToString(); } } + /// /// Restitusice l'elenco pareto (decrescente) delle dimensioni FINESTRA browser + PIXEL ratio registrate /// @@ -136,25 +158,7 @@ namespace MoonProTablet return sb.ToString(); } } - /// - /// Formatta un numero da int a size in Kb/Mb/Gb/Tb - /// - /// - /// - public string memFormat(double rawSize) - { - string[] sizes = { "B", "KB", "MB", "GB", "TB" }; - int order = 0; - while (rawSize >= 1024 && order < sizes.Length - 1) - { - order++; - rawSize = rawSize / 1024; - } - // Adjust the format string to your preferences. For example "{0:0.#}{1}" would - // show a single decimal place, and no space. - return String.Format("{0:0.##} {1}", rawSize, sizes[order]); - } /// /// Dati sui server redis... /// @@ -193,15 +197,22 @@ namespace MoonProTablet return sb.ToString(); } } - /// - /// Stringa timing - /// - /// - /// - public string ToDateString(TimeSpan time) + + public string runtimeImg { - return string.Format("{0}gg, {1:00}:{2:00}:{3:00} (h:m:s)", time.Days, time.Hours, time.Minutes, time.Seconds); + get + { + string answ = ""; + try + { + answ = assembly.ImageRuntimeVersion; + } + catch + { } + return answ; + } } + /// /// Statistiche server /// @@ -241,88 +252,49 @@ namespace MoonProTablet return sb.ToString(); } } - public string IISStats + + #endregion Public Properties + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) { - get - { - StringBuilder sb = new StringBuilder(); - using (var iis = Process.GetCurrentProcess()) - { - //Process iis = Process.GetCurrentProcess(); - sb.AppendLine(string.Format("UPTIME: {0}", ToDateString(DateTime.Now - iis.StartTime))); - sb.AppendLine(string.Format("Priority: {0}", iis.PriorityClass)); - sb.AppendLine(string.Format("Physical Memory Used: {0}", memFormat(iis.WorkingSet64))); - sb.AppendLine(string.Format("Virtual Memory Used: {0}", memFormat(iis.VirtualMemorySize64))); - } - return sb.ToString(); - } - } - public string mainAssembly - { - get - { - string answ = ""; - try - { - answ = assembly.FullName; - } - catch - { } - return answ; - } - } - public string runtimeImg - { - get - { - string answ = ""; - try - { - answ = assembly.ImageRuntimeVersion; - } - catch - { } - return answ; - } - } - public string librariesVers - { - get - { - string answ = ""; - try - { - AssemblyName[] referencedAssemblyNames = assembly.GetReferencedAssemblies(); - foreach (AssemblyName referencedAssemblyName in referencedAssemblyNames.OrderBy(n => n.Name)) - { - answ += referencedAssemblyName.FullName + Environment.NewLine; - } - } - catch - { } - return answ; - } } + + #endregion Protected Methods + + #region Public Methods + /// - /// Num di librerie inserite + /// Formatta un numero da int a size in Kb/Mb/Gb/Tb /// - public int numLibraries + /// + /// + public string memFormat(double rawSize) { - get + string[] sizes = { "B", "KB", "MB", "GB", "TB" }; + int order = 0; + while (rawSize >= 1024 && order < sizes.Length - 1) { - int numLib = 0; ; - try - { - AssemblyName[] referencedAssemblyNames = assembly.GetReferencedAssemblies(); - foreach (AssemblyName referencedAssemblyName in referencedAssemblyNames.OrderBy(n => n.Name)) - { - numLib++; - } - } - catch - { } - return numLib; + order++; + rawSize = rawSize / 1024; } + + // Adjust the format string to your preferences. For example "{0:0.#}{1}" would + // show a single decimal place, and no space. + return String.Format("{0:0.##} {1}", rawSize, sizes[order]); } + + /// + /// Stringa timing + /// + /// + /// + public string ToDateString(TimeSpan time) + { + return string.Format("{0}gg, {1:00}:{2:00}:{3:00} (h:m:s)", time.Days, time.Hours, time.Minutes, time.Seconds); + } + + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-TAB/About.aspx.designer.cs b/MP-TAB/About.aspx.designer.cs index 0573de84..5a13fa31 100644 --- a/MP-TAB/About.aspx.designer.cs +++ b/MP-TAB/About.aspx.designer.cs @@ -7,65 +7,13 @@ // //------------------------------------------------------------------------------ -namespace MoonProTablet { - - - public partial class About { - - /// - /// Controllo lbtGrp01. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtGrp01; - - /// - /// Controllo LinkButton1. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton1; - - /// - /// Controllo LinkButton2. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton2; - - /// - /// Controllo LinkButton3. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton3; - - /// - /// Controllo lbtGrp02. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtGrp02; - - /// - /// Controllo lbtGrp03. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtGrp03; - +namespace MoonProTablet +{ + + + public partial class About + { + /// /// Controllo lblOut. /// @@ -74,5 +22,14 @@ namespace MoonProTablet { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblOut; + + /// + /// Controllo cmp_HwSwInfo. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.cmp_HwSwInfo cmp_HwSwInfo; } } diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index be64d8e4..53ffcc7f 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -182,12 +182,11 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll True - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll - True + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -463,8 +462,6 @@ - - @@ -501,6 +498,7 @@ + @@ -509,12 +507,10 @@ - - @@ -531,6 +527,7 @@ + Always @@ -542,8 +539,6 @@ PreserveNewest - - Designer @@ -901,6 +896,13 @@ Reset.aspx + + ResetAct.aspx + ASPXCodeBehind + + + ResetAct.aspx + Scarti.aspx ASPXCodeBehind diff --git a/MP-TAB/README.txt b/MP-TAB/README.txt deleted file mode 100644 index bf60ed18..00000000 --- a/MP-TAB/README.txt +++ /dev/null @@ -1,12 +0,0 @@ ---------------------------------------------------------------- -------- SteamWareLib SDK ------- ---------------------------------------------------------------- - -Libreria di utility base di SteamWare. - -Le dipendenze inserite sono necessarie al funzionamento dell'SDK. - -Sono inclusi a titolo di esempio vari files di conf: - * example-NLog.config - -Attenzione a configurare correttamente il file NLog.xml includendo il rule per la classe, vedere ad esempio il file example-NLog.config allegato. \ No newline at end of file diff --git a/MP-TAB/Reset.aspx.cs b/MP-TAB/Reset.aspx.cs index 9bf717d3..b2764bab 100644 --- a/MP-TAB/Reset.aspx.cs +++ b/MP-TAB/Reset.aspx.cs @@ -5,13 +5,26 @@ namespace MoonProTablet { public partial class Reset : BasePage { + #region Protected Methods + protected void Page_Load(object sender, EventArgs e) { - Session.Clear(); - // reset appConf - memLayer.ML.resetAppConf(); + // se richiesto reset esplicito + string action = memLayer.ML.QSS("Action"); + if (!string.IsNullOrEmpty(action)) + { + Response.Redirect($"ResetAct?Action={action}"); + } + else + { + Session.Clear(); + // reset appConf + memLayer.ML.resetAppConf(); + } // rimanda alla pagina di reg device Response.Redirect(memLayer.ML.CRS("mainPage")); } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP-TAB/ResetAct.aspx b/MP-TAB/ResetAct.aspx new file mode 100644 index 00000000..49195780 --- /dev/null +++ b/MP-TAB/ResetAct.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ResetAct.aspx.cs" Inherits="MoonProTablet.ResetAct" %> + + + + + + \ No newline at end of file diff --git a/MP-TAB/ResetAct.aspx.cs b/MP-TAB/ResetAct.aspx.cs new file mode 100644 index 00000000..5bba5925 --- /dev/null +++ b/MP-TAB/ResetAct.aspx.cs @@ -0,0 +1,78 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet +{ + public partial class ResetAct : System.Web.UI.Page + { + #region Private Methods + + private void doReset() + { + string action = memLayer.ML.QSS("Action"); + string testo = "

Reset Actions

"; + long recPrev = 0; + long recPost = 0; + if (action != "") + { + if (action.Contains("C")) + { + recPrev = Cache.Count; + // reset dati in cache... + memLayer.ML.flushRegisteredCache(); + recPost = Cache.Count; + testo += string.Format("Reset Cache: {0} --> {1}
", recPrev, recPost); + } + if (action.Contains("D")) + { + recPrev = memLayer.ML.numRecAppConf; + // reset dati in cache x DbConfig... + memLayer.ML.resetAppConf(); + recPost = memLayer.ML.numRecAppConf; + testo += string.Format("Reset DB AppConf: {0} --> {1}
", recPrev, recPost); + } + if (action.Contains("R")) + { + recPrev = memLayer.ML.numRecRedis; + // reset dati in cache x DbConfig... + memLayer.ML.redFlushKey("**"); + recPost = memLayer.ML.numRecRedis; + testo += string.Format("Reset Redis: {0} --> {1}
", recPrev, recPost); + } + if (action.Contains("S")) + { + recPrev = Session.Count; + // reset dati in sessione... + Session.Clear(); + recPost = Session.Count; + testo += string.Format("Reset Sessione: {0} --> {1}
", recPrev, recPost); + } + if (action.Contains("V")) + { + recPrev = DataWrap.DW.numRecVoc; + // aggiorno vocabolario + DataWrap.DW.resetVocabolario(); + recPost = DataWrap.DW.numRecVoc; + testo += string.Format("Reset Vocabolario: {0} --> {1}
", recPrev, recPost); + } + } + lblOut.Text = testo; + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + doReset(); + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-IO/Default.aspx.designer.cs b/MP-TAB/ResetAct.aspx.designer.cs similarity index 55% rename from MP-IO/Default.aspx.designer.cs rename to MP-TAB/ResetAct.aspx.designer.cs index affa81a6..f1966cb3 100644 --- a/MP-IO/Default.aspx.designer.cs +++ b/MP-TAB/ResetAct.aspx.designer.cs @@ -7,27 +7,20 @@ // //------------------------------------------------------------------------------ -namespace MP_IO { - - - public partial class Default { - +namespace MoonProTablet +{ + + + public partial class ResetAct + { + /// - /// Controllo form1. + /// Controllo lblOut. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// Controllo lblVers. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblVers; + protected global::System.Web.UI.WebControls.Label lblOut; } } diff --git a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx index 7257ebe9..a54e5972 100644 --- a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx +++ b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx @@ -1,158 +1,174 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_HwSwInfo.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_HwSwInfo" %> <%--

SteamWare's Hw & Sw Info Page

--%>
-
-
-
-
-
-
-

<%: SteamWare.memLayer.ML.confReadString("CodModulo") %>

-
-
-
-
.net framework
+
+
+
+
+
+
Module
+
+

<%: SteamWare.memLayer.ML.confReadString("CodModulo") %>

+
+
+
+
.net framework
+
+

<%: CurrHwSwInfo.runtimeImg %>

+
+ +
+
+
Main DB Conf
+
+

<%: currDb %>

+
+ +
+
+
Main Assembly
+
+

<%: CurrHwSwInfo.mainAssembly %>

+
+
+
-

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).runtimeImg %>

-
-
-
-
Main Assembly
-
-

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).mainAssembly %>

-
-
-
-
-
-
-
-
-

- 

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).ServerStats %>
-

-
-
-
-
IIS Stats
+
+
+
+
+
+
Server Stats
+
+

+ 

<%: CurrHwSwInfo.ServerStats %>
+

+
+
+
+
IIS Stats
+
+

+ 

<%: CurrHwSwInfo.IISStats %>
+

+
+
+
-

- 

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).IISStats %>
-

-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Redis Servers Data
+
+

+ 

<%: CurrHwSwInfo.redisServersData %>
+

+
+
+
-

- 

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).redisServersData %>
-

-
-
- - -
-
-
-
+
+
+
+
+
+
+
Browser size data
+
+
+ +
+
+
+
+
Screen size data
+
+
+ +
+
+
+
-

- 

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).paretoBrowserSize %>
-

-
- - - -
-
-
-
+
+
+
+
+
+
+
Elenco librerie
+ <%: CurrHwSwInfo.numLibraries %> +
+

+ 

<%: CurrHwSwInfo.librariesVers %>
+

+
+
+
-

- 

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).librariesVers %>
-

-
- - - -
-
-
-
+
+
+
+

+

+

+
+
+
-
-
-

-

-

-
-
- - \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs index 53149a93..d31e54a1 100644 --- a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs @@ -1,6 +1,8 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; +using System.Text; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; @@ -9,9 +11,63 @@ namespace MoonProTablet.WebUserControls { public partial class cmp_HwSwInfo : BaseUserControl { + #region Public Properties + + public string currDb + { + get + { + string connStr = memLayer.ML.confReadString("DbConfConnectionString"); + return connStr.Substring(0, connStr.IndexOf(";Persist Security")); + } + } + + /// + /// Oggetto info hw/sw correnti + /// + public SteamWare.HwSwInfo CurrHwSwInfo + { + get + { + return SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()); + } + } + + /// + /// Restitusice l'elenco pareto (decrescente) delle dimensioni FINESTRA browser registrate + /// + public string paretoBrowserSize + { + get + { + StringBuilder sb = new StringBuilder(); + string redHash = memLayer.ML.redHash("COUNT:wh:*"); + int numRec = memLayer.ML.redCountKey(redHash); + var redKeys = memLayer.ML.redGetKeys(redHash); + // riordino elenco + sb.AppendLine(string.Format("Trovate {0} combinazioni", numRec)); + string currKey = ""; + string currVal = ""; + foreach (var item in redKeys) + { + currKey = item.ToString().Replace(memLayer.ML.redHash("COUNT:wh:"), ""); + currVal = memLayer.ML.getRSV(item); + sb.AppendLine($"{currKey}: {currVal}"); + } + return sb.ToString(); + } + } + + #endregion Public Properties + + #region Protected Methods + protected void Page_Load(object sender, EventArgs e) { - + litBrowserSize.Text = CurrHwSwInfo.paretoBrowserSize.Replace(Environment.NewLine, "
"); + //litScreenSize.Text = CurrHwSwInfo.paretoScreenSize.Replace(Environment.NewLine, "
"); } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs index a0aacef3..7a224aa5 100644 --- a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs +++ b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs @@ -11,70 +11,88 @@ namespace MoonProTablet.WebUserControls { - public partial class cmp_HwSwInfo - { + public partial class cmp_HwSwInfo + { - /// - /// Controllo lbtGrp01. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtGrp01; + /// + /// Controllo lbtGrp01. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtGrp01; - /// - /// Controllo LinkButton1. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton1; + /// + /// Controllo LinkButton1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton LinkButton1; - /// - /// Controllo LinkButton2. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton2; + /// + /// Controllo LinkButton2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton LinkButton2; - /// - /// Controllo LinkButton3. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton3; + /// + /// Controllo LinkButton3. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton LinkButton3; - /// - /// Controllo lbtGrp02. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtGrp02; + /// + /// Controllo litBrowserSize. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Literal litBrowserSize; - /// - /// Controllo lbtGrp03. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtGrp03; + /// + /// Controllo litScreenSize. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Literal litScreenSize; - /// - /// Controllo lblOut. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblOut; - } + /// + /// Controllo lbtGrp02. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtGrp02; + + /// + /// Controllo lbtGrp03. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtGrp03; + + /// + /// Controllo lblOut. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblOut; + } } diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index a19d6eec..bdd1f589 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -1099,10 +1099,17 @@ namespace MoonProTablet.WebUserControls var slaveList = DataLayerObj.taM2S.getByMaster(idxMacchina); foreach (var machine in slaveList) { + // non funziona usato metodo aggiunta task "classico"... +#if false // aggiungo i 3 valori DataLayerObj.updateMachineParameter(machine.IdxMacchinaSlave, "setArt", setArtVal); DataLayerObj.updateMachineParameter(machine.IdxMacchinaSlave, "setPzComm", setPzCommVal); DataLayerObj.updateMachineParameter(machine.IdxMacchinaSlave, "setComm", setCommVal); +#endif + + DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.setArt, setArtVal); + DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.setPzComm, setPzCommVal); + DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.setComm, setCommVal); } } } diff --git a/MP-TAB/WebUserControls/mod_title.ascx.cs b/MP-TAB/WebUserControls/mod_title.ascx.cs index 2757b322..fcbb59ac 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx.cs +++ b/MP-TAB/WebUserControls/mod_title.ascx.cs @@ -8,14 +8,22 @@ namespace MoonProTablet.WebUserControls { public partial class mod_title : BaseUserControl { - /// - /// user agent corrente - /// - protected string userAgent = ""; + #region Protected Fields + /// /// IP corrente /// protected string postazione_IP = ""; + + /// + /// user agent corrente + /// + protected string userAgent = ""; + + #endregion Protected Fields + + #region Protected Properties + /// /// Versione corrente sw /// @@ -26,25 +34,70 @@ namespace MoonProTablet.WebUserControls return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; } } + /// - /// caricamento pagina + /// URL stringa di UPDATE... /// - /// - /// - protected void Page_Load(object sender, EventArgs e) + protected string updateUrl { - if (!Page.IsPostBack) + get { - // prima apertura registro NO popup = refresh enabled - memLayer.ML.setSessionVal("refreshEnabled", true); - } - // se ho user/dominio e matricola in sessione NON controllo coockie - if (user_std.UtSn.utente == "" || user_std.UtSn.dominio == "" || DataLayerObj.MatrOpr == 0) - { - // altrimenti controllo se c'è utente in sessione.. - checkAuthCookieMoonProTablet(); + return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/TAB/{0}/manifest.xml", memLayer.ML.CRS("appVers")); } } + + #endregion Protected Properties + + #region Public Properties + + /// + /// Cognome Nome utente + /// + public string CognomeNome + { + get + { + string swData = ""; + string cognomeNome = ""; + try + { + cognomeNome = user_std.UtSn.CognomeNome; + } + catch (Exception exc) + { + logger.lg.scriviLog($"Eccezione in {titolo} recupero CognomeNome: {Environment.NewLine}{exc}", tipoLog.EXCEPTION); + } + if (DataLayerObj.MatrOpr > 0) + { + swData = DataLayerObj.CognomeNomeOpr; + } + else if (cognomeNome != "") + { + swData = cognomeNome; + } + else + { + swData = "MoonProTablet"; + } + return swData; + } + } + + /// + /// Cognome Nome utente + /// + public string MatrOpr + { + get + { + return DataLayerObj.MatrOpr.ToString(); + } + } + + #endregion Public Properties + + #region Private Methods + /// /// verifica al presenza di un cookie VALIDO per autorizzare il device /// @@ -119,25 +172,35 @@ namespace MoonProTablet.WebUserControls logger.lg.scriviLog(string.Format("Errore in checkAuthCookie:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); } } + + #endregion Private Methods + + #region Protected Methods + /// - /// URL stringa di UPDATE... + /// caricamento pagina /// - protected string updateUrl + /// + /// + protected void Page_Load(object sender, EventArgs e) { - get + if (!Page.IsPostBack) { - return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/TAB/{0}/manifest.xml", memLayer.ML.CRS("appVers")); + // prima apertura registro NO popup = refresh enabled + memLayer.ML.setSessionVal("refreshEnabled", true); + } + // se ho user/dominio e matricola in sessione NON controllo coockie + if (user_std.UtSn.utente == "" || user_std.UtSn.dominio == "" || DataLayerObj.MatrOpr == 0) + { + // altrimenti controllo se c'è utente in sessione.. + checkAuthCookieMoonProTablet(); } } - public string isActive(object pageName) - { - string answ = ""; - if (true) - { - answ = "active"; - } - return answ; - } + + #endregion Protected Methods + + #region Public Methods + /// /// Verifica se la pagina corrente sia URL indicato --> mostra ACTIVE /// @@ -152,48 +215,17 @@ namespace MoonProTablet.WebUserControls } return answ; } - /// - /// Cognome Nome utente - /// - public string MatrOpr + + public string isActive(object pageName) { - get + string answ = ""; + if (true) { - return DataLayerObj.MatrOpr.ToString(); + answ = "active"; } + return answ; } - /// - /// Cognome Nome utente - /// - public string CognomeNome - { - get - { - string swData = ""; - string cognomeNome = ""; - try - { - cognomeNome = user_std.UtSn.CognomeNome; - } - catch (Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in User.aspx - page_load: {0}", exc), tipoLog.EXCEPTION); - } - if (DataLayerObj.MatrOpr > 0) - { - swData = DataLayerObj.CognomeNomeOpr; - } - else if (cognomeNome != "") - { - swData = cognomeNome; - } - else - { - swData = "MoonProTablet"; - } - return swData; - } - } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-TAB/example-NLog.config b/MP-TAB/example-NLog.config deleted file mode 100644 index a11a39e6..00000000 --- a/MP-TAB/example-NLog.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-TAB/example-app.config b/MP-TAB/example-app.config deleted file mode 100644 index fb421650..00000000 --- a/MP-TAB/example-app.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/MP-TAB/example-config-table.txt b/MP-TAB/example-config-table.txt deleted file mode 100644 index dd0ab8ef..00000000 --- a/MP-TAB/example-config-table.txt +++ /dev/null @@ -1,30 +0,0 @@ -# chiave valore valoreStd note -_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net -_allowForceUser true true abilita login forzato -_commonPages menu menu pagina comune -_emailPwd drmfsls16 drmfsls16 drmfsls16 -_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com -_enableSSL true true true -_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg -_righeDataGrid 30 30 Num righe datagrid std -_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche -_righeDataGridLong 30 30 Num righe datagrid long -_righeDataGridMed 15 15 Num righe datagrid med -_righeDataGridShort 10 10 Num righe datagrid short -_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com -_useAIMSmtp false false impiego client posta elettronica alternativo -_useAuthSmtp true true true -AuthCookieName admodellingAuth admodellingAuth Cookie applicativo -autoConfCmd true true Conferma automatica comandi barcode -baseUrl http://site_name http://iis02/site_name URL base del sito -cacheValSec 60 60 Validità cache dati in gestore Barcode -cookieDayExp 365 365 Periodo validità cookie -cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati -enableCookie true true Abilitazione uso cookie -enableLogOut true false Abilita button logout COMPLETO in alto a sx -enablePlain true true Abilitazione decode plain -maxAuth 1000 1000 num auth minimo per NON consumare tokens -serializeSession true true Serializzazione valori in sessione (REDIS) -SiteName iis02/site_name iis02/site_name Nome sito -enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default -doShrinkFolder true true Imposta compressione area LOGS \ No newline at end of file diff --git a/MP-TAB/example-favicon.ico b/MP-TAB/example-favicon.ico deleted file mode 100644 index 4f0e0ad0..00000000 Binary files a/MP-TAB/example-favicon.ico and /dev/null differ diff --git a/MP-TAB/images/LogoMapoFull.png b/MP-TAB/images/LogoMapoFull.png new file mode 100644 index 00000000..3d766f04 Binary files /dev/null and b/MP-TAB/images/LogoMapoFull.png differ diff --git a/MP-TAB/mongocrypt.dll b/MP-TAB/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MP-TAB/mongocrypt.dll and /dev/null differ diff --git a/MP-TAB/packages.config b/MP-TAB/packages.config index 6e164383..3e8edfd1 100644 --- a/MP-TAB/packages.config +++ b/MP-TAB/packages.config @@ -43,8 +43,8 @@ - - + + diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index c9adde18..20b592bf 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -3384,9 +3384,16 @@ namespace MapoDb bool answ = false; // recupero items... List dcList = getCurrObjItems(idxMacchina); + List list2Update = new List(); // cerco quello da aggiornare objItem trovato = dcList.Find(obj => obj.uid == Original_uid); - List list2Update = new List(); + // se non trova --> crea ed aggiunge... + if(trovato==null) + { + dcList.Add(new objItem() { uid = Original_uid }); + trovato = dcList.Find(obj => obj.uid == Original_uid); + } + // se trovato procedo if (trovato != null) { diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 21bb1fbb..c4fd9862 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -128,11 +128,13 @@ ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2011.748\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll + True - - ..\packages\SteamWare.Logger.5.0.2011.748\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2012.750\lib\net462\SteamWare.Logger.dll + True diff --git a/MapoDb/app.config b/MapoDb/app.config index 839fd88c..17e8394a 100644 --- a/MapoDb/app.config +++ b/MapoDb/app.config @@ -5,26 +5,13 @@
- - - - - - - + + + + + + + diff --git a/MapoDb/packages.config b/MapoDb/packages.config index d84e0401..a895ef1b 100644 --- a/MapoDb/packages.config +++ b/MapoDb/packages.config @@ -21,8 +21,8 @@ - - + + diff --git a/WebConfigSetter/Program.cs b/WebConfigSetter/Program.cs index f7557983..187427b2 100644 --- a/WebConfigSetter/Program.cs +++ b/WebConfigSetter/Program.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using System; using System.IO; +using System.Reflection; using System.Xml; namespace WebConfigSetter @@ -20,7 +21,7 @@ namespace WebConfigSetter #region Protected Properties - protected static string baseDir { get; set; } = @"c:\Steamware\WebConfigSetter"; + protected static string baseDir { get; set; } = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);//@"c:\Steamware\WebConfigSetter"; #if DEBUG protected static string baseWebAppDir { get; set; } = @"\\iis02\c$\inetpub\wwwroot\MP\"; #else @@ -30,7 +31,6 @@ namespace WebConfigSetter protected static string confDir { get; set; } = $@"{baseDir}\CONF"; protected static string currentSetFile { get; set; } = $@"{confDir}\default.json"; - protected static string globalConfFile { get; set; } = $@"{confDir}\settings.json"; /// /// modalità scrittura (altrimenti legge e carica conf parsando i files)