Skip to content

Commit 2cc9c9b

Browse files
AnjuJose011AnjuJose011
authored
Merge pull request #174 from TechnologyEnhancedLearning/RC
Merge LH puppis Changes to Master
2 parents afa96ed + 166f07d commit 2cc9c9b

File tree

13 files changed

+109
-99
lines changed

13 files changed

+109
-99
lines changed

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@
228228

229229
<div class="row">
230230
<div class="col-12">
231-
<label>Content provided by</label>
231+
<label>Content developed with</label>
232232
<p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
233233
<p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
234-
<p class="providertext">Provided by;</p>
234+
<p class="providertext">Developed with;</p>
235235
</div>
236236
</div>
237237

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<dl>
154154
@if (Model.Providers != null && Model.Providers.Count > 0)
155155
{
156-
<dt>Provided by</dt>
156+
<dt>Developed with</dt>
157157
@foreach (var provider in Model.Providers)
158158
{
159159
<dd>

‎AdminUI/LearningHub.Nhs.AdminUI/Views/User/Details.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<a class="tab-link" id="contributions-tab" data-toggle="tab" href="#contributions" role="tab" aria-controls="contributions" aria-selected="false">Contributions</a>
5656
</li>
5757
<li class="tab-item large">
58-
<a class="tab-link" id="providedBy-tab" data-toggle="tab" href="#providedByPermission" role="tab" aria-controls="providedby" aria-selected="false">Provided by permission</a>
58+
<a class="tab-link" id="providedBy-tab" data-toggle="tab" href="#providedByPermission" role="tab" aria-controls="providedby" aria-selected="false">Developed with permission</a>
5959
</li>
6060
<li class="tab-item">
6161
<a class="tab-link" id="history-tab" data-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>

‎AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserProviders.cshtml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
@model List<SelectListItem>
44

55
<div class="mt-5">
6-
<div class="row">
7-
<div class="col-12">
8-
<h1>Provided by permission</h1>
9-
<p class="providertext ">Give permission to allow a contributor to flag content from a specific provider. This helps to separate learning resources from community contributions. </p>
10-
<p class="providertext">Select the relevant providers;</p>
6+
<div class="row">
7+
<div class="col-12">
8+
<h1>Developed with permission</h1>
9+
<p class="providertext ">Give permission to allow a contributor to flag content from a specific provider. This helps to separate learning resources from community contributions. </p>
10+
<p class="providertext">Select the relevant providers;</p>
11+
</div>
1112
</div>
12-
</div>
1313

14-
<div class="row mt-2">
15-
<div class="col-12">
16-
@if (Model != null && Model.Count > 0)
17-
{
18-
<div class="form-check form-check-vertical">
19-
@foreach (var item in Model)
20-
{
21-
<input type="checkbox" class="form-check-input-provider" id=@($"provider_{item.Value}") name="providers" value="@item.Value" checked="@item.Selected" />
22-
<span class="span-provider providertext">@item.Text</span>
23-
<br />
24-
}
14+
<div class="row mt-2">
15+
<div class="col-12">
16+
@if (Model != null && Model.Count > 0)
17+
{
18+
<div class="form-check form-check-vertical">
19+
@foreach (var item in Model)
20+
{
21+
<input type="checkbox" class="form-check-input-provider" id=@($"provider_{item.Value}") name="providers" value="@item.Value" checked="@item.Selected" />
22+
<span class="span-provider providertext">@item.Text</span>
23+
<br />
24+
}
25+
</div>
26+
}
2527
</div>
26-
}
2728
</div>
28-
</div>
2929
</div>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ public LearningSessionsController(
5454
public async Task<IActionResult> Scorm(int id)
5555
{
5656
var rv = await this.resourceService.GetItemByIdAsync(id);
57+
if (rv != null)
58+
{
59+
this.ViewBag.FilePath = $"/ScormContent/{rv.ScormDetails.ContentFilePath}/{rv.ScormDetails.ScormManifest.ManifestUrl}";
60+
}
5761

5862
this.ViewBag.ResourceReferenceId = id;
59-
this.ViewBag.FilePath = $"/ScormContent/{rv.ScormDetails.ContentFilePath}/{rv.ScormDetails.ScormManifest.ManifestUrl}";
6063
this.ViewBag.KeepUserSessionAliveInterval = Convert.ToInt32(this.settings.Value.KeepUserSessionAliveIntervalMins) * 60000;
6164
this.ViewBag.UseTraceWindow = await this.userGroupService.UserHasPermissionAsync("Scorm_Trace_Window");
6265

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static string GetProvidersString(List<string> providerNames)
2222

2323
if (providerNames != null && providerNames.Count > 0)
2424
{
25-
providerstring += "Provided by ";
25+
providerstring += "Developed with ";
2626
providerstring += string.Join(", ", providerNames.ToArray());
2727
}
2828

‎LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/Contribute.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</template>
9696
<template v-slot:tab_2>
9797
<Tick :complete="providedbyPermissionTabComplete"></Tick>
98-
Content provided by
98+
Content developed with
9999
</template>
100100
<template v-slot:page_2>
101101
<ContributeProvideByTab :resourceDetails="resourceDetails" :userProviders="userProviders" />

‎LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="lh-padding-fluid">
33
<div class="lh-container-xl py-15">
44
<div class="contribute contribute-providedby-tab">
5-
<h2 id="licence-heading" class="nhsuk-heading-l pt-15">Content provided by</h2>
5+
<h2 id="licence-heading" class="nhsuk-heading-l pt-15">Content developed with</h2>
66
<p class="nhsuk-u-font-weight-normal">When applicable pease select the provider of this content. This will enable users to search for content produced by specific organisations.</p>
77
<div class="my-3">
88
<input class="radio-button" name="resourceProviderId" type="radio" :value="0" v-model="resourceProviderId" @click="setResourceProvider($event.target.value)" />
@@ -22,15 +22,15 @@
2222
<div class="heading" id="headingProvidedBy">
2323
<div class="mb-0">
2424
<a href="#" class="collapsed" data-toggle="collapse" data-target="#collapseProvidedByInfo" aria-expanded="false" aria-controls="collapseProvidedByInfo">
25-
<div class="accordion-arrow">Why should I flag a resource as 'Provided by'</div>
25+
<div class="accordion-arrow">Why should I flag a resource as 'Developed with'</div>
2626
</a>
2727
</div>
2828
</div>
2929
<div id="collapseProvidedByInfo" class="collapse" aria-labelledby="headingProvidedBy" data-parent="#provided-by-info-accordion">
3030
<div class="content col-12">
3131
<p>
3232
<b>
33-
When publishing a resource it is important to mark a resource as 'Provided by' as it helps;
33+
When publishing a resource it is important to mark a resource as 'Developed with' as it helps;
3434
</b>
3535
</p>
3636
<ul>

‎LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div v-if="showProviders">
44
<div class="row">
55
<div class="form-group col-12">
6-
<h2 class="nhsuk-heading-l">Content provided by<i v-if="resourceProviderId === null" class="warningTriangle fas fa-exclamation-triangle"></i></h2>
6+
<h2 class="nhsuk-heading-l">Content developed with<i v-if="resourceProviderId === null" class="warningTriangle fas fa-exclamation-triangle"></i></h2>
77
</div>
88
</div>
99
<div class="row mt-3">
@@ -26,15 +26,15 @@
2626
<div class="heading" id="headingProvidedBy">
2727
<div class="mb-0">
2828
<a href="#" class="collapsed" data-toggle="collapse" data-target="#collapseProvidedByInfo" aria-expanded="false" aria-controls="collapseProvidedByInfo">
29-
<div class="accordion-arrow">Why should I flag a resource as 'Provided by'</div>
29+
<div class="accordion-arrow">Why should I flag a resource as 'Developed with'</div>
3030
</a>
3131
</div>
3232
</div>
3333
<div id="collapseProvidedByInfo" class="collapse" aria-labelledby="headingProvidedBy" data-parent="#provided-by-info-accordion">
3434
<div class="content col-12">
3535
<p>
3636
<b>
37-
When publishing a resource it is important to mark a resource as 'Provided by' as it helps;
37+
When publishing a resource it is important to mark a resource as 'Developed with' as it helps;
3838
</b>
3939
</p>
4040
<ul>

‎WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityGetSummary.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BEGIN
2727
INNER JOIN
2828
resources.[ResourceVersion] rv ON rv.id = r.CurrentResourceVersionId
2929
WHERE
30-
rr.id = @ResourceReferenceId
30+
rr.OriginalResourceReferenceId = @ResourceReferenceId
3131
AND rr.Deleted = 0
3232
AND r.Deleted = 0
3333
AND rv.Deleted = 0
@@ -61,4 +61,4 @@ BEGIN
6161
END
6262
END
6363

64-
GO
64+
GO

0 commit comments

Comments
 (0)