diff --git a/MP-INVE.sln b/MP-INVE.sln index e20c38d2..8f4a7aeb 100644 --- a/MP-INVE.sln +++ b/MP-INVE.sln @@ -14,6 +14,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.INVE", "MP.INVE\MP.INVE. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{84B1B205-AAC2-451C-914E-992CE8BA5B58}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{F26867FD-E419-41C5-9AAE-29F40C050EB5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{5728AB68-0D7A-49B7-904A-987AC81B5D69}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -32,6 +36,14 @@ Global {84B1B205-AAC2-451C-914E-992CE8BA5B58}.Debug|Any CPU.Build.0 = Debug|Any CPU {84B1B205-AAC2-451C-914E-992CE8BA5B58}.Release|Any CPU.ActiveCfg = Release|Any CPU {84B1B205-AAC2-451C-914E-992CE8BA5B58}.Release|Any CPU.Build.0 = Release|Any CPU + {F26867FD-E419-41C5-9AAE-29F40C050EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F26867FD-E419-41C5-9AAE-29F40C050EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F26867FD-E419-41C5-9AAE-29F40C050EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F26867FD-E419-41C5-9AAE-29F40C050EB5}.Release|Any CPU.Build.0 = Release|Any CPU + {5728AB68-0D7A-49B7-904A-987AC81B5D69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5728AB68-0D7A-49B7-904A-987AC81B5D69}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5728AB68-0D7A-49B7-904A-987AC81B5D69}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5728AB68-0D7A-49B7-904A-987AC81B5D69}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-IOC.sln b/MP-IOC.sln index a64b294c..79a1497f 100644 --- a/MP-IOC.sln +++ b/MP-IOC.sln @@ -7,6 +7,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.IOC", "MP.IOC\MP.IOC.csproj", "{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +25,14 @@ Global {B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Release|Any CPU.Build.0 = Release|Any CPU + {7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Release|Any CPU.Build.0 = Release|Any CPU + {DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-LAND.sln b/MP-LAND.sln index c14fcb70..b70653da 100644 --- a/MP-LAND.sln +++ b/MP-LAND.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{8BBD39D5-9390-4EBA-979B-954DC8FFC850}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{DE935A48-5E0F-4AD4-953F-8820565BF616}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_LiManDebug|Any CPU = Debug_LiManDebug|Any CPU @@ -50,6 +52,12 @@ Global {8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Release|Any CPU.Build.0 = Release|Any CPU + {DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug|Any CPU + {DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug_LiManDebug|Any CPU.Build.0 = Debug|Any CPU + {DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE935A48-5E0F-4AD4-953F-8820565BF616}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DE935A48-5E0F-4AD4-953F-8820565BF616}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-MON/MP-MON/MP-MON.csproj b/MP-MON/MP-MON/MP-MON.csproj index 965aeef5..be746acb 100644 --- a/MP-MON/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON/MP-MON.csproj @@ -21,6 +21,10 @@ + + + + diff --git a/MP-MON/MP-MON/Properties/PublishProfiles/IIS01.pubxml b/MP-MON/MP-MON/Properties/PublishProfiles/IIS01.pubxml index 038fbe75..4a965ff7 100644 --- a/MP-MON/MP-MON/Properties/PublishProfiles/IIS01.pubxml +++ b/MP-MON/MP-MON/Properties/PublishProfiles/IIS01.pubxml @@ -8,12 +8,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true Release Any CPU - https://iis01.egalware.com/MP/MON8 + https://iis01.egalware.com/MP/MON/ false 82fd7cf4-42a2-499c-88fc-46502d166f70 false https://iis01.egalware.com:8172/MsDeploy.axd - Default Web Site/MP/MON8 + Default Web Site/MP/MON false WMSVC diff --git a/MP-MON6.sln b/MP-MON6.sln index 4e8c2f87..bbfc9c02 100644 --- a/MP-MON6.sln +++ b/MP-MON6.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Mon", "MP.Mon\MP.Mon.csproj", "{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Mon", "MP.Mon6\MP.Mon.csproj", "{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MP-SPEC.sln b/MP-SPEC.sln index 6254dfdb..f1a6e497 100644 --- a/MP-SPEC.sln +++ b/MP-SPEC.sln @@ -12,6 +12,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{15231E76-5A27-4D4E-982C-17A886A9EEB8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{1887A0C0-679E-4535-90D4-60DAA428D019}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -26,6 +30,14 @@ Global {C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU {C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU {C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.Build.0 = Release|Any CPU + {15231E76-5A27-4D4E-982C-17A886A9EEB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15231E76-5A27-4D4E-982C-17A886A9EEB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15231E76-5A27-4D4E-982C-17A886A9EEB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15231E76-5A27-4D4E-982C-17A886A9EEB8}.Release|Any CPU.Build.0 = Release|Any CPU + {1887A0C0-679E-4535-90D4-60DAA428D019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1887A0C0-679E-4535-90D4-60DAA428D019}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1887A0C0-679E-4535-90D4-60DAA428D019}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1887A0C0-679E-4535-90D4-60DAA428D019}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-STATS.sln b/MP-STATS.sln index 30bbf192..33e62912 100644 --- a/MP-STATS.sln +++ b/MP-STATS.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.TaskMan", "MP.TaskMan\MP EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{BC94E319-A622-497C-BEE1-BB3D77170A6D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{3E74B94B-82B6-434B-AADA-875845ED193B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +35,10 @@ Global {BC94E319-A622-497C-BEE1-BB3D77170A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC94E319-A622-497C-BEE1-BB3D77170A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {BC94E319-A622-497C-BEE1-BB3D77170A6D}.Release|Any CPU.Build.0 = Release|Any CPU + {3E74B94B-82B6-434B-AADA-875845ED193B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E74B94B-82B6-434B-AADA-875845ED193B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E74B94B-82B6-434B-AADA-875845ED193B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E74B94B-82B6-434B-AADA-875845ED193B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-TAB3.sln b/MP-TAB3.sln index 0f46b0a4..04dc54b2 100644 --- a/MP-TAB3.sln +++ b/MP-TAB3.sln @@ -12,6 +12,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB3", "MP-TAB3\MP-TAB3.csproj", "{E7A7C262-7807-4503-949D-5A6FE3DF4400}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{286528F4-7753-4615-96A7-1F558EE5563B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{D87FBE3B-F95F-47AD-8874-184500CEEC85}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -26,6 +30,14 @@ Global {E7A7C262-7807-4503-949D-5A6FE3DF4400}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7A7C262-7807-4503-949D-5A6FE3DF4400}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7A7C262-7807-4503-949D-5A6FE3DF4400}.Release|Any CPU.Build.0 = Release|Any CPU + {286528F4-7753-4615-96A7-1F558EE5563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {286528F4-7753-4615-96A7-1F558EE5563B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {286528F4-7753-4615-96A7-1F558EE5563B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {286528F4-7753-4615-96A7-1F558EE5563B}.Release|Any CPU.Build.0 = Release|Any CPU + {D87FBE3B-F95F-47AD-8874-184500CEEC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D87FBE3B-F95F-47AD-8874-184500CEEC85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D87FBE3B-F95F-47AD-8874-184500CEEC85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D87FBE3B-F95F-47AD-8874-184500CEEC85}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index cded50df..e162cf27 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -19,10 +19,6 @@ - - - - @@ -58,8 +54,4 @@ - - - - \ No newline at end of file diff --git a/MP.Data/Objects/Enums.cs b/MP.Data/Objects/Enums.cs deleted file mode 100644 index bcbb7e0f..00000000 --- a/MP.Data/Objects/Enums.cs +++ /dev/null @@ -1,500 +0,0 @@ -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; - -namespace MP.Data.Objects -{ - public class Enums - { - #region Public Enums - - /// - /// Intervallo dati (es per definizione quanti dati FluxLog tenere x intervallo) - /// - public enum DataInterval - { - minute, - hour, - day - } - - public enum DataItemCategory - { - CONDITION = 0, - EVENT = 1, - SAMPLE = 2 - } - - /// - /// Tipo di esito (generico) - /// - public enum esitoExec - { - undone, - ok, - error - } - - /// - /// Tipo di IOB - /// - public enum IobType - { - /// - /// Non definito - /// - ND, - - /// - /// IOB rPI - /// - rPi, - - /// - /// IOB Windows - /// - WIN - } - - public enum modBusAddrType - { - /// - /// ModBus Coil 0xxxxx (booleano) - OUT R/W - /// - Coil = 0, - - /// - /// ModBus Input discreto 1xxxxx (booleano) - IN R - /// - DiscreteInput = 1, - - /// - /// ModBus Input Register 3xxxxx (int[] convertibile a vari int/real) - IN R - /// - InputRegister = 3, - - /// - /// ModBus Holding Register 4xxxxx (int[] convertibile a vari int/real) - OUT R/W - /// - HoldingRegister = 4 - } - - /// - /// Elenco dei tipi di valore gestiti da PLC (inizialmente SIEMENS) - /// - public enum plcDataType - { - /// - /// Tipo boolean - /// - Boolean, - - /// - /// Tipo Int16 intero 16bit - /// - Int, - - /// - /// Tipo UInt16 reversed LowHigh - /// - IntLH, - - /// - /// Tipo Int32 intero 32bit - /// - DInt, - - /// - /// Tipo UInt32 reversed LowHigh - /// - DIntLH, - - /// - /// Tipo UInt16, intero 16bit - /// - Word, - - /// - /// Tipo UInt32, intero Unsigned 32bit - /// - DWord, - - /// - /// Tipo REAL 32 bit - /// - Real, - - /// - /// Tipo REAL 32 bit standard (HighLow) - sinonimo di Real, creato x simmetria con caso LH - /// - RealHL, - - /// - /// Tipo REAL 32 bit con swap byte (LowHigh) al posto del normale caso HL (HighLow) - /// - RealLH, - - /// - /// Tipo stringa - /// - String, - - /// - /// Timpo intero da High/Low Bit positivo (high bit va moltiplicato x 32768 = Uint16Max/2) - /// - HLPInt, - - /// - /// Tipo FLOAT 32 bit con endiannes standard (es modbus) - /// https://www.scadacore.com/tools/programming-calculators/online-hex-converter/ Float - /// - Big Endian (ABCD) - /// - FloatABCD, - - /// - /// Tipo FLOAT 32 bit con endiannes NON standard (es modbus) - /// https://www.scadacore.com/tools/programming-calculators/online-hex-converter/ Float - /// - Mid-Big Endian (BADC) - /// - FloatBADC, - - /// - /// Tipo FLOAT 32 bit con endiannes NON standard (es modbus) - /// https://www.scadacore.com/tools/programming-calculators/online-hex-converter/ Float - /// - Mid-Little Endian (CDAB) - /// - FloatCDAB, - - /// - /// Tipo FLOAT 32 bit con endiannes NON standard (es modbus) - /// https://www.scadacore.com/tools/programming-calculators/online-hex-converter/ Float - /// - Little Endian (DCBA) - /// - FloatDCBA, - - /// - /// Valore bitmap, inteso come array di bit ognuno da trattare come uno stato on/off - /// indipendente e sommabile (es allarmi) - /// - BitMap, - - /// - /// Tipo Byte 8 bit equivalente a BitMap - /// - Byte, - - /// - /// Tipo UInt16 intero senza segno 16bit - /// - UInt, - - /// - /// Tipo UInt32 intero senza segno 32bit - /// - UDInt - } - - /// - /// Tipologia dato Raw Transfer - /// - /// serializzazione Native [JsonConverter(typeof(JsonStringEnumConverter))] serializzazione - /// Newtonsoft json [JsonConverter(typeof(StringEnumConverter))] - [JsonConverter(typeof(StringEnumConverter))] - public enum rawTransfType - { - ND = 0, - - /// - /// Icoel: Batch info - /// - IcoelBatch, - - /// - /// Icoel: Variety + layout info relative - /// - IcoelVarInfo, - - /// - /// Info tipo tabella RegGiacenze (MAG) - /// - RegGiacenze - } - - /// - /// Enumerazione tipi di semaforo - /// - public enum Semaforo - { - /// - /// Stato non definito - /// - ND, - - /// - /// Verde - /// - SV, - - /// - /// Giallo - /// - SG, - - /// - /// Rosso - /// - SR, - - /// - /// Grigio/Spento - /// - SS - } - - /// - /// Elenco task ammessi (x IOB-WIN da eseguire...) - /// - public enum taskType - { - /// - /// Task nullo / fake - /// - nihil, - - /// - /// Rimanda a PLC eventuale segnale NON in setup (MA NON RESETTA) - /// - fixStopSetup, - - /// - /// Indica al PLC di forzare il reset del contapezzi - /// - forceResetPzCount, - - /// - /// Indica al PLC di forzare il NUOVO valore di contapezzi (impostato come value) - /// - forceSetPzCount, - - /// - /// Imposta Articolo su PLC - /// - setArt, - - /// - /// Imposta Articolo IN MODALITA' NUMERICA su PLC - /// - setArtNum, - - /// - /// Imposta Commessa su PLC - /// - setComm, - - /// - /// Imposta Commessa IN MODALITA' NUMERICA su PLC - /// - setCommNum, - - /// - /// Set di un PARAMETRO su PLC (in value avremo un JSON object) - /// - setParameter, - - /// - /// Set Programma CNC su PLC - /// - setProg, - - /// - /// Indica al PLC di impostare il numero di pezzi da produrre per la commessa (impostato - /// come value) - /// - setPzComm, - - /// - /// Indica al PLC iniziato setup (e secondo casi ferma contapezzi /resetta) - /// - startSetup, - - /// - /// Indica al PLC finito setup (e secondo casi ferma contapezzi /resetta) - /// - stopSetup, - - /// - /// Richiesta invio watchdog a PLC - /// - sendWatchDogMes2Plc, - - /// - /// Indica che è FINITA la produzione (e quindi cancello dati backup) - /// - endProd, - - /// - /// Richiesta esecuzione di un sync dei dati DB di frontiera - /// - syncDbData, - - /// - /// Imposta Fornitore (es grower x ICOEL) - /// - setSupplier, - - /// - /// Effettua processing other info (es ritorno consumi x ricette FIMAT) - /// - processOtherInfo - } - - /// - /// Finestra temporale di aggregazione dati VC - /// - public enum timeWindow - { - free, - hour, - day, - week, - month - } - - public enum tipoBarcode - { - /// - /// tipo non riconosciuto - /// - nd, - - /// - /// identifica una matricola operatore nel formato OPxxxxx (xxxxx è un intero che - /// rappresenta la matricola, std fino a 8 cifre) - /// - matrOperatore, - - /// - /// identifica un cartellino di tipo CodArticolo - /// - codArticolo, - - /// - /// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione - /// - attrezzaggio, - - /// - /// identifica un codice per le attività di conferma produzione/fermi - /// - confermaProduzione, - - /// - /// identifica un cartellino di dichiarazione fermata nel formato FExxxx dove xxxx è - /// idxEvento dichiarato... - /// - dichiaraFermata, - - /// - /// indentifica un codice di modifica turno - /// - modificaTurno - } - - /// - /// tipologia di evento (generico) segnalato - /// - public enum tipoEvento - { - /// - /// evento di reset - /// - reset, - - /// - /// richiesta editing - /// - edit, - - /// - /// nuova selezione - /// - selection, - - /// - /// eliminazione record(s) - /// - delete - } - - /// - /// tipologia evento inviato - /// - public enum tipoInputEvento - { - barcode, - hw, - commento - } - - /// - /// Tipologia di selettore - /// - public enum tipoSelettore - { - articoli - } - - /// - /// Trasformazione VC da effettuare - /// - public enum ValSelection - { - /// - /// Selezione PRIMO valore del set - /// - First, - - /// - /// Selezione Moda (norma) = elemento centrale - /// - Center, - - /// - /// Selezione ULTIMO valore del set - /// - Last - } - - /// - /// Tipologia di elaborazione/funzione da applicare a VC - /// - public enum VC_func - { - /// - /// Valore puntuale - /// - POINT = 0, - - /// - /// Valore medio del periodo - /// - AVG, - - /// - /// Valore massimo del periodo - /// - MAX, - - /// - /// Valore minimo del periodo - /// - MIN, - - /// - /// Calcolo della mediana del periodo - /// - MEDIAN - } - - #endregion Public Enums - } -} \ No newline at end of file diff --git a/MP.Data/Objects/IOB_data.cs b/MP.Data/Objects/IOB_data.cs deleted file mode 100644 index b32ed9be..00000000 --- a/MP.Data/Objects/IOB_data.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static MP.Data.Objects.Enums; - -namespace MP.Data.Objects -{ - /// - /// Dati resoconto IOB - /// - public class IOB_data - { - #region Public Fields - - public bool CNC_Counter { get; set; } = false; - public string IP { get; set; } = "::1"; - public IobType iType { get; set; } = IobType.ND; - public string name { get; set; } = "ND"; - public string typeCss { get; set; } = "fa fa-question-circle-o"; - - #endregion Public Fields - } -} diff --git a/MP.Data/Objects/InputComandoMapo.cs b/MP.Data/Objects/InputComandoMapo.cs deleted file mode 100644 index 206d920b..00000000 --- a/MP.Data/Objects/InputComandoMapo.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MP.Data.Objects -{ - /// - /// Struttura gestione comandi di input - /// - public struct inputComandoMapo - { - #region Public Fields - - /// - /// descrizione comando - /// - public string descrComando; - - /// - /// idx evento associato al comando - /// - public int idxTipoEvento; - - /// - /// input comando valido si/no - /// - public bool isValid; - - /// - /// refresh stato macchina encessario si/no - /// - public bool needStatusRefresh; - - /// - /// valore di output dal comando - /// - public string outValue; - - /// - /// input precedente - /// - public string precInput; - - /// - /// testo da mostrare all'utente - /// - public string text2show; - - /// - /// lista del nome dei WebBrowserBox e delle relative url, nel formato {0}##{1} {0}=nome - /// WebBrowserBox (es. box01), {1}=url relativo (es. http://server/MoonPro/Produzione.aspx?idxMacchina=99) - /// - public string[] wBrowsBoxUrls; - - #endregion Public Fields - - #region Public Methods - - public static bool operator !=(inputComandoMapo left, inputComandoMapo right) - { - return !(left == right); - } - - public static bool operator ==(inputComandoMapo left, inputComandoMapo right) - { - return left.Equals(right); - } - - public override bool Equals(object obj) - { - if (!(obj is inputComandoMapo item)) - return false; - - if (descrComando != item.descrComando) - return false; - if (idxTipoEvento != item.idxTipoEvento) - return false; - if (isValid != item.isValid) - return false; - if (needStatusRefresh != item.needStatusRefresh) - return false; - if (outValue != item.outValue) - return false; - if (precInput != item.precInput) - return false; - if (text2show != item.text2show) - return false; - if (wBrowsBoxUrls != item.wBrowsBoxUrls) - return false; - - return true; - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } - - #endregion Public Methods - } -} diff --git a/MP.Data/Objects/StCheckOverride.cs b/MP.Data/Objects/StCheckOverride.cs deleted file mode 100644 index 71c381f8..00000000 --- a/MP.Data/Objects/StCheckOverride.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MP.Data.Objects -{ - public class StCheckOverride - { - #region Public Properties - - public bool CanForce { get; set; } = false; - public string CodGruppo { get; set; } = ""; - public string CodTipo { get; set; } = ""; - public int IdxST { get; set; } = 0; - public int Num { get; set; } = 0; - public int Oggetto { get; set; } = 0; - public string Utente { get; set; } = ""; - - #endregion Public Properties - } -} diff --git a/MP.FileData/MP.FileData.csproj b/MP.FileData/MP.FileData.csproj index b52cf743..c4884545 100644 --- a/MP.FileData/MP.FileData.csproj +++ b/MP.FileData/MP.FileData.csproj @@ -6,13 +6,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs index 900957a1..5cfdb305 100644 --- a/MP.INVE/Components/CmpTop.razor.cs +++ b/MP.INVE/Components/CmpTop.razor.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Data.DTO; using MP.INVE.Data; +using MP.Core.DTO; namespace MP.INVE.Components { diff --git a/MP.INVE/Components/NavMenuTerm.razor.cs b/MP.INVE/Components/NavMenuTerm.razor.cs index 9003a6ba..7a0f9cb0 100644 --- a/MP.INVE/Components/NavMenuTerm.razor.cs +++ b/MP.INVE/Components/NavMenuTerm.razor.cs @@ -1,21 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; -using MP.INVE.Data; -using MP.Data.DTO; +using MP.Core.DTO; using Blazored.LocalStorage; namespace MP.INVE.Components diff --git a/MP.INVE/Components/ProcOperatore.razor.cs b/MP.INVE/Components/ProcOperatore.razor.cs index 4fe5396e..63a438fa 100644 --- a/MP.INVE/Components/ProcOperatore.razor.cs +++ b/MP.INVE/Components/ProcOperatore.razor.cs @@ -1,24 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; using MP.Data.DbModels; using MP.INVE.Data; -using MP.INVE.Pages; using Blazored.LocalStorage; -using MP.Data.DTO; +using MP.Core.DTO; namespace MP.INVE.Components { diff --git a/MP.INVE/Components/ProcSess.razor.cs b/MP.INVE/Components/ProcSess.razor.cs index 14e93702..dbc32e49 100644 --- a/MP.INVE/Components/ProcSess.razor.cs +++ b/MP.INVE/Components/ProcSess.razor.cs @@ -1,24 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; using MP.Data.DbModels; using MP.INVE.Data; -using MP.INVE.Pages; using Blazored.LocalStorage; -using MP.Data.DTO; +using MP.Core.DTO; namespace MP.INVE.Components { diff --git a/MP.INVE/Data/MessageService.cs b/MP.INVE/Data/MessageService.cs index ea2a9c29..fa1ebe47 100644 --- a/MP.INVE/Data/MessageService.cs +++ b/MP.INVE/Data/MessageService.cs @@ -1,5 +1,6 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; +using MP.Core.DTO; using MP.Data.DTO; using NLog; using NLog.Fluent; diff --git a/MP.INVE/Data/MiDataService.cs b/MP.INVE/Data/MiDataService.cs index 0a8472ff..b7703c29 100644 --- a/MP.INVE/Data/MiDataService.cs +++ b/MP.INVE/Data/MiDataService.cs @@ -1,4 +1,4 @@ -using MP.Data.Conf; +using MP.Core.Conf; using MP.Data.DbModels; using Newtonsoft.Json; using NLog; diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 7901f683..300e12cb 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2410.2811 + 6.16.2503.1417 diff --git a/MP.INVE/Pages/InveSession.razor.cs b/MP.INVE/Pages/InveSession.razor.cs index 558a1d62..66bae51e 100644 --- a/MP.INVE/Pages/InveSession.razor.cs +++ b/MP.INVE/Pages/InveSession.razor.cs @@ -1,23 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; -using MP.Data.DbModels; using MP.INVE.Data; -using MP.Data.DTO; using Blazored.LocalStorage; +using MP.Core.DTO; namespace MP.INVE.Pages { diff --git a/MP.INVE/Pages/Invio.razor.cs b/MP.INVE/Pages/Invio.razor.cs index 58980747..8424870a 100644 --- a/MP.INVE/Pages/Invio.razor.cs +++ b/MP.INVE/Pages/Invio.razor.cs @@ -2,8 +2,8 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.WebUtilities; using Microsoft.JSInterop; +using MP.Core.DTO; using MP.Data.DbModels; -using MP.Data.DTO; using MP.INVE.Data; namespace MP.INVE.Pages diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs index 9bcf4fe5..6e0d76e5 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor.cs +++ b/MP.INVE/Pages/OperatoreLogin.razor.cs @@ -1,24 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP.INVE; using MP.INVE.Data; -using MP.INVE.Shared; -using MP.INVE.Components; using MP.Data.DbModels; using Blazored.SessionStorage; -using MP.Data.DTO; using Blazored.LocalStorage; +using MP.Core.DTO; namespace MP.INVE.Pages { diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 3317bfd8..c843df93 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2410.2811

+

Versione: 6.16.2503.1417


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 02a9b1b9..1b215c09 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2410.2811 +6.16.2503.1417 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index e513eaad..493c884d 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2410.2811 + 6.16.2503.1417 https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html false diff --git a/MP.IOC/Controllers/IOBController.cs b/MP.IOC/Controllers/IOBController.cs index be7837e9..0c538ddf 100644 --- a/MP.IOC/Controllers/IOBController.cs +++ b/MP.IOC/Controllers/IOBController.cs @@ -1,14 +1,7 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using MP.Data; +using Microsoft.AspNetCore.Mvc; using MP.IOC.Data; using Newtonsoft.Json; using NLog; -using NLog.Fluent; -using System.Data; -using System.Globalization; -using System.IO; namespace MP.IOC.Controllers { diff --git a/MP.IOC/Data/MpDataService.cs b/MP.IOC/Data/MpDataService.cs index 9c5306b0..92f2b3e9 100644 --- a/MP.IOC/Data/MpDataService.cs +++ b/MP.IOC/Data/MpDataService.cs @@ -1,7 +1,7 @@ -using MP.Data; -using MP.Data.Conf; +using MP.Core.Conf; +using MP.Core.DTO; +using MP.Data; using MP.Data.DbModels; -using MP.Data.DTO; using MP.Data.MgModels; using Newtonsoft.Json; using NLog; diff --git a/MP.IOC/MP.IOC.csproj b/MP.IOC/MP.IOC.csproj index caec50fe..09536823 100644 --- a/MP.IOC/MP.IOC.csproj +++ b/MP.IOC/MP.IOC.csproj @@ -24,7 +24,7 @@ - + diff --git a/MP.IOC/Resources/ChangeLog.html b/MP.IOC/Resources/ChangeLog.html index 26b3ad5e..549ab8d2 100644 --- a/MP.IOC/Resources/ChangeLog.html +++ b/MP.IOC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MP-IOC -

    Versione: 6.16.2503.810

    +

    Versione: 6.16.2503.1418


    Note di rilascio:
    • diff --git a/MP.IOC/Resources/VersNum.txt b/MP.IOC/Resources/VersNum.txt index 1177e7de..7d5437b1 100644 --- a/MP.IOC/Resources/VersNum.txt +++ b/MP.IOC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.810 +6.16.2503.1418 diff --git a/MP.IOC/Resources/manifest.xml b/MP.IOC/Resources/manifest.xml index 27c10b29..0366b656 100644 --- a/MP.IOC/Resources/manifest.xml +++ b/MP.IOC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.810 + 6.16.2503.1418 https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html false diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 09a0273f..02e22c77 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2503.1410 + 6.16.2503.1417 Debug;Release;Debug_LiManDebug en True diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 4961fa5b..e9bb5688 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo Tablet MAPO - DotNet6 -

      Versione: 6.16.2503.1410

      +

      Versione: 6.16.2503.1417


      Note di rilascio:
        diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 8ede05b5..1b215c09 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1410 +6.16.2503.1417 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 10d6da9c..ffc781ad 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1410 + 6.16.2503.1417 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index a17603e0..0fe8de28 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2503.0810 + 6.16.2503.1418 True @@ -18,16 +18,16 @@ - - + + - - + + - + diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 8c99038e..e28a21b8 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

        Versione: 6.16.2503.0810

        +

        Versione: 6.16.2503.1418


        Note di rilascio:
          diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index ecfa34c1..7d5437b1 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.0810 +6.16.2503.1418 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 0cced502..73ab0376 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.0810 + 6.16.2503.1418 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/Components/FLStatusList.razor.cs b/MP.SPEC/Components/FLStatusList.razor.cs index d86c17dc..c1493d3e 100644 --- a/MP.SPEC/Components/FLStatusList.razor.cs +++ b/MP.SPEC/Components/FLStatusList.razor.cs @@ -1,5 +1,5 @@ using global::Microsoft.AspNetCore.Components; -using MP.Data.DTO; +using MP.Core.DTO; using MP.SPEC.Data; using NLog; using static EgwCoreLib.Utils.DtUtils; diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 4abae05d..9802503a 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using MP.Core.DTO; using MP.Data.DbModels; -using MP.Data.DTO; using MP.SPEC.Data; using Newtonsoft.Json; diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 3ac14091..042f1c2f 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -1,11 +1,11 @@ using EgwCoreLib.Utils; using Microsoft.Extensions.Options; +using MP.Core.Conf; +using MP.Core.DTO; +using MP.Core.Objects; using MP.Data; -using MP.Data.Conf; using MP.Data.DbModels; -using MP.Data.DTO; using MP.Data.MgModels; -using MP.Data.Objects; using MP.Data.Services; using Newtonsoft.Json; using NLog; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 1a3e83be..48c743db 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2503.1410 + 6.16.2503.1417 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Pages/FluxLogStatus.razor.cs b/MP.SPEC/Pages/FluxLogStatus.razor.cs index dd2233f6..dc3facbd 100644 --- a/MP.SPEC/Pages/FluxLogStatus.razor.cs +++ b/MP.SPEC/Pages/FluxLogStatus.razor.cs @@ -1,6 +1,7 @@ using global::Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.Objects; +using MP.Core.DTO; +using MP.Core.Objects; using MP.SPEC.Data; using NLog; using System.Diagnostics; @@ -27,7 +28,7 @@ namespace MP.SPEC.Pages #region Protected Properties protected Dictionary actDbMaintStats { get; set; } = new Dictionary(); - protected List actProcDedupStats { get; set; } = new List(); + protected List actProcDedupStats { get; set; } = new List(); protected List fluxList { get; set; } = new List(); [Inject] diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 407fcaf8..70fa3c0c 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

          Versione: 6.16.2503.1410

          +

          Versione: 6.16.2503.1417


          Note di rilascio:
          • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 8ede05b5..1b215c09 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1410 +6.16.2503.1417 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 53f9f807..7f49ce6f 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1410 + 6.16.2503.1417 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/_Imports.razor b/MP.SPEC/_Imports.razor index fe303e7b..eb754904 100644 --- a/MP.SPEC/_Imports.razor +++ b/MP.SPEC/_Imports.razor @@ -6,7 +6,9 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using MP.Data.Objects +@using MP.Core.Conf +@using MP.Core.DTO +@using MP.Core.Objects @using MP.SPEC @using MP.SPEC.Shared @using MP.SPEC.Components diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 2d4bd3fd..8aece0ac 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -1,23 +1,15 @@ -using Microsoft.Extensions.Caching.Distributed; -using Microsoft.Extensions.Caching.Memory; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using MimeKit.Cryptography; -using MP.Data.Controllers; +using Microsoft.Extensions.Configuration; using MP.Data.DbModels; using MP.Data.Services; using Newtonsoft.Json; using NLog; -using NLog.Fluent; using StackExchange.Redis; using System; using System.Collections.Generic; using System.Data; using System.Diagnostics; using System.Linq; -using System.Text; using System.Threading.Tasks; -using static MP.Data.Objects.Enums; namespace MP.Stats.Data { diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 8c61532a..2c5c62c2 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2503.1411 - 6.16.2503.1411 + 6.16.2503.1417 + 6.16.2503.1417 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 148d5c87..ec8d4fb2 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

            Versione: 6.16.2503.1411

            +

            Versione: 6.16.2503.1417


            Note di rilascio:
              diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 42106fdb..1b215c09 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1411 +6.16.2503.1417 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 78d847a1..a05c3b50 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1411 + 6.16.2503.1417 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false