Merge pull request #1146 from k7hpn/fix/bootstrap-5

Fix performer status page, setup prompts
MCLD · Nov 2, 2024 · d1bd598 · d1bd598
2 parents e97f03f + 9fa7442
commit d1bd598
Show file tree

Hide file tree

Showing 4 changed files with 265 additions and 183 deletions.
diff --git a/src/GRA.Controllers/MissionControl/PerformerManagementController.cs b/src/GRA.Controllers/MissionControl/PerformerManagementController.cs
@@ -111,15 +111,15 @@ public async Task<IActionResult> Index()
 
                 if (branchPercent < 50)
                 {
-                    card.Add(system.Id, "list-group-item-danger");
+                    card.Add(system.Id, "danger");
                 }
                 else if (branchPercent < 100)
                 {
-                    card.Add(system.Id, "list-group-item-warning");
+                    card.Add(system.Id, "warning");
                 }
                 else
                 {
-                    card.Add(system.Id, "list-group-item-success");
+                    card.Add(system.Id, "success");
                 }
             }
 

diff --git a/src/GRA.Domain.Model/PsSettings.cs b/src/GRA.Domain.Model/PsSettings.cs
@@ -6,54 +6,54 @@ namespace GRA.Domain.Model
 {
     public class PsSettings : Abstract.BaseDomainEntity
     {
-        public int SiteId { get; set; }
+        [DisplayName("Branch Availability Supplemental Text")]
+        [MaxLength(255)]
+        public string BranchAvailabilitySupplementalText { get; set; }
 
         [DisplayName("Contact Email")]
         [MaxLength(255)]
         public string ContactEmail { get; set; }
 
-        [DisplayName("Selections Per Branch")]
-        [Range(1, int.MaxValue)]
-        public int? SelectionsPerBranch { get; set; }
+        [DisplayName("Registration Closed (remember to set a date and a time)")]
+        public DateTime? RegistrationClosed { get; set; }
 
-        [DisplayName("Registration Open")]
+        [DisplayName("Registration Open (remember to set a date and a time)")]
         public DateTime? RegistrationOpen { get; set; }
 
-        [DisplayName("Registration Closed")]
-        public DateTime? RegistrationClosed { get; set; }
+        [DisplayName("Schedule End Date (remember to set a date and a time)")]
+        public DateTime? ScheduleEndDate { get; set; }
 
-        [DisplayName("Scheduling Preview")]
-        public DateTime? SchedulingPreview { get; set; }
+        [DisplayName("Schedule Posted (remember to set a date and a time)")]
+        public DateTime? SchedulePosted { get; set; }
 
-        [DisplayName("Scheduling Open")]
-        public DateTime? SchedulingOpen { get; set; }
+        [DisplayName("Schedule Start Date (remember to set a date and a time)")]
+        public DateTime? ScheduleStartDate { get; set; }
 
-        [DisplayName("Scheduling Closed")]
+        [DisplayName("Scheduling Closed (remember to set a date and a time)")]
         public DateTime? SchedulingClosed { get; set; }
 
-        [DisplayName("Schedule Posted")]
-        public DateTime? SchedulePosted { get; set; }
+        [DisplayName("Scheduling Open (remember to set a date and a time)")]
+        public DateTime? SchedulingOpen { get; set; }
 
-        [DisplayName("Schedule Start Date")]
-        public DateTime? ScheduleStartDate { get; set; }
+        [DisplayName("Scheduling Preview (remember to set a date and a time)")]
+        public DateTime? SchedulingPreview { get; set; }
 
-        [DisplayName("Schedule End Date")]
-        public DateTime? ScheduleEndDate { get; set; }
+        [DisplayName("Selections Per Branch")]
+        [Range(1, int.MaxValue)]
+        public int? SelectionsPerBranch { get; set; }
 
-        [DisplayName("Vendor ID Prompt")]
-        [MaxLength(255)]
-        public string VendorIdPrompt { get; set; }
+        [DisplayName("Program Set up Supplemental Text")]
+        [MaxLength(50)]
+        public string SetupSupplementalText { get; set; }
+
+        public int SiteId { get; set; }
 
         [DisplayName("Vendor Code Format")]
         [MaxLength(255)]
         public string VendorCodeFormat { get; set; }
 
-        [DisplayName("Branch Availability Supplemental Text")]
+        [DisplayName("Vendor ID Prompt")]
         [MaxLength(255)]
-        public string BranchAvailabilitySupplementalText { get; set; }
-
-        [DisplayName("Program Set up Supplemental Text")]
-        [MaxLength(50)]
-        public string SetupSupplementalText { get; set; }
+        public string VendorIdPrompt { get; set; }
     }
 }