Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
ccbdc1d
Fix accessibility issues in My Bookmarks section
akdalin-hee Jan 30, 2024
ca92c66
Correct autocomplete references in alignment to HTML best practices
akdalin-hee Jan 30, 2024
c8f5509
Fix learner search page and search results accessibility issues
akdalin-hee Feb 5, 2024
3433b21
Fix learner catalogue pages accessibility issues
akdalin-hee Feb 12, 2024
2cdc42e
Merge pull request #13 from TechnologyEnhancedLearning/TD-3161-learne…
akdalin-hee Feb 13, 2024
86352df
Merge pull request #14 from TechnologyEnhancedLearning/TD-3159-mybook…
akdalin-hee Feb 13, 2024
f12533e
Merge pull request #51 from TechnologyEnhancedLearning/TD-3162-search…
akdalin-hee Feb 13, 2024
bdea594
Merge pull request #109 from TechnologyEnhancedLearning/TD-3163-catal…
akdalin-hee Feb 13, 2024
db7ee41
TD-3546: Azure Log -Threads are mixing synchronous code with asynchro…
Swapnamol Feb 16, 2024
e50af7f
Merge pull request #119 from TechnologyEnhancedLearning/Develop/Fix/L…
Swapnamol Feb 16, 2024
39e031e
Fix learning resources accessibility issues
akdalin-hee Feb 16, 2024
12e78f9
TD-3541- Zip file can be marked as SCORM outdated feature
Swapnamol Feb 19, 2024
3ca8fd1
Merge pull request #121 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Feb 19, 2024
7ea9997
Merge pull request #120 from TechnologyEnhancedLearning/TD-3164-fix-l…
akdalin-hee Feb 21, 2024
41a1e15
CI changes for webui from Azure
binon Feb 23, 2024
af5cf2b
CI Changes AdminnUI
binon Feb 23, 2024
670fea8
Fix resourcecontent issue
binon Feb 23, 2024
6fb7317
Ci Changes - WebAPI
binon Feb 23, 2024
c063d29
Merge pull request #60 from TechnologyEnhancedLearning/Develop/Fixes/…
kevwhitt-hee Feb 26, 2024
a01f9b3
Update azure-pipeline-webui-ci.yml for Azure Pipelines
binon Feb 26, 2024
6e33a39
Update azure-pipeline-database-ci.yml for Azure Pipelines
binon Feb 26, 2024
66180fa
Update azure-pipeline-openapi-reportapi-ci.yml for Azure Pipelines
binon Feb 26, 2024
e3463f3
Update azure-pipeline-openapi-reportapi-ci.yml for Azure Pipelines
binon Feb 26, 2024
3132793
changes merged
AnjuJose011 Feb 26, 2024
7f5c6fa
Merge pull request #144 from TechnologyEnhancedLearning/samplemerge
AnjuJose011 Feb 26, 2024
4d618fc
Update README.md
binon Feb 26, 2024
2eee5d3
Merge pull request #145 from TechnologyEnhancedLearning/CI_test_binon
binon Feb 26, 2024
60625f0
Update azure-pipeline-webui-ci.yml for Azure Pipelines
binon Feb 26, 2024
bff5337
Update azure-pipeline-database-ci.yml for Azure Pipelines
binon Feb 26, 2024
50461c9
Model Version Updated
Swapnamol Feb 26, 2024
6a8f80b
Update azure-pipeline-database-ci.yml for Azure Pipelines
binon Feb 26, 2024
d3f035e
Merge pull request #146 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Feb 26, 2024
19d9f1b
Update README.md
binon Feb 26, 2024
69805d9
Merge pull request #147 from TechnologyEnhancedLearning/CI_test_binon
binon Feb 26, 2024
8a410c0
Update azure-pipeline-database-ci.yml for Azure Pipelines
binon Feb 27, 2024
a7e7480
TD-3688: Fixed missing In progress resources in the My Accessed Learn…
sarathlal-sarangadharan Feb 27, 2024
15606fa
Update README.md
binon Feb 27, 2024
bb1049f
Merge pull request #150 from TechnologyEnhancedLearning/Develop/Fixes…
sarathlal-sarangadharan Feb 27, 2024
faeea0b
DefectFix-TD-3744
AnjuJose011 Feb 27, 2024
187650b
DefectFix-TD-3744
AnjuJose011 Feb 27, 2024
7fb52aa
Merge pull request #151 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Feb 27, 2024
4bea10d
Merge pull request #149 from TechnologyEnhancedLearning/CI_test_binon
binon Feb 27, 2024
296c7be
TD-3023 Endpoint to return directory to obsolete content
OluwatobiAwe Mar 4, 2024
8e80a75
TD-3023 delete resource file
OluwatobiAwe Mar 4, 2024
a25745b
TD-2929- SIT fixes
Swapnamol Mar 4, 2024
f513cdf
Merge pull request #172 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Mar 4, 2024
9934fa6
Merge pull request #175 from TechnologyEnhancedLearning/RC
AnjuJose011 Mar 6, 2024
f91cf97
conflict resloved
AnjuJose011 Mar 6, 2024
e8abc52
commits
AnjuJose011 Mar 6, 2024
788763f
Merge pull request #176 from TechnologyEnhancedLearning/MergePhoenixtOci
AnjuJose011 Mar 6, 2024
b4c592b
TD-3023 Update
OluwatobiAwe Mar 7, 2024
30f8bf5
Merge pull request #171 from TechnologyEnhancedLearning/Develop/Featu…
OluwatobiAwe Mar 7, 2024
d82ce44
TD-3823: CmiSuspend_data limit extended from 4096 to 64000
sarathlal-sarangadharan Mar 7, 2024
1c22f8c
Merge pull request #177 from TechnologyEnhancedLearning/Develop/Fixes…
sarathlal-sarangadharan Mar 7, 2024
f151529
TD-3886: Fix Issues Related to WEB UI-My Learning page
sarathlal-sarangadharan Mar 8, 2024
994f619
Fixes/Html
AnjuJose011 Mar 9, 2024
f0ed342
Fixes/Html
AnjuJose011 Mar 9, 2024
0962f3d
TD-3551 audio and video certificate visibility
OluwatobiAwe Mar 11, 2024
f552203
Merge pull request #180 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Mar 11, 2024
6bc5d30
Fix footer links accessibility issues
akdalin-hee Mar 11, 2024
983a2fd
Merge pull request #178 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Mar 11, 2024
210116f
Merge pull request #181 from TechnologyEnhancedLearning/TD-3177-foote…
akdalin-hee Mar 11, 2024
d6faa6d
Merge pull request #179 from TechnologyEnhancedLearning/Develop/Fixes…
OluwatobiAwe Mar 11, 2024
9b4cf93
Merge branch 'CI' into rc_binon_latest
sarathlal-sarangadharan Mar 11, 2024
2ed3f62
Merge pull request #184 from TechnologyEnhancedLearning/rc_binon_latest
binon Mar 11, 2024
42f4ef5
MergeChanges-RC
AnjuJose011 Mar 11, 2024
19a2000
Merge pull request #185 from TechnologyEnhancedLearning/Merge-RCChnag…
AnjuJose011 Mar 11, 2024
00d32f5
MergeChanges-RC
AnjuJose011 Mar 11, 2024
4a2ce59
Merge pull request #186 from TechnologyEnhancedLearning/FIX-FOR-HTMLR…
AnjuJose011 Mar 11, 2024
d295f31
conflicts resolved
AnjuJose011 Mar 14, 2024
4e4ec9e
Merge pull request #204 from TechnologyEnhancedLearning/Merge-Phoeoni…
AnjuJose011 Mar 14, 2024
f0b4d54
Committing files excluding .ts and .vue files
binon Mar 15, 2024
8f9d3d0
Commiting AdminUI .vue an .ts files
binon Mar 15, 2024
96417d6
Refactored AdminUI
binon Mar 19, 2024
8e6fc6c
Refactored webUI
binon Mar 19, 2024
7bd046b
Reintroduce missing accessibility fixes
akdalin-hee Mar 21, 2024
8d5e8a1
fixes
AnjuJose011 Mar 22, 2024
c6ab447
Merge RC Chnages to LHPheonix
AnjuJose011 Mar 22, 2024
b84a279
Merge pull request #232 from TechnologyEnhancedLearning/MergeRC-TO-LH…
AnjuJose011 Mar 22, 2024
6691b03
Merge pull request #229 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Mar 22, 2024
1a0a665
TD-1325: My Learning record disappearing after session completed
sarathlal-sarangadharan Mar 22, 2024
783008e
Fixes-TD-3699
AnjuJose011 Mar 23, 2024
a6fc577
Merge pull request #237 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Mar 25, 2024
51292ec
Merge pull request #234 from TechnologyEnhancedLearning/Develop/Fixes…
sarathlal-sarangadharan Mar 25, 2024
b7908e7
Merge pull request #242 from TechnologyEnhancedLearning/RC
AnjuJose011 Mar 27, 2024
9068108
Merge pull request #233 from TechnologyEnhancedLearning/Develop/fixes…
AnjuJose011 Mar 27, 2024
28898c9
First fix
ArunimaGeorge Mar 27, 2024
b4214a8
TD-3953: Manager Role fix
ArunimaGeorge Mar 27, 2024
8f5226d
TD-3953: Removed unwanted comments
ArunimaGeorge Mar 27, 2024
025e512
TD-3953: Removed unused namespace
ArunimaGeorge Mar 27, 2024
a3f9761
Merge pull request #244 from TechnologyEnhancedLearning/Develop/fixes…
ArunimaGeorge Apr 2, 2024
15ccf77
Merge pull request #250 from TechnologyEnhancedLearning/RC
AnjuJose011 Apr 2, 2024
7ef4c02
Model Update
AnjuJose011 Apr 3, 2024
d2d7ba5
Merge pull request #252 from TechnologyEnhancedLearning/Release-Model…
AnjuJose011 Apr 3, 2024
93eefb5
Merge pull request #253 from TechnologyEnhancedLearning/releases/LHPh…
AnjuJose011 Apr 3, 2024
7179964
Merge pull request #261 from TechnologyEnhancedLearning/RC
binon Apr 5, 2024
8646677
Got the latest and removed copy right statements
binon Apr 5, 2024
f9a9b51
Merge pull request #238 from TechnologyEnhancedLearning/Develop/Featu…
binon Apr 5, 2024
58b5da5
TD-3955: eLearning with Passed type is also included when the user co…
sarathlal-sarangadharan Apr 5, 2024
8c5fea1
TD-3955: hard coded value replaced with enum
sarathlal-sarangadharan Apr 8, 2024
fb55101
Merge pull request #262 from TechnologyEnhancedLearning/Develop/Fixes…
sarathlal-sarangadharan Apr 8, 2024
d10b84b
TD-2954: 1. Filter issue with combination of Complted and eLearning f…
sarathlal-sarangadharan Apr 8, 2024
84a98cc
TD-4014-Fixes
AnjuJose011 Apr 9, 2024
b0d4657
Merge pull request #263 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 9, 2024
4aea339
Merge pull request #264 from TechnologyEnhancedLearning/TD-4014-Dupli…
AnjuJose011 Apr 9, 2024
4a6d933
Fixes-TD-3959
AnjuJose011 Apr 9, 2024
7c49c9e
Merge pull request #266 from TechnologyEnhancedLearning/RC
binon Apr 9, 2024
cb19f46
TD-4017 - The AMS features should be configured in Azure function repos
binon Apr 9, 2024
82a099f
Merge pull request #265 from TechnologyEnhancedLearning/TD-3959-Fixes
AnjuJose011 Apr 9, 2024
de73449
Merge pull request #269 from TechnologyEnhancedLearning/Develop/Featu…
binon Apr 9, 2024
9c55d27
TD-4016:Remove character limit from catalogue description
sarathlal-sarangadharan Apr 10, 2024
328b55b
TD-2954: Filter issue in combination of Assessment and Completed (Iss…
sarathlal-sarangadharan Apr 11, 2024
5c2e39e
Merge pull request #273 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 11, 2024
bd7ec86
TD-4016: Updated models package in WebUI project
sarathlal-sarangadharan Apr 11, 2024
2670516
Merge pull request #272 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 11, 2024
6b455d4
TD-2954: Filter issues for assessment resolved
sarathlal-sarangadharan Apr 11, 2024
256f662
Included missing file
Swapnamol Apr 11, 2024
990131d
TD-2954:Model package version changed to 3.0.31
sarathlal-sarangadharan Apr 11, 2024
ee12fad
Merge pull request #276 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Apr 11, 2024
863ef33
Merge pull request #275 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 11, 2024
081fa43
Modified the build action to None
Swapnamol Apr 11, 2024
47f04e7
Merge pull request #277 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Apr 11, 2024
76f227f
TD-4016: Deployement issue fix
sarathlal-sarangadharan Apr 12, 2024
4815a72
Merge pull request #278 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 12, 2024
458ce58
TD-4016:Build fail fix
sarathlal-sarangadharan Apr 12, 2024
09be671
TD-4016:Build issue fix
sarathlal-sarangadharan Apr 12, 2024
7e1215b
Merge pull request #280 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 12, 2024
da0620e
TD-4016:Build fail fix
sarathlal-sarangadharan Apr 12, 2024
16bd8bd
Merge pull request #282 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 12, 2024
51a237e
TD-2954: Filter fix
sarathlal-sarangadharan Apr 12, 2024
03c510e
Merge pull request #283 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 15, 2024
9f49785
TD-2954: Missing logic added
sarathlal-sarangadharan Apr 15, 2024
c7f27c9
TD-2954: Deployment fail issue fix
sarathlal-sarangadharan Apr 15, 2024
cb4ec4f
Merge pull request #284 from TechnologyEnhancedLearning/Develop/Featu…
sarathlal-sarangadharan Apr 15, 2024
3fe0a28
TD-3285, vue cache storing the feature flag inconsitently, update the…
binon Apr 15, 2024
7f058d9
Merge pull request #285 from TechnologyEnhancedLearning/Develop/Featu…
binon Apr 15, 2024
4935eb1
Apply additional corrections for TD3162 and TD3163
akdalin-hee Apr 16, 2024
c3a2983
TD-3023 unpublished and deleted draft resource file refactor
OluwatobiAwe Apr 16, 2024
3c9eae8
Merge pull request #288 from TechnologyEnhancedLearning/Develop/Fixes…
OluwatobiAwe Apr 16, 2024
27b6cfa
TD-3023 limit the removal of output content to scorm and html resourc…
OluwatobiAwe Apr 17, 2024
bfa29c6
Merge pull request #289 from TechnologyEnhancedLearning/Develop/Fixes…
OluwatobiAwe Apr 17, 2024
c1a4545
Merge pull request #287 from TechnologyEnhancedLearning/TD-3162-TD-31…
AnjuJose011 Apr 17, 2024
0a9403e
TD-3741 - LMS server issue related to active content cache is null.
Swapnamol Apr 17, 2024
28ec872
Merge pull request #292 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Apr 17, 2024
011e9c0
TD-4047: Duplicate records appearing in Mylearning page. Brought back…
sarathlal-sarangadharan Apr 17, 2024
1292930
Merge pull request #294 from TechnologyEnhancedLearning/Develop/Fixes…
sarathlal-sarangadharan Apr 17, 2024
9a81d19
Corrected the naming convention for uniformity
Swapnamol Apr 17, 2024
6ac60ae
Merge pull request #295 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Apr 17, 2024
a9dd7fe
TD-3955 : Reverted the changes related to the Scorm commit
Swapnamol Apr 17, 2024
f7ab65d
Merge pull request #296 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Apr 17, 2024
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
11 changes: 9 additions & 2 deletions .github/azure-pipeline-database-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
trigger:
branches:
include:
- CI
exclude:
- '*'

pr:
branches:
exclude:
- '*'

resources:
repositories:
- repository: self
Expand All @@ -12,6 +18,7 @@ jobs:
displayName: Agent job
pool:
vmImage: windows-2019
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/CI'))
steps:
- checkout: self
clean: true
Expand Down
4 changes: 3 additions & 1 deletion .github/azure-pipeline-openapi-reportapi-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ trigger:
branches:
include:
- CI
exclude:
- '*'
name: $(date:yyyyMMdd)$(rev:.r)
resources:
repositories:
- repository: self
type: git
ref: refs/heads/RC
ref: refs/heads/CI
jobs:
- job: Job_1
displayName: Agent job
Expand Down
5 changes: 1 addition & 4 deletions .github/azure-pipeline-webui-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ variables:
value: '**/*.csproj'
- name: BuildParameters.TestProjects
value: '**/*[Tt]ests/*.csproj'
trigger:
branches:
include:
- CI
# Triggered Via Azure pipeline
name: $(date:yyyyMMdd)$(rev:.r)
resources:
repositories:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Threading.Tasks;
using LearningHub.Nhs.AdminUI.Configuration;
using LearningHub.Nhs.AdminUI.Extensions;
using LearningHub.Nhs.AdminUI.Helpers;
using LearningHub.Nhs.AdminUI.Interfaces;
using LearningHub.Nhs.AdminUI.Models;
using LearningHub.Nhs.Models.Common;
Expand All @@ -16,6 +17,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.FeatureManagement;

/// <summary>
/// Defines the <see cref="ResourceController" />.
Expand All @@ -32,6 +34,11 @@ public class ResourceController : BaseController
/// </summary>
private readonly IOptions<WebSettings> websettings;

/// <summary>
/// Defines the featureManager.
/// </summary>
private readonly IFeatureManager featureManager;

/// <summary>
/// Defines the _logger.
/// </summary>
Expand All @@ -55,18 +62,21 @@ public class ResourceController : BaseController
/// <param name="logger">The logger<see cref="ILogger{HomeController}"/>.</param>
/// <param name="resourceService">The resourceService<see cref="IResourceService"/>.</param>
/// /// <param name="websettings">The websettings<see cref="IOptions{WebSettings}"/>.</param>
/// <param name="featureManager">The featureManager<see cref="IFeatureManager"/>.</param>
public ResourceController(
IWebHostEnvironment hostingEnvironment,
IOptions<WebSettings> config,
ILogger<HomeController> logger,
IResourceService resourceService,
IOptions<WebSettings> websettings)
IOptions<WebSettings> websettings,
IFeatureManager featureManager)
: base(hostingEnvironment)
{
this.logger = logger;
this.websettings = websettings;
this.config = config.Value;
this.resourceService = resourceService;
this.featureManager = featureManager;
}

