From 5af1fd7617b067e1b1ef5f1e72fc0f82068f0aa3 Mon Sep 17 00:00:00 2001 From: swapnamol-abraham Date: Mon, 19 May 2025 11:27:14 +0100 Subject: [PATCH 1/3] TD-5608: Radio buttons / rating stars selection misaligned --- .../Scripts/vuesrc/contribute/ContentCommon.vue | 10 ++++++++++ LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue index 055815e26..0c4605f69 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue @@ -602,3 +602,13 @@ }) + diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss index 13086fde1..d4be1c437 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss @@ -285,10 +285,3 @@ form label.nhsuk-u-visually-hidden { background-color: black; border-radius: 50%; } - -label { - display: inline-flex; - align-items: center; - gap: 5px; /* space between radio and text */ - margin: 7px; -} \ No newline at end of file From 98e40988b14f5afbd26b29a77131cf4e0cb2e7d6 Mon Sep 17 00:00:00 2001 From: swapnamol-abraham Date: Mon, 19 May 2025 13:46:05 +0100 Subject: [PATCH 2/3] TD-5608: Fixed the radiobutton alignment issues --- .../ContributeProvideByTab.vue | 42 ++++++++++++++++++- .../vuesrc/contribute/ContentCommon.vue | 38 ++++++++++++++++- .../Styles/nhsuk/common.scss | 36 ---------------- 3 files changed, 78 insertions(+), 38 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue index 34383955e..a177d7002 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue @@ -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%; + } \ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue index 0c4605f69..338817b8b 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue @@ -610,5 +610,41 @@ 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%; + } + diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss index d4be1c437..1c18cc3cc 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss @@ -249,39 +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%; -} From 1d4d667a150eb293baf8f133a3acfc4cf4b06309 Mon Sep 17 00:00:00 2001 From: swapnamol-abraham Date: Wed, 21 May 2025 14:55:29 +0100 Subject: [PATCH 3/3] TD-4298: My Learning page showing additional video results with invalid date/time --- WebAPI/LearningHub.Nhs.Services/MyLearningService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs index 82e2ce2f8..870ed3f32 100644 --- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs +++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs @@ -252,7 +252,7 @@ public async Task> 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,