Skip to content

TD-5548 Issue showing 'some existing competency records changed order' on 'competency file uploaded' screen when even modified the competency names #3310

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 1 commit into from
Jul 21, 2025
Merged

TD-5548 Issue showing 'some existing competency records changed order' on 'competency file uploaded' screen when even modified the competency names #3310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ int adminId

IEnumerable<GenericSelectList> GetAssessmentQuestions(int frameworkId, int adminId);

FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId);
FrameworkDefaultQuestionUsage? GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId);

IEnumerable<GenericSelectList> GetAssessmentQuestionsForCompetency(int frameworkCompetencyId, int adminId);

AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId);
AssessmentQuestionDetail? GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId);

LevelDescriptor GetLevelDescriptorForAssessmentQuestionId(int assessmentQuestionId, int adminId, int level);
LevelDescriptor? GetLevelDescriptorForAssessmentQuestionId(int assessmentQuestionId, int adminId, int level);

IEnumerable<CompetencyResourceAssessmentQuestionParameter>
GetSignpostingResourceParametersByFrameworkAndCompetencyId(int frameworkId, int competencyId);
Expand Down Expand Up @@ -122,7 +122,7 @@ bool zeroBased
FrameworkReviewOutcomeNotification? GetFrameworkReviewNotification(int reviewId);

//INSERT DATA
BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId);
BrandedFramework? CreateFramework(DetailFramework detailFramework, int adminId);

int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId);

Expand Down Expand Up @@ -366,7 +366,7 @@ public FrameworkDataService(IDbConnection connection, ILogger<FrameworkDataServi
);
}

public BaseFramework GetBaseFrameworkByFrameworkId(int frameworkId, int adminId)
public BaseFramework? GetBaseFrameworkByFrameworkId(int frameworkId, int adminId)
{
return connection.QueryFirstOrDefault<BaseFramework>(
$@"SELECT {BaseFrameworkFields}
Expand All @@ -376,7 +376,7 @@ public BaseFramework GetBaseFrameworkByFrameworkId(int frameworkId, int adminId)
);
}

public BrandedFramework GetBrandedFrameworkByFrameworkId(int frameworkId, int adminId)
public BrandedFramework? GetBrandedFrameworkByFrameworkId(int frameworkId, int adminId)
{
return connection.QueryFirstOrDefault<BrandedFramework>(
$@"SELECT {BaseFrameworkFields} {BrandedFrameworkFields}
Expand Down Expand Up @@ -483,7 +483,7 @@ public IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name
);
}

public BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId)
public BrandedFramework? CreateFramework(DetailFramework detailFramework, int adminId)
{
string frameworkName = detailFramework.FrameworkName;
var description = detailFramework.Description;
Expand Down Expand Up @@ -531,7 +531,7 @@ public BrandedFramework CreateFramework(DetailFramework detailFramework, int adm
return new BrandedFramework();
}

return connection.QueryFirstOrDefault<BrandedFramework>(
return connection.QueryFirstOrDefault<BrandedFramework?>(
$@"SELECT {BaseFrameworkFields}
FROM {FrameworkTables}
WHERE FrameworkName = @frameworkName AND OwnerAdminID = @adminId",
Expand Down Expand Up @@ -866,7 +866,7 @@ public IEnumerable<FrameworkCompetencyGroup> GetFrameworkCompetencyGroups(int fr
@"SELECT fcg.ID, fcg.CompetencyGroupID, cg.Name, fcg.Ordering, fc.ID, c.ID AS CompetencyID, c.Name, c.Description, fc.Ordering, COUNT(caq.AssessmentQuestionID) AS AssessmentQuestions
,(SELECT COUNT(*) FROM CompetencyLearningResources clr WHERE clr.CompetencyID = c.ID AND clr.RemovedDate IS NULL) AS CompetencyLearningResourcesCount
FROM FrameworkCompetencyGroups AS fcg INNER JOIN
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID LEFT OUTER JOIN
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID INNER JOIN
FrameworkCompetencies AS fc ON fcg.ID = fc.FrameworkCompetencyGroupID LEFT OUTER JOIN
Competencies AS c ON fc.CompetencyID = c.ID LEFT OUTER JOIN
CompetencyAssessmentQuestions AS caq ON c.ID = caq.CompetencyID
Expand Down Expand Up @@ -1518,7 +1518,7 @@ FROM AssessmentQuestionInputTypes"
);
}

public FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId)
public FrameworkDefaultQuestionUsage? GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId)
{
return connection.QueryFirstOrDefault<FrameworkDefaultQuestionUsage>(
@"SELECT @assessmentQuestionId AS ID,
Expand Down Expand Up @@ -1619,7 +1619,7 @@ FROM CompetencyAssessmentQuestions INNER JOIN
}
}

public AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId)
public AssessmentQuestionDetail? GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId)
{
return connection.QueryFirstOrDefault<AssessmentQuestionDetail>(
$@"{AssessmentQuestionFields}{AssessmentQuestionDetailFields}
Expand All @@ -1629,7 +1629,7 @@ public AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQu
);
}

public LevelDescriptor GetLevelDescriptorForAssessmentQuestionId(
public LevelDescriptor? GetLevelDescriptorForAssessmentQuestionId(
int assessmentQuestionId,
int adminId,
int level
Expand Down Expand Up @@ -2500,7 +2500,7 @@ FROM Flags AS f
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS FlagsCsv
FROM
Competencies AS c INNER JOIN
FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID LEFT JOIN
FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID INNER JOIN
FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID LEFT JOIN
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
WHERE (fc.FrameworkID = @frameworkId)
Expand Down
Loading