From e1d6bd1f916fbee7607f7f08d35c1ea84a071eba Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Tue, 25 Feb 2020 11:35:44 +0100
Subject: [PATCH] Fix duplicated user in alarms history

---
 Step.Database/Controllers/UsersController.cs | 9 +++++++--
 Step.Model/Constants.cs                      | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Step.Database/Controllers/UsersController.cs b/Step.Database/Controllers/UsersController.cs
index f30bc14d..ac49dcae 100644
--- a/Step.Database/Controllers/UsersController.cs
+++ b/Step.Database/Controllers/UsersController.cs
@@ -166,9 +166,13 @@ namespace Step.Database.Controllers
                 var tmpUser = dbCtx
                     .Users
                     .Where(x => x.Deleted == false) // Get not deleted users
-                    .Join(dbCtx.MachinesUsers,u=>u.UserId,m=>m.UserId, (u, m) => new { Users = u, MachinesUsers = m })
+                    .Join( dbCtx.MachinesUsers,
+                        u => u.UserId,
+                        m => m.UserId, 
+                        (u, m) => new { Users = u, MachinesUsers = m }
+                     )
                     .Where(x => x.MachinesUsers.Role.Level < MIN_CMS_ROLE)
-                    .ToList();
+                    .ToList();  
 
                 return tmpUser
                     .Select(x => new DTOMessageUserModel() // Return DTOUserModel
@@ -178,6 +182,7 @@ namespace Step.Database.Controllers
                         LastName = x.Users.LastName,
                         Username = x.Users.Username
                     })
+                    .GroupBy(elem => elem.Id).Select(group => group.First())
                     .ToList();
             }        
         }
diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs
index 27b044f9..c846eac5 100644
--- a/Step.Model/Constants.cs
+++ b/Step.Model/Constants.cs
@@ -328,7 +328,9 @@ namespace Step.Model
             "MM-dd-yyyy",
             "M/d/yyyy",
             "dd/MM/yyyy",
-            "MM/dd/yyyy"
+            "MM/dd/yyyy",
+            "dd.MM.yyyy",
+            "MM.dd.yyyy" 
         };
     }
 }
\ No newline at end of file