Skip to content

Develop/fixes/td 4298 my learning page showing additional video results with invalid date/time #1136

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: Release v1.5.1 grass lily To Test
merged 5 commits into from
May 21, 2025
Merged

Develop/fixes/td 4298 my learning page showing additional video results with invalid date/time #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5af1fd7
TD-5608: Radio buttons / rating stars selection misaligned
swapnamol-abraham May 19, 2025
06b03f1
Merge pull request #1129 from TechnologyEnhancedLearning/Develop/Fixe…
swapnamol-abraham May 19, 2025
98e4098
TD-5608: Fixed the radiobutton alignment issues
swapnamol-abraham May 19, 2025
4d35089
Merge pull request #1130 from TechnologyEnhancedLearning/Develop/Fixe…
swapnamol-abraham May 19, 2025
1d4d667
TD-4298: My Learning page showing additional video results with inval…
swapnamol-abraham May 21, 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
42 changes: 41 additions & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,45 @@
filter: grayscale(0) !important;
}


label {
display: inline-flex;
align-items: center;
gap: 5px; /* space between radio and text */
}
/*Add a background color to the radio button when focused */
.radio-button:focus {
box-shadow: 0 0 0 4px $nhsuk-yellow !important;
outline: 0;
//box-shadow: 0 0 0 4px rgba(255, 255, 0, 0.5);
}

.radio-button {
appearance: none;
-webkit-appearance: none;
width: 24px;
height: 24px;
border: 2px solid black;
border-radius: 50%;
position: relative;
cursor: pointer;
transition: box-shadow 0.3s;
outline: none;
}

/* Yellow glow on focus */
.radio-button:focus {
box-shadow: 0 0 0 4px $nhsuk-yellow; /* yellow circle */
}

/* Inner black dot when selected */
.radio-button:checked::before {
content: "";
position: absolute;
top: 4px;
left: 4px;
width: 12px;
height: 12px;
background-color: black;
border-radius: 50%;
}
</style>
46 changes: 46 additions & 0 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,3 +602,49 @@
})

</script>
<style lang="scss" scoped>
@use "../../../Styles/abstracts/all" as *;
label {
display: inline-flex;
align-items: center;
gap: 5px; /* space between radio and text */
margin: 7px;
}
/*Add a background color to the radio button when focused */
.radio-button:focus {
box-shadow: 0 0 0 4px $nhsuk-yellow !important;
outline: 0;
//box-shadow: 0 0 0 4px rgba(255, 255, 0, 0.5);
}

.radio-button {
appearance: none;
-webkit-appearance: none;
width: 24px;
height: 24px;
border: 2px solid black;
border-radius: 50%;
position: relative;
cursor: pointer;
transition: box-shadow 0.3s;
outline: none;
}

/* Yellow glow on focus */
.radio-button:focus {
box-shadow: 0 0 0 4px $nhsuk-yellow; /* yellow circle */
}

/* Inner black dot when selected */
.radio-button:checked::before {
content: "";
position: absolute;
top: 4px;
left: 4px;
width: 12px;
height: 12px;
background-color: black;
border-radius: 50%;
}

</style>
43 changes: 0 additions & 43 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,46 +249,3 @@ form label.nhsuk-u-visually-hidden {
box-shadow: 0 0 0 4px $nhsuk-yellow;
}

/*Add a background color to the radio button when focused */
.radio-button:focus {
box-shadow: 0 0 0 4px $nhsuk-yellow !important;
outline: 0;
//box-shadow: 0 0 0 4px rgba(255, 255, 0, 0.5);
}

.radio-button {
appearance: none;
-webkit-appearance: none;
width: 24px;
height: 24px;
border: 2px solid black;
border-radius: 50%;
position: relative;
cursor: pointer;
transition: box-shadow 0.3s;
outline: none;
}

/* Yellow glow on focus */
.radio-button:focus {
box-shadow: 0 0 0 4px $nhsuk-yellow; /* yellow circle */
}

/* Inner black dot when selected */
.radio-button:checked::before {
content: "";
position: absolute;
top: 4px;
left: 4px;
width: 12px;
height: 12px;
background-color: black;
border-radius: 50%;
}

label {
display: inline-flex;
align-items: center;
gap: 5px; /* space between radio and text */
margin: 7px;
}
2 changes: 1 addition & 1 deletion WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
MinorVersion = resourceActivity.MinorVersion,
Version = resourceActivity.MajorVersion + "." + resourceActivity.MinorVersion,
ResourceType = resourceActivity.Resource.ResourceTypeEnum,
ActivityDate = resourceActivity.ActivityStart.GetValueOrDefault(),
ActivityDate = resourceActivity.ActivityStart ?? resourceActivity.CreateDate,
ActivityStatus = (ActivityStatusEnum)resourceActivity.ActivityStatusId,
IsCurrentResourceVersion = resourceActivity.ResourceVersionId == resourceActivity.Resource.CurrentResourceVersionId,
VersionStatusId = (int?)resourceActivity.ResourceVersion.VersionStatusEnum,
Expand Down
Loading