Skip to content

Commit dd93615

Browse files
committed
Tweaks post data processing to handle storing false values
1 parent ca75d04 commit dd93615

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,23 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
136136
{
137137
var data = GetBulkUploadData();
138138
data.AddDefaultAssessmentQuestions = model.AddDefaultAssessmentQuestions;
139+
if (model.AddDefaultAssessmentQuestions)
140+
{
141+
data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs;
142+
}
143+
else
144+
{
145+
data.DefaultQuestionIDs = [];
146+
}
139147
data.AddCustomAssessmentQuestion = model.AddCustomAssessmentQuestion;
140-
data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs;
141-
data.CustomAssessmentQuestionID = model.CustomAssessmentQuestionID;
148+
if (model.AddCustomAssessmentQuestion)
149+
{
150+
data.CustomAssessmentQuestionID = model.CustomAssessmentQuestionID;
151+
}
152+
else
153+
{
154+
data.CustomAssessmentQuestionID = null;
155+
}
142156
setBulkUploadData(data);
143157
return RedirectToAction("AddQuestionsToWhichCompetencies");
144158
}

DigitalLearningSolutions.Web/Models/BulkCompetenciesData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public BulkCompetenciesData(DetailFramework framework, int adminUserId, string c
2828
public bool IsNotBlank { get; set; }
2929
public string CompetenciesFileName { get; set; }
3030
public List<int> DefaultQuestionIDs { get; set; } = [];
31-
public int CustomAssessmentQuestionID { get; set; }
31+
public int? CustomAssessmentQuestionID { get; set; }
3232
public bool AddDefaultAssessmentQuestions { get; set; } = true;
3333
public bool AddCustomAssessmentQuestion { get; set; } = false;
3434
public int CompetenciesToProcessCount { get; set; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public class AddAssessmentQuestionsFormData
77
public bool AddDefaultAssessmentQuestions { get; set; }
88
public bool AddCustomAssessmentQuestion { get; set; }
99
public List<int> DefaultAssessmentQuestionIDs { get; set; }
10-
public int CustomAssessmentQuestionID { get; set; }
10+
public int? CustomAssessmentQuestionID { get; set; }
1111
}
1212
}

0 commit comments

Comments
 (0)