From a0be0957591f41d98cc502aef8c2db558545edc7 Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Fri, 8 Feb 2019 16:41:25 +0100
Subject: [PATCH] Fix alarm history

---
 Client.Utils/Constants.cs                     |   3 ++-
 Client/Browser_Tools/BrowserJSObject.cs       |  11 +++++++++++
 Libs/CMS_CORE_Library.dll                     | Bin 9129472 -> 9129472 bytes
 Step.Config/Config/serverConfig.xml           |   4 ++--
 Step.Database/Controllers/AlarmsController.cs |   8 ++++----
 Step.NC/NcHandler.cs                          |   2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Client.Utils/Constants.cs b/Client.Utils/Constants.cs
index bd89531a..f3e204bc 100644
--- a/Client.Utils/Constants.cs
+++ b/Client.Utils/Constants.cs
@@ -21,7 +21,8 @@ namespace Client.Utils
         public static String CEF_EXCEPTIONLOG_PATH      = BASE_PATH + "ExceptionLog";
         public static String errorPageFile              = BASE_PATH + "error.pg";
         public static String JOB_OPENING_PATH           = "C:\\CMS\\ACTIVE\\TMP\\clientTmpJob\\";
-        
+        public static string PART_PRG_FOLDER           = "C:\\PartPrg";
+
         //Config Names
         public const string CONFIG_KEY              = "Config";
         public const string CLIENT_CONFIG_KEY       = "Client";
diff --git a/Client/Browser_Tools/BrowserJSObject.cs b/Client/Browser_Tools/BrowserJSObject.cs
index 048ba332..59f8df40 100644
--- a/Client/Browser_Tools/BrowserJSObject.cs
+++ b/Client/Browser_Tools/BrowserJSObject.cs
@@ -294,6 +294,17 @@ namespace CMS_Client.Browser_Tools
                 Path = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\",
                 Type = "SPFO"
             });
+
+            if (Directory.Exists(PART_PRG_FOLDER))
+            {
+                drivelist.Add(new Drive()
+                {
+                    Name = ElaborateName("PartPrg", DriveType.Unknown),
+                    Path = PART_PRG_FOLDER + "\\",
+                    Type = "SPFO"
+                });
+            }
+
             e.SetReturnValue(JsonConvert.SerializeObject(drivelist));
         }
 
diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index f819f25a94d6422a953199021623757e7c487b2f..46f94b66ee5df429d8d92f25c5fdebf6a1161b7f 100644
GIT binary patch
delta 587
zcmWm0$ybd506_8gRfeZhPf{TbGG?ALOFS7e&oWP$LS{;Zi(U&B&bP5)X;`Lvj?Qsd
z+F4jQ4LgUee?UHq-?_K-<@=1*$g?Nug~|H1R97m<?+xn0SG_?=FgyI*8zh5YVZ1LW
z%Xt^XVzJ?g%;$MoiL9zHtm+G%1(U<C|MMa|*dH7T#)UooL1j+O-@(C_vb0!6Uc54v
zh=+-tL2)>6F)jOX$v_ZEi=;;~B10lWBf}!YBk}H%ff3(+<fh&}YX9E+wYuX0$<l_3
zY|O+gjAkU}U@j(b6z1V*%*QcUfQ49uV{sgg$6}m-C0L4OSdJ610w>{QoPtwv8cxSb
zoPjfO7S6^wI2Y&Pd|ZGFaS<-YC0K<^aTzYh6}S>t;c8ri)wmXGa2>A4ByPZ3+=!cS
zGj72;+=|<9JMO@pxC?jV9^8xja6cZvgLnw*@h~32qj(ID;|V;8r|>kM!L!(a=kPpU
zz>9bZ8}Tw;!K>JW*YG;tz?*mrZ{r=ji}$b@Tkt-%VjH&O1AK^&5PXbJ@aYFTdOFh!
jlJ()Inp9D4<E-w*uYdlj?RxX2>0?!AdH3&{RAKxdWGfK~

delta 588
zcmWmC$y1I20D$rDt<a~aPlYUfvV}y}WM3jg+1JRv@B5kxkEIT|c$qO~9L%^l(qou0
zt`25$GZk(ae}ID-c{}{(`3IhcCoj_)BCU5*pDwR$Y<|@o<aGo!;j@k)8I*<}I)cjJ
zXBh7c3bS4Yu~;lUk?|lWGm%;TC@k*`T7#nSV^1E2+q;6glw@xBwks&kTJo>EyS^|b
zmX;GQjwRw@bxTkXem|a)aVPmTh@?bPBWaOdk=~I$k@QHsE%~)?`<LtkFaCz<9qpCx
zN~S#i@%zai%)m_Shy5`NvoV1KFb8un4+r8P9E|xm1c%}<9F7H;#1UACBXJat#xXb+
zi*Ou{#|c=B6R`v*;bbhuDL56U;dGpVGqDV3VL8smIXD;R;e1?x3vm%H#wA#ROK}-i
z;&NPpE3pb!;cBeL8eD^GaUHJ54Y(0E;bz=|TX7q1$6DNhJFyOT;cnc6dvPD`#{+l}
z58+`vf=BTf9>)`S5>Mf2JcDQP9G=Guco8q*WxRq{@fu#odc1)R*oaMd6K~;d1n=No
qy!YDs?^=2e3Ex*V=VzB?erx)ao>=xg|JSIh&u<FbepWOOj{gVT#S=dO

diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml
index 963b65d2..b3ae8dcb 100644
--- a/Step.Config/Config/serverConfig.xml
+++ b/Step.Config/Config/serverConfig.xml
@@ -16,7 +16,7 @@
     <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
     <databaseAddress>localhost</databaseAddress>
     <autoOpenCmsClient>false</autoOpenCmsClient>
-    <MTCFolderPath></MTCFolderPath>
-    <MTCApplicationName></MTCApplicationName>
+    <MTCFolderPath>C:\CMS\MTC\ADAPTER\</MTCFolderPath>
+    <MTCApplicationName>SCMA</MTCApplicationName>
   </serverConfig>
 </serverConfig>
\ No newline at end of file
diff --git a/Step.Database/Controllers/AlarmsController.cs b/Step.Database/Controllers/AlarmsController.cs
index e61748d4..6a0f9ea9 100644
--- a/Step.Database/Controllers/AlarmsController.cs
+++ b/Step.Database/Controllers/AlarmsController.cs
@@ -54,7 +54,7 @@ namespace Step.Database.Controllers
             var occurrencesQuery = dbCtx
                 .AlarmOccurrences
                 .OrderBy(x => x.AlarmOccurrenceId)
-                .Include("Users")   
+                .Include("Users")
                 .Where(x =>
                     x.TimeStamp >= startDate && x.TimeStamp <= endDate // Filter by date
                     && sources.Contains(x.Source) // Check source
@@ -62,10 +62,10 @@ namespace Step.Database.Controllers
                     && 
                     ((x.Source == ALARM_SOURCE.NC && ncAlarmDescIds.Contains(x.AlarmDescriptionId.Value)) // Check if message is contained in NC messages
                     || (x.Source == ALARM_SOURCE.PLC && plcAlarmDescIds.Contains(x.AlarmId))) // Check if message is contained in PLC messages
-                 );
-
-            pages = occurrencesQuery.Count() / pageSize;
+                 ).OrderByDescending(t => t.TimeStamp);
 
+            double tmpPages = occurrencesQuery.Count() / pageSize;
+            pages = (int)Math.Ceiling(tmpPages);
 
             var paginatedQuery = occurrencesQuery
                 .Skip(page * pageSize) // Paginate
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index d50fbe76..417171b6 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -2539,7 +2539,7 @@ namespace Step.NC
                         SCADA_MEM_TYPE type = SupportFunctions.GetMemTypeFromString(layer.Inputs[i].Status.Type);
                         // Read value from PLC
                         cmsError = numericalControl.PLC_RScadaValue(layer.Inputs[i].Status.MemValueIndex, type, ref val2);
-                        if (cmsError.IsError())
+                        if (cmsError.IsError()) 
                             return cmsError;
 
                         // if type is real approximate to configurated decimal digits