Merge pull request #1136 from TechnologyEnhancedLearning/Develop/Fixes/TD-4298-My-Learning-page-showing-additional-video-results-with-invalid-date/time

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

Author: swapnamol-abraham

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%;
+    }
 </style>

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

@@ -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>

LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss

@@ -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;
-}

WebAPI/LearningHub.Nhs.Services/MyLearningService.cs

@@ -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,