diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 5339860..1af18da 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2917
+ 1.2.2303.2918
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 38c9c14..6c0cfba 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2303.2917
+ Version: 1.2.2303.2918
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 53535f5..4236344 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2917
+1.2.2303.2918
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index b7370d6..5b6feac 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2917
+ 1.2.2303.2918
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index cc50ad3..02a0943 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2917
+ 1.2.2303.2918
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 38c9c14..6c0cfba 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2303.2917
+ Version: 1.2.2303.2918
Release Note:
-
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 53535f5..4236344 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2917
+1.2.2303.2918
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 245aaa4..64f86ce 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2917
+ 1.2.2303.2918
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.DECODER/appsettings.json b/MP.MONO.DECODER/appsettings.json
index 169f800..44049a0 100644
--- a/MP.MONO.DECODER/appsettings.json
+++ b/MP.MONO.DECODER/appsettings.json
@@ -43,6 +43,6 @@
"BlinkCount": 3,
"DbSampleInt": 60,
"BlinkPeriodMSec": 2000,
- "NumDay2Keep": 366
+ "NumDay2Keep": 365
}
}
diff --git a/MP.MONO.DECODER/appsettings.multiax.json b/MP.MONO.DECODER/appsettings.multiax.json
index 5d4ac84..abfa834 100644
--- a/MP.MONO.DECODER/appsettings.multiax.json
+++ b/MP.MONO.DECODER/appsettings.multiax.json
@@ -39,6 +39,9 @@
"AlarmMode": "RawList",
"AlarmRegexp": "^{[\\d\\w\\:\\ \\.\\/\\(\\)]*}",
"BlinkCount": 10,
- "DbSampleInt": 60
+ "DbSampleInt": 60,
+ //"AlarmLogActive": false,
+ "BlinkPeriodMSec": 2000,
+ "NumDay2Keep": 365
}
}
\ No newline at end of file
diff --git a/MP.MONO.DECODER/appsettings.office.json b/MP.MONO.DECODER/appsettings.office.json
index 252c28a..44049a0 100644
--- a/MP.MONO.DECODER/appsettings.office.json
+++ b/MP.MONO.DECODER/appsettings.office.json
@@ -33,6 +33,16 @@
}
},
"OptPar": {
- "AlarmMode": "RawList"
+ "AlarmLogActive": false,
+ "AlarmCleanPre": "",
+ "AlarmCleanPost": "",
+ "AlarmIgnoreEmpty": true,
+ "AlarmMode": "RawList",
+ "AlarmRegexp": "^{[\\d\\w\\:\\ \\.\\/\\(\\)]*}",
+ //"AlarmRegexp": "^{.*}",
+ "BlinkCount": 3,
+ "DbSampleInt": 60,
+ "BlinkPeriodMSec": 2000,
+ "NumDay2Keep": 365
}
}
diff --git a/MP.MONO.Data/SqlScripts/Stored/stp_paretoStatus.sql b/MP.MONO.Data/SqlScripts/Stored/stp_paretoStatus.sql
index bc614e6..6ff2e85 100644
--- a/MP.MONO.Data/SqlScripts/Stored/stp_paretoStatus.sql
+++ b/MP.MONO.Data/SqlScripts/Stored/stp_paretoStatus.sql
@@ -1,7 +1,3 @@
----- stored
---DELIMITER //
---GO
-
CREATE OR REPLACE PROCEDURE stp_paretoStatus(
IN machine_id INT,
IN dt_from DATETIME,
@@ -15,9 +11,4 @@ BEGIN
AND DtRif >= dt_from
AND DtRif <= dt_to
GROUP BY CodStatus;
-END;
---//
---GO
-
---DELIMITER ;
---GO
\ No newline at end of file
+END;
\ No newline at end of file
diff --git a/MP.MONO.Data/SqlScripts/Stored/stp_removeOldData.sql b/MP.MONO.Data/SqlScripts/Stored/stp_removeOldData.sql
index d7288b1..696fafa 100644
--- a/MP.MONO.Data/SqlScripts/Stored/stp_removeOldData.sql
+++ b/MP.MONO.Data/SqlScripts/Stored/stp_removeOldData.sql
@@ -1,14 +1,11 @@
----- stored
---DELIMITER //
-
CREATE OR REPLACE PROCEDURE stp_removeOldData(
IN day_keep INT
)
READS SQL DATA
BEGIN
- SET @adesso = ADDDATE(CURRENT_DATE(), INTERVAL -1 SECOND);
- SET @dt_min = ADDDATE(CURRENT_DATE(), INTERVAL -day_keep DAY);
+ SET @adesso = ADDDATE(CURRENT_TIMESTAMP, INTERVAL -1 SECOND);
+ SET @dt_min = ADDDATE(CURRENT_TIMESTAMP, INTERVAL -day_keep DAY);
START TRANSACTION;
@@ -17,36 +14,36 @@ BEGIN
FROM AlarmLog
WHERE DtRif <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
- SELECT CURRENT_DATE() AS DtRif
+ SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup AlarmLog' AS CodTask
- ,'Deleted' + ROW_COUNT() +' rows' AS Result;
+ ,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
-- AlarmRec
DELETE
FROM AlarmRec
WHERE DtStart <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
- SELECT CURRENT_DATE() AS DtRif
+ SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup AlarmRec' AS CodTask
- ,'Deleted' + ROW_COUNT() +' rows' AS Result;
+ ,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
-- DataLog
DELETE
FROM DataLog
WHERE DtRif <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
- SELECT CURRENT_DATE() AS DtRif
+ SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup DataLog' AS CodTask
- ,'Deleted' + ROW_COUNT() +' rows' AS Result;
+ ,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
-- StatusLog
DELETE
FROM StatusLog
WHERE DtRif <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
- SELECT CURRENT_DATE() AS DtRif
+ SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup StatusLog' AS CodTask
- ,'Deleted' + ROW_COUNT() +' rows' AS Result;
+ ,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
COMMIT;
@@ -57,6 +54,3 @@ BEGIN
WHERE DtRif > @adesso;
END
---//
-
---DELIMITER ;
\ No newline at end of file
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 894e4ad..332ec43 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2917
+ 1.2.2303.2918
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index 38c9c14..6c0cfba 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2303.2917
+ Version: 1.2.2303.2918
Release Note:
-
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 53535f5..4236344 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2917
+1.2.2303.2918
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index e817747..6facd3d 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2917
+ 1.2.2303.2918
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 0d54f8d..d4a67ab 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2917
+ 1.2.2303.2918
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 38c9c14..6c0cfba 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2303.2917
+ Version: 1.2.2303.2918
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 53535f5..4236344 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2917
+1.2.2303.2918
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index a0406c5..cc2108b 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2917
+ 1.2.2303.2918
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false