Merge pull request #158 from TechnologyEnhancedLearning/RC

RC changes to Master

Author: AnjuJose011

.github/azure-pipeline-database-ci.yml

@@ -1,5 +1,7 @@
 trigger:
-  - CI
+  branches:
+    include: 
+      - CI
 resources:
   repositories:
   - repository: self

.github/azure-pipeline-openapi-reportapi-ci.yml

@@ -5,7 +5,9 @@ variables:
 - name: BuildParameters.projects
   value: '**/*.csproj'
 trigger:
-  - CI
+  branches:
+    include: 
+      - CI
 name: $(date:yyyyMMdd)$(rev:.r)
 resources:
   repositories:

.github/azure-pipeline-webui-ci.yml

@@ -5,7 +5,9 @@ variables:
 - name: BuildParameters.TestProjects
   value: '**/*[Tt]ests/*.csproj'
 trigger:
-  - CI
+  branches:
+    include: 
+      - CI
 name: $(date:yyyyMMdd)$(rev:.r)
 resources:
   repositories:

AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs

@@ -59,6 +59,9 @@ public static string GetResourceTypeText(this MyLearningDetailedItemViewModel my
                 case ResourceTypeEnum.Case:
                     typeText = "Case";
                     break;
+                case ResourceTypeEnum.Html:
+                    typeText = "HTML";
+                    break;
                 default:
                     typeText = string.Empty;
                     break;
@@ -133,6 +136,7 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie
                      && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article
                          || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink
                          || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image
+                         || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Html
                          || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case))
             {
                 return "Completed";
@@ -170,6 +174,7 @@ public static ActivityStatusEnum GetActivityStatus(this MyLearningDetailedItemVi
                 && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article
                     || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink
                     || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image
+                    || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Html
                     || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case))
             {
                 return ActivityStatusEnum.Completed;

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

@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />