From 0cc82fec5d17b77fedfd5618b26978b93deece45 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 30 Jun 2026 23:55:43 +0100 Subject: [PATCH] bug fix IUserSettings --- src/PostIt.Tests/PostItViewModelTests.cs | 13 ++----------- ...{ISpecializationSettings.cs => IUserSettings.cs} | 0 .../Controllers/Contracting/ActivityController.cs | 10 +++++----- .../Controllers/Contracting/CommandController.cs | 3 --- src/Yavsc.Server/Helpers/WorkflowHelpers.cs | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) rename src/Yavsc.Abstract/Workflow/{ISpecializationSettings.cs => IUserSettings.cs} (100%) diff --git a/src/PostIt.Tests/PostItViewModelTests.cs b/src/PostIt.Tests/PostItViewModelTests.cs index 65c0c667..0be4410d 100644 --- a/src/PostIt.Tests/PostItViewModelTests.cs +++ b/src/PostIt.Tests/PostItViewModelTests.cs @@ -1,21 +1,12 @@ -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Net.Http.Json; -using System.Text; -using System.Text.Json; -using System.Threading; -using System.Threading.Tasks; using PostIt.Models; using PostIt.Services; using PostIt.ViewModels; -using Xunit; -namespace PostIt; +namespace PostIt.Tests; public class PostItViewModelTests { + [Fact] public void SearchCommand_filters_posts_by_title_article_or_author() { diff --git a/src/Yavsc.Abstract/Workflow/ISpecializationSettings.cs b/src/Yavsc.Abstract/Workflow/IUserSettings.cs similarity index 100% rename from src/Yavsc.Abstract/Workflow/ISpecializationSettings.cs rename to src/Yavsc.Abstract/Workflow/IUserSettings.cs diff --git a/src/Yavsc.Org/Controllers/Contracting/ActivityController.cs b/src/Yavsc.Org/Controllers/Contracting/ActivityController.cs index 0a7a143d..c4e3f282 100644 --- a/src/Yavsc.Org/Controllers/Contracting/ActivityController.cs +++ b/src/Yavsc.Org/Controllers/Contracting/ActivityController.cs @@ -8,7 +8,6 @@ namespace Yavsc.Controllers using Microsoft.EntityFrameworkCore; using Models; using Models.Workflow; - using Yavsc.Helpers; using Yavsc.Server.Helpers; [Authorize("AdministratorOnly")] @@ -18,7 +17,7 @@ namespace Yavsc.Controllers readonly IStringLocalizer SR; readonly ILogger logger; - public ActivityController(ApplicationDbContext context, + public ActivityController(ApplicationDbContext context, IStringLocalizer SR, ILoggerFactory loggerFactory) { @@ -65,15 +64,15 @@ namespace Yavsc.Controllers var existing = _context.Activities.Include(a => a.Children).FirstOrDefault(a => a.Code == code); if (existing == null) return acts; var pi = acts.FirstOrDefault(i => i.Value == existing.ParentCode); - if (pi!=null) pi.Selected = true; + if (pi!=null) pi.Selected = true; else nullItem.Selected = true; - RecursivelyFilterChild(acts, existing); + RecursivelyFilterChild(acts, existing); return acts; } /// /// Filters a activity selection list - /// in order to exclude any descendant + /// in order to exclude any descendant /// from the eligible list at the Parent property. /// WARN! results in a infinite loop when /// data is corrupted and there is a circularity @@ -172,6 +171,7 @@ namespace Yavsc.Controllers _context.SaveChanges(User.GetUserId()); return RedirectToAction("Index"); } + SetSettingClasseInfo(); return View(activity); } diff --git a/src/Yavsc.Org/Controllers/Contracting/CommandController.cs b/src/Yavsc.Org/Controllers/Contracting/CommandController.cs index 2e84d079..1a07ff63 100644 --- a/src/Yavsc.Org/Controllers/Contracting/CommandController.cs +++ b/src/Yavsc.Org/Controllers/Contracting/CommandController.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Localization; namespace Yavsc.Controllers { using Helpers; - using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; using Models; @@ -16,8 +15,6 @@ namespace Yavsc.Controllers using Models.Workflow; using Services; using Yavsc.Interface; - using Yavsc.Models.Billing; - using Yavsc.Models.Haircut; using Yavsc.Server.Helpers; using Yavsc.Settings; diff --git a/src/Yavsc.Server/Helpers/WorkflowHelpers.cs b/src/Yavsc.Server/Helpers/WorkflowHelpers.cs index 6814ccd0..55e8dc88 100644 --- a/src/Yavsc.Server/Helpers/WorkflowHelpers.cs +++ b/src/Yavsc.Server/Helpers/WorkflowHelpers.cs @@ -72,7 +72,7 @@ namespace Yavsc.Helpers foreach (var c in a.GetTypes()) { if (c.IsClass && !c.IsAbstract && - c.GetInterface("ISpecializationSettings") != null) + c.GetInterface(nameof(IUserSettings)) != null) { Config.ProfileTypes.Add(c); }