Skip to content

Commit a481633

Browse files
AnjuJose011AnjuJose011
authored
Merge pull request #1463 from TechnologyEnhancedLearning/Develop/Fixes/TD-6222-SITFixes
TD-6213 & TD-6222
2 parents 431a898 + c7cc2dc commit a481633

File tree

43 files changed

+318
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+318
-153
lines changed

‎AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
9090
<PackageReference Include="IdentityModel" Version="4.6.0" />
9191
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
92-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.59" />
92+
<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.0" />
9393
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
9494
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
9595
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

‎LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.13" />
1515
<PackageReference Include="FluentAssertions" Version="6.12.0" />
16-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.59" />
16+
<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.0" />
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
1919
<PackageReference Include="Selenium.Axe" Version="4.0.19" />

‎LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ public async Task<IActionResult> Certificates(MyLearningUserCertificatesViewMode
576576
Elearning = certificateRequest.Elearning,
577577
Html = certificateRequest.Html,
578578
Assessment = certificateRequest.Assessment,
579+
Weblink = certificateRequest.Weblink,
579580
Courses = certificateRequest.Courses,
580581
};
581582

@@ -619,7 +620,7 @@ public async Task<IActionResult> Certificates(MyLearningUserCertificatesViewMode
619620
response.UserCertificates = result.Certificates;
620621
}
621622

622-
response.MyLearningPaging = new MyLearningPagingModel() { CurrentPage = certificateRequest.CurrentPageIndex, PageSize = MyLearningPageSize, TotalItems = response.TotalCount, HasItems = response.TotalCount > 0 };
623+
response.MyLearningPaging = new MyLearningPagingModel() { CurrentPage = certificateRequest.CurrentPageIndex, PageSize = certificatePageSize, TotalItems = response.TotalCount, HasItems = response.TotalCount > 0 };
623624
return this.View(response);
624625
}
625626

‎LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,14 @@ public static bool CanCertificateawarded(this MyLearningCombinedActivitiesViewMo
174174
return true;
175175
}
176176
}
177+
else if (activitiesViewModel.ResourceType == ResourceTypeEnum.Assessment && activitiesViewModel.AssessmentType == (int)AssessmentTypeEnum.Informal && activitiesViewModel.AssesmentScore >= activitiesViewModel.AssessmentPassMark)
178+
{
179+
return true;
180+
}
181+
else if (activitiesViewModel.ResourceType == ResourceTypeEnum.Assessment && activitiesViewModel.AssessmentType == (int)AssessmentTypeEnum.Informal)
182+
{
183+
return false;
184+
}
177185
else
178186
{
179187
if (GetActivityStatusDisplayText(activitiesViewModel) == "Completed" || GetActivityStatusDisplayText(activitiesViewModel) == "Passed" || GetActivityStatusDisplayText(activitiesViewModel) == "Downloaded")

‎LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
114114
<PackageReference Include="IdentityModel" Version="4.6.0" />
115115
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
116-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.59" />
116+
<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.0" />
117117
<PackageReference Include="linqtotwitter" Version="6.9.0" />
118118
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
119119
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />

‎LearningHub.Nhs.WebUI/Views/MyLearning/Certificates.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
<div class="nhsuk-card dashboard-card nhsuk-card--radius-6">
219219

220220
<div class="nhsuk-card__content">
221-
<h3 class="nhsuk-card__heading nhsuk-heading-m nhsuk-font-weight-regular line-clamp-1">
221+
<h3 class="nhsuk-card__heading nhsuk-heading-m nhsuk-font-weight-regular line-clamp-5">
222222
@if ((ResourceTypeEnum)certificate.ResourceTypeId == ResourceTypeEnum.Moodle)
223223
{
224224
<a class="nhsuk-card__link" title="@certificate.Title" target="_blank" href="@(certificate.CertificatePreviewUrl)">@certificate.Title</a>

‎LearningHub.Nhs.WebUI/Views/MyLearning/DownloadActivityRecords.cshtml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,10 @@
11211121
var dateTimeText = activityDate == today ? "Today"
11221122
: activityDate == today.AddDays(-1) ? "Yesterday"
11231123
: activityDate.ToString("dd MMM yyyy");
1124+
var certicateAwardedDate = activity.CertificateAwardedDate.Date;
1125+
var certificateAwardedText = certicateAwardedDate == today ? "Today"
1126+
: certicateAwardedDate == today.AddDays(-1) ? "Yesterday"
1127+
: certicateAwardedDate.ToString("dd MMM yyyy");
11241128
<tr role="row" class="nhsuk-table__row">
11251129
<td role="cell" class="nhsuk-table__cell word-wrapper">
11261130
<span>@activity.ResourceReferenceId</span>
@@ -1180,7 +1184,7 @@
11801184
</clipPath>
11811185
</defs>
11821186
</svg> <span class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2 nhsuk-u-padding-left-1">Certificate:</span>
1183-
<span class="nhsuk-u-font-size-16">awarded [@dateTimeText]</span>
1187+
<span class="nhsuk-u-font-size-16">awarded [@certificateAwardedText]</span>
11841188

11851189
</div>
11861190

‎LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@
112112
var dateTimeText = activityDate == today ? "Today"
113113
: activityDate == today.AddDays(-1) ? "Yesterday"
114114
: activityDate.ToString("dd MMM yyyy");
115+
var certicateAwardedDate = activity.CertificateAwardedDate.Date;
116+
var certificateAwardedText = certicateAwardedDate == today ? "Today"
117+
: certicateAwardedDate == today.AddDays(-1) ? "Yesterday"
118+
: certicateAwardedDate.ToString("dd MMM yyyy");
115119

116120
<div>
117121
<span class="nhsuk-u-padding-bottom-3">
@@ -182,7 +186,7 @@
182186
</clipPath>
183187
</defs>
184188
</svg> <span class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2 nhsuk-u-padding-left-1">Certificate:</span>
185-
<span class="nhsuk-u-font-size-16">awarded [@dateTimeText]</span>
189+
<span class="nhsuk-u-font-size-16">awarded [@certificateAwardedText]</span>
186190

187191
</div>
188192

0 commit comments

Comments
 (0)