Merge branch 'DLS-Release-v1.1.0' into UAT

rshrirohit · rshrirohit · commit 26999df436b9 · 2024-12-20T15:06:05.000Z
diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDelegateViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDelegateViewModel.cs
@@ -47,6 +47,6 @@ public SupervisorDelegateViewModel() { }
         [DefaultValue(false)]
         public bool ConfirmedRemove { get; set; }
         public int SelfAssessmentCategory { get; set; }
-        public IEnumerable<SelectListItem> SelfAssessmentCategories { get; set; }
+        public IEnumerable<SelectListItem>? SelfAssessmentCategories { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public SupervisorDelegateViewModel() { }`
`47`	`47`	`[DefaultValue(false)]`
`48`	`48`	`public bool ConfirmedRemove { get; set; }`
`49`	`49`	`public int SelfAssessmentCategory { get; set; }`
`50`		`- public IEnumerable<SelectListItem> SelfAssessmentCategories { get; set; }`
	`50`	`+ public IEnumerable<SelectListItem>? SelfAssessmentCategories { get; set; }`
`51`	`51`	`}`
`52`	`52`	`}`