Skip to content

Develop/features/competency frameworks #518

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 3 commits into from
Jul 27, 2021
Merged

Develop/features/competency frameworks #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
590a5a0
DLSV2-279 Fixes yes/no assessment question display
kevwhitt-hee Jul 27, 2021
24f2f64
DLSV2-280 Orders assessment questions by ordering column
kevwhitt-hee Jul 27, 2021
123d13a
Merge branch 'master' into Develop/Features/CompetencyFrameworks
kevwhitt-hee Jul 27, 2021
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
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/Services/FrameworkService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ public AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQu
$@"{AssessmentQuestionFields}{AssessmentQuestionDetailFields}
{AssessmentQuestionTables}
WHERE AQ.ID = @assessmentQuestionId
ORDER BY [Question]", new { adminId, assessmentQuestionId }
ORDER BY AQ.Ordering", new { adminId, assessmentQuestionId }
);
}
public LevelDescriptor GetLevelDescriptorForAssessmentQuestionId(int assessmentQuestionId, int adminId, int level)
Expand Down
14 changes: 9 additions & 5 deletions DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ FROM SelfAssessmentStructure as sas
FROM {CompetencyTables}
INNER JOIN CompetencyRowNumber AS CRN
ON CRN.CompetencyID = C.ID
WHERE CRN.RowNo = @n",
WHERE CRN.RowNo = @n
ORDER BY CAQ.Ordering",
(competency, assessmentQuestion) =>
{
if (competencyResult == null)
Expand Down Expand Up @@ -306,7 +307,8 @@ public IEnumerable<Competency> GetMostRecentResults(int selfAssessmentId, int ca
var result = connection.Query<Competency, Models.SelfAssessments.AssessmentQuestion, Competency>(
$@"WITH {LatestAssessmentResults}
SELECT {CompetencyFields}
FROM {CompetencyTables}",
FROM {CompetencyTables}
ORDER BY SAS.Ordering, CAQ.Ordering",
(competency, assessmentQuestion) =>
{
competency.AssessmentQuestions.Add(assessmentQuestion);
Expand All @@ -326,7 +328,8 @@ public IEnumerable<Competency> GetCandidateAssessmentResultsById(int candidateAs
var result = connection.Query<Competency, Models.SelfAssessments.AssessmentQuestion, Competency>(
$@"WITH {SpecificAssessmentResults}
SELECT {CompetencyFields}
FROM {SpecificCompetencyTables}",
FROM {SpecificCompetencyTables}
ORDER BY SAS.Ordering, CAQ.Ordering",
(competency, assessmentQuestion) =>
{
competency.AssessmentQuestions.Add(assessmentQuestion);
Expand All @@ -347,7 +350,8 @@ public IEnumerable<Competency> GetCandidateAssessmentResultsForReviewById(int ca
$@"WITH {SpecificAssessmentResults}
SELECT {CompetencyFields}
FROM {SpecificCompetencyTables}
WHERE (LAR.Requested IS NOT NULL) AND (LAR.Verified IS NULL) AND (LAR.UserIsVerifier = 1)",
WHERE (LAR.Requested IS NOT NULL) AND (LAR.Verified IS NULL) AND (LAR.UserIsVerifier = 1)
ORDER BY SAS.Ordering, CAQ.Ordering",
(competency, assessmentQuestion) =>
{
competency.AssessmentQuestions.Add(assessmentQuestion);
Expand Down Expand Up @@ -508,7 +512,7 @@ public void SetSubmittedDateNow(int selfAssessmentId, int candidateId)

public IEnumerable<LevelDescriptor> GetLevelDescriptorsForAssessmentQuestion(int assessmentQuestionId, int minValue, int maxValue, bool zeroBased)
{
int adjustBy = zeroBased ? -1 : 0;
int adjustBy = zeroBased ? 1 : 0;
return connection.Query<LevelDescriptor>(
@"SELECT COALESCE(ID,0) AS ID, @assessmentQuestionId AS AssessmentQuestionID, n AS LevelValue, LevelLabel, LevelDescription, 0 AS UpdatedByAdminID
FROM
Expand Down