TD-5155 Fixes storing of add questions to which competencies selection

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

@@ -199,9 +199,8 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
             {
                 data.CustomAssessmentQuestionID = null;
             }
-            if (data.CompetenciesToUpdateCount > 0 && data.DefaultQuestionIDs.Count + (data.CustomAssessmentQuestionID != null ? 1 : 0) > 0)
+            if (data.CompetenciesToUpdateCount > 0 && (data.DefaultQuestionIDs.Count + (data.CustomAssessmentQuestionID != null ? 1 : 0) > 0))
             {
-                data.AddAssessmentQuestionsOption = 2;
                 setBulkUploadData(data);
                 return RedirectToAction("AddQuestionsToWhichCompetencies", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
             }
@@ -216,7 +215,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
         public IActionResult AddQuestionsToWhichCompetencies()
         {
             var data = GetBulkUploadData();
-            if (data.DefaultQuestionIDs != null && data.CustomAssessmentQuestionID == null)
+            if (data.DefaultQuestionIDs.Count == 0 && data.CustomAssessmentQuestionID == null)
             {
                 return RedirectToAction("ImportSummary", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
             }

DigitalLearningSolutions.Web/Models/BulkCompetenciesData.cs

@@ -32,7 +32,7 @@ public BulkCompetenciesData(DetailFramework framework, int adminUserId, string c
         public bool AddCustomAssessmentQuestion { get; set; } = false;
         public List<int> DefaultQuestionIDs { get; set; } = [];
         public int? CustomAssessmentQuestionID { get; set; }
-        public int AddAssessmentQuestionsOption { get; set; } = 1; //1 = only added, 2 = added and updated, 3 = all uploaded
+        public int AddAssessmentQuestionsOption { get; set; } = 2; //1 = only added, 2 = added and updated, 3 = all uploaded
         public int CompetenciesToProcessCount { get; set; }
         public int CompetenciesToAddCount { get; set; }
         public int CompetenciesToUpdateCount { get; set; }

DigitalLearningSolutions.Web/Views/Frameworks/Developer/Import/AddQuestionsToWhichCompetencies.cshtml

@@ -47,7 +47,7 @@
                             @if (Model.CompetenciesToAddCount > 0)
                             {
                                 <div class="nhsuk-radios__item">
-                                    <input class="nhsuk-radios__input" id="option-1" asp-for="@Model.AddAssessmentQuestionsOption" type="radio" value="1" aria-describedby="option-1-hint">
+                                    <input class="nhsuk-radios__input" id="option-1" asp-for="AddAssessmentQuestionsOption" type="radio" value="1" aria-describedby="option-1-hint">
                                     <label class="nhsuk-label nhsuk-radios__label" for="option-1">
                                         Only add questions to new @Model.FrameworkVocabularyPlural.ToLower()
                                     </label>
@@ -57,7 +57,7 @@
                                 </div>
                             }
                             <div class="nhsuk-radios__item">
-                                <input class="nhsuk-radios__input" id="option-2" asp-for="@Model.AddAssessmentQuestionsOption" type="radio" value="2" aria-describedby="option-2-hint">
+                                <input class="nhsuk-radios__input" id="option-2" asp-for="AddAssessmentQuestionsOption" type="radio" value="2" aria-describedby="option-2-hint">
                                 <label class="nhsuk-label nhsuk-radios__label" for="option-2">
                                     Only add questions to @(Model.CompetenciesToAddCount > 0 ? " new and " : "") modified @Model.FrameworkVocabularyPlural.ToLower()
                                 </label>
@@ -66,7 +66,7 @@
                                 </div>
                             </div>
                             <div class="nhsuk-radios__item">
-                                <input class="nhsuk-radios__input" id="option-3" asp-for="@Model.AddAssessmentQuestionsOption" type="radio" value="3" aria-describedby="option-3-hint">
+                                <input class="nhsuk-radios__input" id="option-3" asp-for="AddAssessmentQuestionsOption" type="radio" value="3" aria-describedby="option-3-hint">
                                 <label class="nhsuk-label nhsuk-radios__label" for="option-3">
                                     Add questions to all @Model.FrameworkVocabularyPlural.ToLower() in my uploaded sheet
                                 </label>