Skip to content

Commit 53baede

Browse files
committed
Revert "Revert "Merge pull request #2118 from TechnologyEnhancedLearning/Develop/Fixes/TD-2371_space_seen_instead_of_graph_for_short_date_range_in_course_usage_screen""
This reverts commit 8242a56.
1 parent 9f4f867 commit 53baede

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

DigitalLearningSolutions.Web/Scripts/chartCommon.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ function getViewMoreLink() {
153153
export function setUpToggleActivityRowsButton() {
154154
const viewMoreLink = getViewMoreLink();
155155

156-
viewMoreLink.addEventListener('click', (event) => {
157-
event.preventDefault();
158-
toggleVisibleActivityRows();
159-
});
156+
if (viewMoreLink != null) {
157+
viewMoreLink.addEventListener('click', (event) => {
158+
event.preventDefault();
159+
toggleVisibleActivityRows();
160+
});
161+
}
160162
}

DigitalLearningSolutions.Web/Views/SuperAdmin/PlatformReports/_CourseActivityTable.cshtml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@
4646
</tbody>
4747
</table>
4848

49-
<div class="nhsuk-u-margin-top-4">
50-
<a id="@(toggleableActivityButtonId)"
49+
@if (Model.Rows.Count() > defaultNumOfRowsVisible)
50+
{
51+
<div class="nhsuk-u-margin-top-4">
52+
<a id="@(toggleableActivityButtonId)"
5153
role="button"
5254
class="nhsuk-u-margin-top-4 js-only-inline"
5355
href="#">
54-
View more
55-
</a>
56-
</div>
56+
View more
57+
</a>
58+
</div>
59+
}

0 commit comments

Comments
 (0)