Skip to content

TD-4997: Video Contents in eLearning resources not getting played on … #743

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: Merge RC changes into CI
merged 2 commits into from
Nov 15, 2024
Merged

TD-4997: Video Contents in eLearning resources not getting played on … #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83daccf
TD-4997: Video Contents in eLearning resources not getting played on …
Swapnamol Nov 15, 2024
fa1936f
Formatted
Swapnamol Nov 15, 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
6 changes: 6 additions & 0 deletions LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public async Task<IActionResult> ScormContent(string filePath)

var directory = filePath.Substring(0, filePath.LastIndexOf("/"));
fileName = filePath.Substring(filePath.LastIndexOf("/") + 1, filePath.Length - filePath.LastIndexOf("/") - 1);
string extension = Path.GetExtension(fileName);

var file = await this.fileService.DownloadFileAsync(directory, fileName);

Expand All @@ -95,6 +96,11 @@ public async Task<IActionResult> ScormContent(string filePath)
contentType = "application/octet-stream";
}

if (extension == ".mp4")
{
contentType = "application/x-mpegURL";
}

result = this.File(file.Content, contentType);
bytesServed = file.ContentLength;
}
Expand Down
8 changes: 7 additions & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@
// ]
// }
//};

this.player.load(sourceConfig)
.then(() => {
console.log("Source loaded successfully!");
Expand Down Expand Up @@ -723,7 +722,14 @@
async launchScorm() {
var targetWin;
var targetWinName = "lhContent" + this.resourceItem.resourceId;
// Use a placeholder window to avoid popup blockers
targetWin = window.open("about:blank", targetWinName, "location=0,menubar=0,resizable=0,width=" + this.resourceItem.scormDetails.popupWidth + ",height=" + this.resourceItem.scormDetails.popupHeight);

// If the pop-up was blocked
if (!targetWin) {
alert("Please allow pop-ups to view this content.");
return;
}
var activeContent = await userData.getActiveContent();

if (activeContent.filter(ac => ac.resourceId === this.resourceItem.resourceId).length > 0) {
Expand Down
Loading