Skip to content

TD-6228: Fixed headings issue on Activity report #1426

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
merged 2 commits into from
Sep 22, 2025
Merged

TD-6228: Fixed headings issue on Activity report #1426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a2746f
TD-6228: Fixed headings issue on Activity report
ArunimaGeorge Sep 19, 2025
2a2a689
TD-6228: alignment updated
ArunimaGeorge Sep 19, 2025
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
151 changes: 83 additions & 68 deletions LearningHub.Nhs.WebUI/Views/MyLearning/DownloadActivityRecords.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,22 +993,12 @@

.my-learning table, th, td {
width: 100%;
border: 1px solid;
border-color: #005eb8;
}

.my-learning th.Learningresource {
width: 15%;
}

.my-learning thead tr:nth-child(odd) {
background-color: #f0f4f5 !important;
}

.my-learning tbody tr span {
background-color: #f0f4f5 !important;
}

@@media (max-width: 599px) {
.my-learning .summaryTableHead {
width: 100vw;
Expand All @@ -1023,10 +1013,6 @@
border: 1px solid #005eb8;
}

.my-learning .summarytabledetailscells {
border: 1px solid #005eb8;
}

.my-learning .certificateBody {
text-align: center;
}
Expand All @@ -1048,7 +1034,6 @@

.my-learning table {
width: 100%;
border: 1px solid #d8dde0;
}

.my-learning .no-table-spacing {
Expand All @@ -1070,25 +1055,55 @@
margin: 0;
}

.my-learning-column-width {
width: 110px;
}

.my-learning table tr {
border-bottom: 2px solid #d8dde0;
}

.my-learning-report-heading {
margin-left: -30px;
}

</style>
</head>
<div class="my-learning">

<div class="my-learning bg-white">
<div class="nhsuk-width-container app-width-container">
<div class="nhsuk-grid-row">
<div class="nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-7">
<h1 class="nhsuk-heading-xl">Activity report: <span class="no-wrap"> @Model.Item1.FirstName @Model.Item1.LastName (@Model.Item1.UserName)</h1>
<div class="nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-2">
<div class="lh-container-xl">
<div>
<img src="https://learninghub.nhs.uk/images/NHS-white.svg" alt="NHS" />
<div class="header-title">Learning Hub<sup class="header-beta" style="color: #768692;">Beta</sup></div>
</div>
</div>
<div class="lh-container-xl">
<div class="activity-report-heading pb-4">
<h1 class="nhsuk-heading-l">Activity report: <span class="nhsuk-caption-l no-wrap"> @Model.Item1.FirstName @Model.Item1.LastName (@Model.Item1.UserName)</span></h1>
</div>
</div>
</div>


<!-- Right column: Main content -->
<div class="nhsuk-grid-column-full">
<div class="nhsuk-u-padding-bottom-4">
<hr class="nhsuk-section-break nhsuk-section-break--visible">
</div>
<div>
<table style="width:100%;table-layout:fixed" role="table" class="nhsuk-table-responsive">
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="nhsuk-u-padding-top-2 my-learning-column-width" scope="col">
Id
</th>
<th role="columnheader" class="nhsuk-u-padding-top-2" scope="col">
Title
</th>
<th role="columnheader" class="nhsuk-u-padding-top-2 my-learning-column-width" scope="col">
Status
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var activity in Model.Item2.Activities)
{

var isCompleted = ViewActivityHelper.GetActivityStatusDisplayText(activity) == ActivityStatusEnum.Completed.ToString();

var typeLabelClass = isCompleted ? "nhsuk-u-primary-text-color" : "nhsuk-u-secondary-text-color";
Expand All @@ -1102,19 +1117,21 @@
var dateTimeText = activityDate == today ? "Today"
: activityDate == today.AddDays(-1) ? "Yesterday"
: activityDate.ToString("dd MMM yyyy");

<div>
<span class="nhsuk-u-padding-bottom-3">
@if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
{
<a class="nhsuk-u-font-size-19" href="@GetMoodleCourseUrl(activity.ResourceId)">@activity.Title</a>
}
else
{
<a class="nhsuk-u-font-size-19" href="@GetResourceUrl(activity.ResourceReferenceId)">@activity.Title</a>
}
</span>
<div>
<tr role="row" class="nhsuk-table__row">
<td role="cell" class="nhsuk-table__cell word-wrapper">
<span>@activity.ResourceReferenceId</span>
</td>
<td>
<span class="nhsuk-u-padding-bottom-3">
@if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
{
<a class="nhsuk-u-font-size-19" href="@GetMoodleCourseUrl(activity.ResourceId)">@activity.Title</a>
}
else
{
<a class="nhsuk-u-font-size-19" href="@GetResourceUrl(activity.ResourceReferenceId)">@activity.Title</a>
}
</span>
<div class="nhs-item-row nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
<div>
<span class="@typeLabelClass nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2">Type:</span>
Expand All @@ -1131,13 +1148,6 @@
@dateTimeText
</span>
</div>
<div>
<span class="nhsuk-u-text-align-left table-content-spacing">
<strong class="nhsuk-tag @tagColorClass">
@statusText
</strong>
</span>
</div>
</div>
@if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
{
Expand Down Expand Up @@ -1189,34 +1199,39 @@
<div class="nhsuk nhsuk-u-font-size-16 nhsuk-u-secondary-text-color">
Includes a certificate
<span class="nhsuk-u-padding-left-1">
<svg xmlns="http://www.w3.org/2000/svg" width="19" height="24" viewBox="0 0 19 24" fill="none">
<g clip-path="url(#clip0_1298_21764)">
<path d="M13.7817 18.9737V23.1883C13.7817 23.4148 13.1731 23.5225 12.8452 23.3543L9.9952 21.8784C9.77736 21.7662 9.39332 21.7685 9.18221 21.8851L6.60399 23.3139C6.28284 23.4911 5.65625 23.3879 5.65625 23.1546V17.6055" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
<path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08685 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4613 6.93535 16.2456 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" fill="#F2F8FD" />
<path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08686 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4612 6.93535 16.2455 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
<path d="M9.64784 13.2915L5.35156 8.03622L7.21336 5.27734H12.3698L14.0901 8.03622L9.64784 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
<path d="M9.68893 13.2915L7.71484 8.03622L8.57051 5.27734H10.9376L11.7259 8.03622L9.68893 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
<path d="M5.53516 7.99609H12.5556" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
</g>
<defs>
<clipPath id="clip0_1298_21764">
<rect width="18.5764" height="24" fill="white" transform="translate(0.421875)" />
</clipPath>
</defs>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="19" height="24" viewBox="0 0 19 24" fill="none">
<g clip-path="url(#clip0_1298_21764)">
<path d="M13.7817 18.9737V23.1883C13.7817 23.4148 13.1731 23.5225 12.8452 23.3543L9.9952 21.8784C9.77736 21.7662 9.39332 21.7685 9.18221 21.8851L6.60399 23.3139C6.28284 23.4911 5.65625 23.3879 5.65625 23.1546V17.6055" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
<path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08685 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4613 6.93535 16.2456 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" fill="#F2F8FD" />
<path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08686 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4612 6.93535 16.2455 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
<path d="M9.64784 13.2915L5.35156 8.03622L7.21336 5.27734H12.3698L14.0901 8.03622L9.64784 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
<path d="M9.68893 13.2915L7.71484 8.03622L8.57051 5.27734H10.9376L11.7259 8.03622L9.68893 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
<path d="M5.53516 7.99609H12.5556" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
</g>
<defs>
<clipPath id="clip0_1298_21764">
<rect width="18.5764" height="24" fill="white" transform="translate(0.421875)" />
</clipPath>
</defs>
</svg>
</span>
</div>
}
</div>
}
</div>
<div class="nhsuk-u-padding-bottom-5">
<hr class="nhsuk-section-break nhsuk-section-break--visible ">
</div>
</div>
</td>
<td>
<span class="nhsuk-u-text-align-left table-content-spacing">
<strong class="nhsuk-tag @tagColorClass">
@statusText
</strong>
</span>
</td>

</tr>
}
</div>
</div>
</tbody>
</table>
</div>
</div>
</div>
Loading