diff --git a/src/WorkFlowCheck.API/Controllers/SyncController.cs b/src/WorkFlowCheck.API/Controllers/SyncController.cs index 0e8fe8c..127034c 100644 --- a/src/WorkFlowCheck.API/Controllers/SyncController.cs +++ b/src/WorkFlowCheck.API/Controllers/SyncController.cs @@ -471,6 +471,30 @@ namespace WorkFlowCheck.API.Controllers return retVal; } + [HttpGet("DeviceMessageReadUnreadedRole/{roleId}")] + public async Task>> DeviceMessageReadUnreadedRole(int roleId) + { + var retVal = new ApiResponseDTO>() + { + IsSuccess = true, + }; + + var response = await _syncService.DeviceMessageReadUnreadedRole(roleId); + + if (response != null) + { + + retVal.IsSuccess = true; + retVal.Data = response; + } + else + { + retVal.IsSuccess = false; + retVal.Errors.Add("No data!"); + } + + return retVal; + } [HttpGet("Download")] public async Task DownloadAPKFileAsync() diff --git a/src/WorkFlowCheck.BL/Services/Interfaces/ISyncService.cs b/src/WorkFlowCheck.BL/Services/Interfaces/ISyncService.cs index 3331512..fdd5844 100644 --- a/src/WorkFlowCheck.BL/Services/Interfaces/ISyncService.cs +++ b/src/WorkFlowCheck.BL/Services/Interfaces/ISyncService.cs @@ -32,7 +32,8 @@ namespace WorkFlowCheck.BL.Services.Interfaces Task DeviceMessageSend(DeviceMessageDTO deviceMessageDTO); Task> DeviceMessageReadUnreaded(string deviceId); + Task> DeviceMessageReadUnreadedRole(int roleId); + - } } diff --git a/src/WorkFlowCheck.BL/Services/SyncService.cs b/src/WorkFlowCheck.BL/Services/SyncService.cs index 875aa7f..327024e 100644 --- a/src/WorkFlowCheck.BL/Services/SyncService.cs +++ b/src/WorkFlowCheck.BL/Services/SyncService.cs @@ -553,5 +553,31 @@ namespace WorkFlowCheck.BL.Services } return retVal; } + public async Task> DeviceMessageReadUnreadedRole(int roleId) + { + var retVal = new List(); + try + { + var res = await _dbContext.DeviceMessages + .Where(w => w.RoleId == roleId && w.IsReaded != true) + .ToListAsync(); + + if (res != null) + { + retVal = _mapper.Map>(res); + foreach (var deviceMessage in res) + { + deviceMessage.IsReaded = true; + deviceMessage.ReceiveDate = DateTime.UtcNow; + } + await _dbContext.SaveChangesAsync(); + } + } + catch (Exception ex) + { + Log.Error(ex.Message); + } + return retVal; + } } } diff --git a/src/WorkFlowCheck.BL/Services/UserService.cs b/src/WorkFlowCheck.BL/Services/UserService.cs index 59151e1..22898e5 100644 --- a/src/WorkFlowCheck.BL/Services/UserService.cs +++ b/src/WorkFlowCheck.BL/Services/UserService.cs @@ -93,6 +93,7 @@ namespace WorkFlowCheck.BL.Services try { + Log.ForContext("TAG", "AuditFlow").Information($"Bejelentkezési kísérlet: {userName}"); var user = await _dbContext.Users .Include(i => i.UserRoles) .ThenInclude(i => i.Role) @@ -116,9 +117,13 @@ namespace WorkFlowCheck.BL.Services } user.JwtToken = GenerateJwtToken(userDTO); await _dbContext.SaveChangesAsync(); - + Log.ForContext("TAG", "AuditFlow").Information($"Sikeres bejelentkezés: {userName}"); retVal = _mapper.Map(user); } + else + { + Log.ForContext("TAG", "AuditFlow").Error($"Sikertelen bejelenkezési kísérlet: {userName}"); + } } catch (Exception ex) { diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml index 6dfecb5..ab5b443 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml @@ -1,5 +1,7 @@ @page @model WorkFlowCheck.Web.Pages.BaseStock.Equipments.EquipmentsPageModel +@using WorkFlowCheck.Common.Helper +@using WorkFlowCheck.Common.DTO @{ ViewData["Title"] = "Berendezések"; } @@ -15,16 +17,16 @@ ID - Short Name - Equipment Number + @DisplayNameHelper.GetDisplayName(nameof(EquipmentDTO.ShortName), typeof(EquipmentDTO)) + @DisplayNameHelper.GetDisplayName(nameof(EquipmentDTO.EquipmentNumber), typeof(EquipmentDTO)) Action ID - Short Name - Equipment Number + @DisplayNameHelper.GetDisplayName(nameof(EquipmentDTO.ShortName), typeof(EquipmentDTO)) + @DisplayNameHelper.GetDisplayName(nameof(EquipmentDTO.EquipmentNumber), typeof(EquipmentDTO)) Action diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml index a7a9e3e..b0cc1a8 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml @@ -1,5 +1,7 @@ @page @model WorkFlowCheck.Web.Pages.BaseStock.Locations.LocationsPageModel +@using WorkFlowCheck.Common.Helper +@using WorkFlowCheck.Common.DTO @{ ViewData["Title"] = "Lokációk"; }