diff --git a/WebDoorCreator.API/Controllers/OrderController.cs b/WebDoorCreator.API/Controllers/OrderController.cs index 1de7526..ea93e93 100644 --- a/WebDoorCreator.API/Controllers/OrderController.cs +++ b/WebDoorCreator.API/Controllers/OrderController.cs @@ -79,35 +79,38 @@ namespace WebDoorCreator.API.Controllers // recuper elenco porte... List dcDTO = new List(); var doorsList = await WDCService.DoorGetByOrderId(OrderId); - foreach (var door in doorsList) + if (doorsList != null) { - // recupero i dato DoorOp - var doorOpList = await WDCService.DoorOpGetByDoorId(door.DoorId); - Dictionary> currBOMList = new Dictionary>(); - // ciclo su tutte le DoorOp - foreach (var doorOp in doorOpList) + foreach (var door in doorsList) { - // cerco se ci sia già o meno nella BOM l'item corrente - if (currBOMList.ContainsKey(doorOp.ObjectId)) + // recupero i dato DoorOp + var doorOpList = await WDCService.DoorOpGetByDoorId(door.DoorId); + Dictionary> currBOMList = new Dictionary>(); + // ciclo su tutte le DoorOp + foreach (var doorOp in doorOpList) { - currBOMList[doorOp.ObjectId].Add(doorOp.JsoncActVal); + // cerco se ci sia già o meno nella BOM l'item corrente + if (currBOMList.ContainsKey(doorOp.ObjectId)) + { + currBOMList[doorOp.ObjectId].Add(doorOp.JsoncActVal); + } + else + { + List currOp = new List(); + currOp.Add(doorOp.JsoncActVal); + currBOMList.Add(doorOp.ObjectId, currOp); + } } - else + // creo oggetto DTO finale della porta + var doorDto = new DoorCostingDTO() { - List currOp = new List(); - currOp.Add(doorOp.JsoncActVal); - currBOMList.Add(doorOp.ObjectId, currOp); - } + DoorId = door.DoorId, + Quantity = door.Quantity, + EstimatedWorkTime = 0, + BOMList = currBOMList + }; + dcDTO.Add(doorDto); } - // creo oggetto DTO finale della porta - var doorDto = new DoorCostingDTO() - { - DoorId = door.DoorId, - Quantity = door.Quantity, - EstimatedWorkTime = 0, - BOMList = currBOMList - }; - dcDTO.Add(doorDto); } //answ. = rawOrder.OrderDescript; answ.DoorsList = dcDTO; diff --git a/WebDoorCreator.Data/User/ClaimConverter.cs b/WebDoorCreator.Data/User/ClaimConverter.cs index b64a58e..fa934f9 100644 --- a/WebDoorCreator.Data/User/ClaimConverter.cs +++ b/WebDoorCreator.Data/User/ClaimConverter.cs @@ -38,7 +38,11 @@ namespace WebDoorCreator.Data.User public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { - throw new NotImplementedException(); - } +#if false + throw new NotImplementedException(); +#endif + // da verificare + writer.WriteValue(JsonConvert.SerializeObject(value)); + } } } diff --git a/WebDoorCreator.Data/WDCDataContext.cs b/WebDoorCreator.Data/WDCDataContext.cs index 39bdd5a..0d27b80 100644 --- a/WebDoorCreator.Data/WDCDataContext.cs +++ b/WebDoorCreator.Data/WDCDataContext.cs @@ -15,9 +15,11 @@ namespace WebDoorCreator.Data { #region Public Constructors +#if false public WDCDataContext() { - } + } +#endif public WDCDataContext(IConfiguration configuration) { diff --git a/WebDoorCreator.Data/WebDoorCreator.Data.csproj b/WebDoorCreator.Data/WebDoorCreator.Data.csproj index 3bba77d..2ff326f 100644 --- a/WebDoorCreator.Data/WebDoorCreator.Data.csproj +++ b/WebDoorCreator.Data/WebDoorCreator.Data.csproj @@ -16,7 +16,7 @@ - + diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor index ee14ca2..a76cec2 100644 --- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor +++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor @@ -134,7 +134,7 @@
  • -
    diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor index a591bbb..94675f0 100644 --- a/WebDoorCreator.UI/Components/Order/OrderList.razor +++ b/WebDoorCreator.UI/Components/Order/OrderList.razor @@ -74,7 +74,7 @@ else } - @if (isEdit && item.OrderId == currOrderId) + @if (isEdit && item.OrderId == currOrderId && currOrder != null) { @if (item.OrderStatus < 20 || WDCUService.userRole == "DcaAdmin" || WDCUService.userRole == "SuperAdmin") { diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs index b249b40..5847ccd 100644 --- a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs +++ b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs @@ -482,8 +482,11 @@ namespace WebDoorCreator.UI.Pages if (user.Claims != null && user.Claims.Count > 0) { var CurrentUserClaim = user.Claims.FirstOrDefault(); - CurrentUserClaimType = CurrentUserClaim.Type; - CurrentUserClaimVal = CurrentUserClaim.Value; + if (CurrentUserClaim != null) + { + CurrentUserClaimType = CurrentUserClaim.Type; + CurrentUserClaimVal = CurrentUserClaim.Value; + } } else { @@ -614,15 +617,12 @@ namespace WebDoorCreator.UI.Pages user, resetToken, objUser.PasswordHash); - if (!passworduser.Succeeded) + if (passworduser != null && !passworduser.Succeeded) { - if (passworduser.Errors.FirstOrDefault() != null) + var errore = passworduser.Errors.FirstOrDefault(); + if (errore != null) { - strError = - passworduser - .Errors - .FirstOrDefault() - .Description; + strError = errore.Description; } else { @@ -656,7 +656,7 @@ namespace WebDoorCreator.UI.Pages if (UserClaims != null && UserClaims.Count > 0) { var oldClaim = UserClaims.FirstOrDefault(); - if (!oldClaim.Equals(CurrentUserClaim)) + if (oldClaim != null && !oldClaim.Equals(CurrentUserClaim)) { // recupero il ruolo attuale e lo rimuovo await _UserManager.RemoveClaimAsync(user, oldClaim); @@ -682,15 +682,10 @@ namespace WebDoorCreator.UI.Pages var CreateResult = await _UserManager.CreateAsync(NewUser, objUser.PasswordHash); if (!CreateResult.Succeeded) { - if (CreateResult - .Errors - .FirstOrDefault() != null) + var currresErr = CreateResult.Errors.FirstOrDefault(); + if (currresErr != null) { - strError = - CreateResult - .Errors - .FirstOrDefault() - .Description; + strError = currresErr.Description; } else { diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj index 12ef422..7d56ca9 100644 --- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj +++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - +