Skip to content

TD-4634- Customisation active check added in the completed activities #2822

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
Parent: Release 2024.38
merged 1 commit into from
Sep 11, 2024
Merged

TD-4634- Customisation active check added in the completed activities #2822

Show file tree
Hide file tree
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
19 changes: 19 additions & 0 deletions ...utions.Data.Migrations/202409051645_Alter_GetCompletedCoursesForCandidate_CourseActive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202409051645)]
public class Alter_GetCompletedCoursesForCandidate_CourseActive : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_UP);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN);
}
}
}
76 changes: 60 additions & 16 deletions DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,4 +442,10 @@
<data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
</root>
<data name="TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD_4634_Alter_GetCompletedCoursesForCandidate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
</root>
Binary file added ...gSolutions.Data.Migrations/Scripts/TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN.sql
View file
Open in desktop
Binary file not shown.
Binary file added ...ingSolutions.Data.Migrations/Scripts/TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Models/BaseLearningItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public abstract class BaseLearningItem : BaseSearchableItem
public bool IsSelfAssessment { get; set; }
public bool SelfRegister { get; set; }
public bool IncludesSignposting { get; set; }
public bool Active { get; set; }
public int? CurrentVersion { get; set; }
public override string SearchableName
{
Expand Down
2 changes: 2 additions & 0 deletions DigitalLearningSolutions.Web/ViewModels/LearningPortal/BaseLearningItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ protected BaseLearningItemViewModel(BaseLearningItem course)
IsSelfAssessment = course.IsSelfAssessment;
SelfRegister = course.SelfRegister;
IncludesSignposting = course.IncludesSignposting;
Active = course.Active;
}

public string Name { get; set; }
Expand All @@ -24,5 +25,6 @@ protected BaseLearningItemViewModel(BaseLearningItem course)
public bool IsSelfAssessment { get; }
public bool SelfRegister { get; }
public bool IncludesSignposting { get; }
public bool Active { get; }
}
}
2 changes: 1 addition & 1 deletion ...utions.Web/Views/LearningPortal/Completed/CompletedCourseCard/_CompletedCourseCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</details>

<div class="flex-row">
@if (Model.ArchivedDate == null && Model.RemovedDate == null && Model.CheckUnpublishedCourse > 0)
@if (Model.ArchivedDate == null && Model.RemovedDate == null && Model.CheckUnpublishedCourse > 0 && Model.Active)
{
<a class="nhsuk-button nhsuk-u-margin-bottom-2 nhsuk-u-margin-right-2"
aria-describedby="@Model.Id-name"
Expand Down