Skip to content

Commit fa16dce

Browse files
OluwatobiAweOluwatobiAwe
committed
TD-6213 Assessment ResorceType Update and LH model update
1 parent 00b0464 commit fa16dce

File tree

31 files changed

+37
-29
lines changed

31 files changed

+37
-29
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.55" />
92+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
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.11" />
1515
<PackageReference Include="FluentAssertions" Version="6.12.0" />
16-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
16+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
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/Helpers/ViewActivityHelper.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,11 @@ public static string GetActivityStatusDisplayText(this ActivityDetailedItemViewM
279279
}
280280
else if (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment)
281281
{
282+
if (activityDetailedItemViewModel.AssessmentDetails.AssessmentTypeEnum == AssessmentTypeEnum.Informal && (activityDetailedItemViewModel.Complete || GetActivityStatusText(activityDetailedItemViewModel) == "Completed"))
283+
{
284+
return "Passed";
285+
}
286+
282287
if (activityDetailedItemViewModel.Complete)
283288
{
284289
return activityDetailedItemViewModel.ScorePercentage >= activityDetailedItemViewModel.AssessmentDetails.PassMark ? "Passed" : "Failed";

‎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.55" />
116+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
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" />

‎OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
19+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
2020
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
2121
</ItemGroup>
2222

‎OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
20+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
2121
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
2222
</ItemGroup>
2323

‎OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="AutoMapper" Version="10.1.1" />
2525
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
2626
<PackageReference Include="IdentityModel" Version="4.6.0" />
27-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
27+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
2828
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
2929
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
3030
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />

‎OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
20-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
20+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
3131
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
3232
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
33-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
33+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
3434
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
3535
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
3636
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />

‎OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
595595
viewModel.AssessmentDetails = new MyLearningAssessmentDetails
596596
{
597597
PassMark = resourceActivity.ResourceVersion.AssessmentResourceVersion.PassMark,
598+
AssessmentTypeEnum = resourceActivity.ResourceVersion.AssessmentResourceVersion.AssessmentType,
598599
};
599600
}
600601
else
@@ -631,6 +632,8 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
631632
CurrentAttempt = currentAttempt,
632633
MaximumAttempts = resourceActivity.ResourceVersion.AssessmentResourceVersion.MaximumAttempts,
633634
PassMark = resourceActivity.ResourceVersion.AssessmentResourceVersion.PassMark,
635+
AssessmentTypeEnum = resourceActivity.ResourceVersion.AssessmentResourceVersion.AssessmentType,
636+
634637
};
635638
}
636639
}

0 commit comments

Comments
 (0)