Skip to content

DLSV2-538 Add clear button for competency questions #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2022
Merged

DLSV2-538 Add clear button for competency questions #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2819ac8
DLSV2-538 Save zero as Result on SelfAssessmentResults table when no …
daniel-manta-hee Aug 10, 2022
d880dfc
DLSV2-538 Save null as Result into SelfAssessmentResults table when n…
daniel-manta-hee Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions DigitalLearningSolutions.Data.Migrations/202208301100_AllowNullSelfAssessmentResults.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202208301100)]
public class AllowNullSelfAssessmentResults : Migration
{
public override void Up()
{
Alter.Table("SelfAssessmentResults").AlterColumn("Result").AsInt32().Nullable();
}
public override void Down()
{
Alter.Table("SelfAssessmentResults").AlterColumn("Result").AsInt32().NotNullable().SetExistingRowsTo(0);
}
}
}
15 changes: 6 additions & 9 deletions ...talLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,13 @@ FROM AssessmentQuestions

var minValue = assessmentQuestion.MinValue;
var maxValue = assessmentQuestion.MaxValue;
if (result != null)
if (result < minValue || result > maxValue)
{
if (result < minValue || result > maxValue)
{
logger.LogWarning(
"Not saving self assessment result as result is invalid. " +
$"{PrintResult(competencyId, selfAssessmentId, candidateId, assessmentQuestionId, result)}"
);
return;
}
logger.LogWarning(
"Not saving self assessment result as result is invalid. " +
$"{PrintResult(competencyId, selfAssessmentId, candidateId, assessmentQuestionId, result)}"
);
return;
}

var numberOfAffectedRows = connection.Execute(
Expand Down
19 changes: 8 additions & 11 deletions DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,14 @@ public IActionResult SelfAssessmentCompetency(

foreach (var assessmentQuestion in assessmentQuestions)
{
if (assessmentQuestion.Result != null || assessmentQuestion.SupportingComments != null)
{
selfAssessmentService.SetResultForCompetency(
competencyId,
assessment.Id,
candidateId,
assessmentQuestion.Id,
assessmentQuestion.Result,
assessmentQuestion.SupportingComments
);
}
selfAssessmentService.SetResultForCompetency(
competencyId,
assessment.Id,
candidateId,
assessmentQuestion.Id,
assessmentQuestion.Result,
assessmentQuestion.SupportingComments
);
}

selfAssessmentService.SetUpdatedFlag(selfAssessmentId, candidateId, true);
Expand Down