From 0965caaf4027e8eb8f01ed9aa67b91032d477867 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 30 Jun 2026 23:32:05 +0100 Subject: [PATCH] fixes and renaming --- .../Contracting/GeneralSettingsController.cs | 14 +++++++------- src/Yavsc.Org/Views/Activity/Create.cshtml | 14 +++++++------- src/Yavsc.Org/Views/Activity/Edit.cshtml | 15 ++++++++------- src/Yavsc.Org/Views/GeneralSettings/Delete.cshtml | 4 ++-- src/Yavsc.Org/Views/GeneralSettings/Edit.cshtml | 2 +- src/Yavsc.Org/Views/GeneralSettings/Index.cshtml | 4 ++-- src/Yavsc.Server/Models/ApplicationDbContext.cs | 2 +- .../{GeneralSettings.cs => MusicLoverSettings.cs} | 2 +- 8 files changed, 29 insertions(+), 28 deletions(-) rename src/Yavsc.Server/Models/Musical/Profiles/{GeneralSettings.cs => MusicLoverSettings.cs} (84%) diff --git a/src/Yavsc.Org/Controllers/Contracting/GeneralSettingsController.cs b/src/Yavsc.Org/Controllers/Contracting/GeneralSettingsController.cs index 446cda01..1678f2a7 100644 --- a/src/Yavsc.Org/Controllers/Contracting/GeneralSettingsController.cs +++ b/src/Yavsc.Org/Controllers/Contracting/GeneralSettingsController.cs @@ -11,7 +11,7 @@ namespace Yavsc.Controllers public GeneralSettingsController(ApplicationDbContext context) { - _context = context; + _context = context; } // GET: GeneralSettings @@ -28,7 +28,7 @@ namespace Yavsc.Controllers return NotFound(); } - GeneralSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); + MusicLoverSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); if (generalSettings == null) { return NotFound(); @@ -46,7 +46,7 @@ namespace Yavsc.Controllers // POST: GeneralSettings/Create [HttpPost] [ValidateAntiForgeryToken] - public async Task Create(GeneralSettings generalSettings) + public async Task Create(MusicLoverSettings generalSettings) { if (ModelState.IsValid) { @@ -65,7 +65,7 @@ namespace Yavsc.Controllers return NotFound(); } - GeneralSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); + MusicLoverSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); if (generalSettings == null) { return NotFound(); @@ -76,7 +76,7 @@ namespace Yavsc.Controllers // POST: GeneralSettings/Edit/5 [HttpPost] [ValidateAntiForgeryToken] - public async Task Edit(GeneralSettings generalSettings) + public async Task Edit(MusicLoverSettings generalSettings) { if (ModelState.IsValid) { @@ -96,7 +96,7 @@ namespace Yavsc.Controllers return NotFound(); } - GeneralSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); + MusicLoverSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); if (generalSettings == null) { return NotFound(); @@ -110,7 +110,7 @@ namespace Yavsc.Controllers [ValidateAntiForgeryToken] public async Task DeleteConfirmed(string id) { - GeneralSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); + MusicLoverSettings generalSettings = await _context.GeneralSettings.SingleAsync(m => m.UserId == id); _context.GeneralSettings.Remove(generalSettings); await _context.SaveChangesAsync(); return RedirectToAction("Index"); diff --git a/src/Yavsc.Org/Views/Activity/Create.cshtml b/src/Yavsc.Org/Views/Activity/Create.cshtml index cc305557..0fe9938a 100644 --- a/src/Yavsc.Org/Views/Activity/Create.cshtml +++ b/src/Yavsc.Org/Views/Activity/Create.cshtml @@ -20,7 +20,7 @@
+ Name
@@ -28,7 +28,7 @@
+ Parent
@@ -37,7 +37,7 @@
+ Description
@@ -45,7 +45,7 @@
@@ -54,7 +54,7 @@
+
diff --git a/src/Yavsc.Org/Views/Activity/Edit.cshtml b/src/Yavsc.Org/Views/Activity/Edit.cshtml index ea77d956..0f4e591a 100644 --- a/src/Yavsc.Org/Views/Activity/Edit.cshtml +++ b/src/Yavsc.Org/Views/Activity/Edit.cshtml @@ -19,7 +19,7 @@
- +
@@ -54,13 +54,14 @@
-
- -
- - -
+ +
+ +
+
diff --git a/src/Yavsc.Org/Views/GeneralSettings/Delete.cshtml b/src/Yavsc.Org/Views/GeneralSettings/Delete.cshtml index 38c939c9..ee13adc8 100644 --- a/src/Yavsc.Org/Views/GeneralSettings/Delete.cshtml +++ b/src/Yavsc.Org/Views/GeneralSettings/Delete.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Musical.Profiles.GeneralSettings +@model Yavsc.Models.Musical.Profiles.MusicLoverSettings @{ ViewBag.Title = "Delete"; @@ -12,7 +12,7 @@
- +
| diff --git a/src/Yavsc.Org/Views/GeneralSettings/Edit.cshtml b/src/Yavsc.Org/Views/GeneralSettings/Edit.cshtml index c70c1c07..4626b294 100644 --- a/src/Yavsc.Org/Views/GeneralSettings/Edit.cshtml +++ b/src/Yavsc.Org/Views/GeneralSettings/Edit.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Musical.Profiles.GeneralSettings +@model Yavsc.Models.Musical.Profiles.MusicLoverSettings @{ ViewBag.Title = "Edit"; diff --git a/src/Yavsc.Org/Views/GeneralSettings/Index.cshtml b/src/Yavsc.Org/Views/GeneralSettings/Index.cshtml index 28e8164a..1c950594 100644 --- a/src/Yavsc.Org/Views/GeneralSettings/Index.cshtml +++ b/src/Yavsc.Org/Views/GeneralSettings/Index.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Musical.Profiles.GeneralSettings +@model Yavsc.Models.Musical.Profiles.MusicLoverSettings @{ ViewBag.Title = "Details"; @@ -19,7 +19,7 @@ else {

Aucun profile renseignĂ©"] - Renseigner ce paramĂȘtrage"] + Renseigner ce paramĂȘtrage"]

}
diff --git a/src/Yavsc.Server/Models/ApplicationDbContext.cs b/src/Yavsc.Server/Models/ApplicationDbContext.cs index 1fedde82..0675fb6a 100644 --- a/src/Yavsc.Server/Models/ApplicationDbContext.cs +++ b/src/Yavsc.Server/Models/ApplicationDbContext.cs @@ -279,7 +279,7 @@ namespace Yavsc.Models public DbSet FormationSettings { get; set; } [ActivitySettings] - public DbSet GeneralSettings { get; set; } + public DbSet GeneralSettings { get; set; } public DbSet CoWorking { get; set; } private void AddTimestamps(string userId) diff --git a/src/Yavsc.Server/Models/Musical/Profiles/GeneralSettings.cs b/src/Yavsc.Server/Models/Musical/Profiles/MusicLoverSettings.cs similarity index 84% rename from src/Yavsc.Server/Models/Musical/Profiles/GeneralSettings.cs rename to src/Yavsc.Server/Models/Musical/Profiles/MusicLoverSettings.cs index 85400812..fae39a40 100644 --- a/src/Yavsc.Server/Models/Musical/Profiles/GeneralSettings.cs +++ b/src/Yavsc.Server/Models/Musical/Profiles/MusicLoverSettings.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; namespace Yavsc.Models.Musical.Profiles { - public class GeneralSettings : IUserSettings + public class MusicLoverSettings : IUserSettings { public virtual List SoundColor { get; set; } [Key]