Skip to content

Commit 9bc9bde

Browse files
committed
TD-5155 Fixes problem with no default questions selected
1 parent 4bd1f4b commit 9bc9bde

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,16 @@ public IActionResult AddAssessmentQuestions()
180180
public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model)
181181
{
182182
var data = GetBulkUploadData();
183-
data.AddDefaultAssessmentQuestions = model.AddDefaultAssessmentQuestions;
183+
184184
if (model.AddDefaultAssessmentQuestions)
185185
{
186-
data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs;
186+
data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs ?? [];
187187
}
188188
else
189189
{
190190
data.DefaultQuestionIDs = [];
191191
}
192+
data.AddDefaultAssessmentQuestions = (data.DefaultQuestionIDs.Count > 0 && model.AddDefaultAssessmentQuestions);
192193
data.AddCustomAssessmentQuestion = model.AddCustomAssessmentQuestion;
193194
if (model.AddCustomAssessmentQuestion)
194195
{
@@ -198,7 +199,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
198199
{
199200
data.CustomAssessmentQuestionID = null;
200201
}
201-
if (data.CompetenciesToUpdateCount > 0)
202+
if (data.CompetenciesToUpdateCount > 0 && data.DefaultQuestionIDs.Count + (data.CustomAssessmentQuestionID != null ? 1 : 0) > 0)
202203
{
203204
data.AddAssessmentQuestionsOption = 2;
204205
setBulkUploadData(data);
@@ -215,7 +216,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
215216
public IActionResult AddQuestionsToWhichCompetencies()
216217
{
217218
var data = GetBulkUploadData();
218-
if (data.DefaultQuestionIDs.Count == 0 && data.CustomAssessmentQuestionID == null)
219+
if (data.DefaultQuestionIDs != null && data.CustomAssessmentQuestionID == null)
219220
{
220221
return RedirectToAction("ImportSummary", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
221222
}

DigitalLearningSolutions.Web/ViewModels/Frameworks/Import/AddQuestionsToWhichCompetenciesViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using DigitalLearningSolutions.Web.Helpers;
22
using System.Collections.Generic;
3+
using System.Linq;
34
using System.Runtime.Versioning;
45

56
namespace DigitalLearningSolutions.Web.ViewModels.Frameworks.Import

0 commit comments

Comments
 (0)