/// <summary>
Expand Down Expand Up @@ -309,6 +319,33 @@ public async Task<IActionResult> Unpublish(int resourceVersionId, string details
}
}

/// <summary>
/// The GetAVUnavailableView.
/// </summary>
/// <returns> partial view. </returns>
[Route("Resource/GetAVUnavailableView")]
[HttpGet("GetAVUnavailableView")]
public IActionResult GetAVUnavailableView()
{
return this.PartialView("_AudioVideoUnavailable");
}

/// <summary>
/// The GetAddAVFlag.
/// </summary>
/// <returns> Return AV Flag.</returns>
[Route("Resource/GetAddAVFlag")]
[HttpGet("GetAddAVFlag")]
public bool GetAddAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.AddAudioVideo).Result;

/// <summary>
/// The GetDisplayAVFlag.
/// </summary>
/// <returns> Return display AV flag.</returns>
[Route("Resource/GetDisplayAVFlag")]
[HttpGet("GetDisplayAVFlag")]
public bool GetDisplayAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.DisplayAudioVideo).Result;

private static List<PagingOptionPair> FilterOptions()
{
List<PagingOptionPair> options = new List<PagingOptionPair>();
Expand Down
18 changes: 18 additions & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Helpers/FeatureFlags.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace LearningHub.Nhs.AdminUI.Helpers
{
/// <summary>
/// <see cref="FeatureFlags"/>.
/// </summary>
public static class FeatureFlags
{
/// <summary>
/// The AddAudioVideo.
/// </summary>
public const string AddAudioVideo = "AddAudioVideo";

/// <summary>
/// The DisplayAudioVideo.
/// </summary>
public const string DisplayAudioVideo = "DisplayAudioVideo";
}
}
35 changes: 16 additions & 19 deletions AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
/// <returns>The .</returns>
public static string GetActivityStatusDisplayText(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel)
{
if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
&& (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article
|| myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink
|| myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image
Expand All @@ -137,7 +137,7 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie
{
return "Completed";
}
else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
&& (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile))
{
return "Downloaded";
Expand All @@ -164,36 +164,33 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie
/// </summary>
/// <param name="myLearningDetailedItemViewModel">The myLearningDetailedItemViewModel.</param>
/// <returns>The <see cref="ActivityStatusEnum"/>.</returns>
public static ActivityStatusEnum GetActivityStatus(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel)
public static string GetActivityStatus(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel)
{
if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
&& (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article
|| myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink
|| myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image
|| myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Html
|| myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case))
{
return ActivityStatusEnum.Completed;
return "Viewed";
}
else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
&& (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile))
else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
&& (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink))
{
return ActivityStatusEnum.Downloaded;
return "Launched";
}
else if (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment)
else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
&& (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile))
{
if (myLearningDetailedItemViewModel.Complete)
{
return myLearningDetailedItemViewModel.ScorePercentage >= myLearningDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.Failed;
}
else
{
return myLearningDetailedItemViewModel.ScorePercentage >= myLearningDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.InProgress;
}
return ActivityStatusEnum.Downloaded.ToString();
}
else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Incomplete)
{
return ActivityStatusEnum.InProgress.ToString();
}
else
{
return myLearningDetailedItemViewModel.ActivityStatus;
return myLearningDetailedItemViewModel.ActivityStatus.ToString();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@
<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.29" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
<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" />
<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div v-html="getDescription" />
</div>
<div class="information-page__asset-container">
<div id="mediaContainer" :class="[`${disableVideoControl ? 'videoControlDisabled' : ''}`]" v-show="sectionTemplateType === SectionTemplateType.Video" class="w-100">
<div id="mediaContainer" :class="[`${disableVideoControl ? 'videoControlDisabled' : ''}`]" v-show="sectionTemplateType === SectionTemplateType.Video && displayAVFlag" class="w-100">
<video controls v-show="section.id" :id="[`azureMediaPlayer${section.id}`]"
data-setup='{"logo": { "enabled": false }, "techOrder": ["azureHtml5JS", "flashSS", "silverlightSS", "html5"], "nativeControlsForTouch": false, "fluid": true}'
class="azuremediaplayer amp-default-skin amp-big-play-centered" style="height:250px;">
Expand All @@ -33,6 +33,9 @@
</div>
</div>
</div>
<div v-if="!displayAVFlag">
<div v-html="audioVideoUnavailableView"></div>
</div>
</div>
<div v-if="sectionTemplateType === SectionTemplateType.Image && section.imageAsset" class="nhsuk-grid-column-full">
<div :class="[`information-page__container ${section.sectionLayoutType == SectionLayoutType.Left ? 'information-page__container--reverse-child-order' : '' } ${section.hasBorder ? 'information-page__container--border' : '' }`]">
Expand Down Expand Up @@ -78,10 +81,14 @@
SectionTemplateType: SectionTemplateType,
pageSectionDetail: null as PageSectionDetailModel,
disableVideoControl: false,
displayAVFlag: false,
audioVideoUnavailableView : '' as string,
};
},
created() {
this.load();
this.getDisplayAVFlag();
this.getAudioVideoUnavailableView();
},
computed: {
getStyle() {
Expand Down Expand Up @@ -125,7 +132,7 @@
returnClass = "information-page__text-container--no-padding-right";
}
}
return returnClass;
return returnClass;
},
getDescription() {
if (this.section.description) {
Expand All @@ -138,50 +145,60 @@
},
isRightSectionLayout() {
return this.section.sectionLayoutType == SectionLayoutType.Right;
}
},
},
methods: {
getDisplayAVFlag() {
contentData.getDisplayAVFlag().then(response => {
this.displayAVFlag = response;
});
},
getAudioVideoUnavailableView() {
contentData.getAVUnavailableView().then(response => {
this.audioVideoUnavailableView = response;
});
},
load() {
if (this.sectionTemplateType === SectionTemplateType.Video) {
contentData.getPageSectionDetailVideo(this.section.id).then(response => {
this.pageSectionDetail = response;
contentData.getPageSectionDetailVideo(this.section.id).then(response => {
this.pageSectionDetail = response;

if (!this.pageSectionDetail.videoAsset)
return;
if (!this.pageSectionDetail.videoAsset)
return;

const id = 'azureMediaPlayer' + this.pageSectionDetail.id;
let azureMediaPlayer = amp(id);
const id = 'azureMediaPlayer' + this.pageSectionDetail.id;
let azureMediaPlayer = amp(id);

if (this.pageSectionDetail.videoAsset.azureMediaAsset) {
$(`#${id}`).css({ 'height': '', 'border': '1px solid #768692' });
this.disableVideoControl = false;
} else {
this.disableVideoControl = true;
}
if (this.pageSectionDetail.videoAsset.azureMediaAsset) {
$(`#${id}`).css({ 'height': '', 'border': '1px solid #768692' });
this.disableVideoControl = false;
} else {
this.disableVideoControl = true;
}

if (this.pageSectionDetail.videoAsset.thumbnailImageFile) {
azureMediaPlayer.poster(`/file/download/${this.pageSectionDetail.videoAsset.thumbnailImageFile.filePath}/${this.pageSectionDetail.videoAsset.thumbnailImageFile.fileName}`);
}
if (this.pageSectionDetail.videoAsset.azureMediaAsset && this.pageSectionDetail.videoAsset.closedCaptionsFile) {
azureMediaPlayer.src([{
type: "application/vnd.ms-sstr+xml",
src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
}],
[{ kind: "captions", src: `/file/download/${this.pageSectionDetail.videoAsset.closedCaptionsFile.filePath}/${this.pageSectionDetail.videoAsset.closedCaptionsFile.fileName}`, srclang: "en", label: "english" }]);
}
else if (this.pageSectionDetail.videoAsset.azureMediaAsset && !this.pageSectionDetail.videoAsset.closedCaptionsFile) {
azureMediaPlayer.src([{
type: "application/vnd.ms-sstr+xml",
src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
}]);
}
});
} else {
contentData.getPageSectionDetail(this.section.id).then(x => this.pageSectionDetail = x);
}
},
if (this.pageSectionDetail.videoAsset.thumbnailImageFile) {
azureMediaPlayer.poster(`/file/download/${this.pageSectionDetail.videoAsset.thumbnailImageFile.filePath}/${this.pageSectionDetail.videoAsset.thumbnailImageFile.fileName}`);
}
if (this.pageSectionDetail.videoAsset.azureMediaAsset && this.pageSectionDetail.videoAsset.closedCaptionsFile) {
azureMediaPlayer.src([{
type: "application/vnd.ms-sstr+xml",
src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
}],
[{ kind: "captions", src: `/file/download/${this.pageSectionDetail.videoAsset.closedCaptionsFile.filePath}/${this.pageSectionDetail.videoAsset.closedCaptionsFile.fileName}`, srclang: "en", label: "english" }]);
}
else if (this.pageSectionDetail.videoAsset.azureMediaAsset && !this.pageSectionDetail.videoAsset.closedCaptionsFile) {
azureMediaPlayer.src([{
type: "application/vnd.ms-sstr+xml",
src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
}]);
}
});
} else {
contentData.getPageSectionDetail(this.section.id).then(x => this.pageSectionDetail = x);
}
},
getAESProtection(token: string): string {
var aesProtectionInfo = '{"protectionInfo": [{"type": "AES", "authenticationToken":"Bearer=' + token + '"}], "streamingFormats":["SMOOTH","DASH"]}';
return aesProtectionInfo;
Expand All @@ -198,7 +215,7 @@
},
watch: {
section() {
this.load();
this.load();
}
}
})
Expand Down
Loading