Merge pull request #25 from TechnologyEnhancedLearning/Develop/Fixes/TD-2217

TD-2217 Update radio list view component

Author: OluwatobiAwe

.github/workflows/continuous-integration-workflow.yml

@@ -7,6 +7,8 @@ jobs:
         SOLUTION: 'NHSUKViewComponents.sln'
       name: Build and publish package
       runs-on: ubuntu-latest
+      permissions:
+          issues: write
       strategy: 
           matrix:
            dotnet-version: ['3.1.x']
@@ -39,7 +41,9 @@ jobs:
         - name: Add Azure artifact
           run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZUREDEVOPSKEY }} --store-password-in-clear-text
 
-
+        - name: Add github registry
+          run: dotnet nuget add source --username 'kevin.whittaker' --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name githubPackages "https://nuget.pkg.github.com/TechnologyEnhancedLearning/index.json"
+       
         - name: Dotnet build
           run:  dotnet build NHSUKViewComponents.sln --configuration release
 
@@ -48,7 +52,7 @@ jobs:
 
         - name: Push generated package to GitHub registry
           if: startsWith(github.ref, 'refs/tags/v')
-          run: dotnet nuget push ./package/*.nupkg  --source https://nuget.pkg.github.com/TechnologyEnhancedLearning/index.json   --api-key ${{ secrets.NUGETAPIKEY }}  --skip-duplicate
+          run: dotnet nuget push ./package/*.nupkg  --api-key ${{ secrets.GITHUB_TOKEN }}  --source "githubPackages"  --skip-duplicate
 
         - name: Push generated package to Azure Feed
           if: startsWith(github.ref, 'refs/tags/v')

NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml

@@ -4,7 +4,7 @@
 @model RadiosViewModel
 @{
     int counter = 0;
-    
+
 }
 
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
@@ -60,14 +60,14 @@
                     <div class="@Model.Class">
                         <div class="nhsuk-radios__item">
                             <input class="nhsuk-radios__input"
-                           id="@radioId"
-                           name="@Model.AspFor"
-                           type="radio"
-                           value="@radio.Value"
-                           aria-describedby="@radio.Value-item-hint"
-                           data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "" )"
-                           data-val="@(Model.Required ? "true" : "false" )"
-                           @(radio.Selected ? "checked" : string.Empty) />
+                                   id="@radioId"
+                                   name="@Model.AspFor"
+                                   type="radio"
+                                   value="@radio.Value"
+                                   aria-describedby="@(!string.IsNullOrEmpty(radio.HintText) ? $"{radio.Value}-item-hint" : string.Empty)"
+                                   data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "")"
+                                   data-val="@(Model.Required ? "true" : "false")"
+                            @(radio.Selected ? "checked" : string.Empty) />
                             <label class="nhsuk-label nhsuk-radios__label" for="@radioId">
                                 @radio.Label
                             </label>
@@ -84,14 +84,14 @@
                 {
                     <div class="nhsuk-radios__item">
                         <input class="nhsuk-radios__input"
-                       id="@radioId"
-                       name="@Model.AspFor"
-                       type="radio"
-                       value="@radio.Value"
-                       aria-describedby="@radio.Value-item-hint"
-                       data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "" )"
-                       data-val="@(Model.Required ? "true" : "false" )"
-                       @(radio.Selected ? "checked" : string.Empty) />
+                               id="@radioId"
+                               name="@Model.AspFor"
+                               type="radio"
+                               value="@radio.Value"
+                               aria-describedby="@(!string.IsNullOrEmpty(radio.HintText) ? $"{radio.Value}-item-hint" : string.Empty)"
+                               data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "")"
+                               data-val="@(Model.Required ? "true" : "false")"
+                        @(radio.Selected ? "checked" : string.Empty) />
                         <label class="nhsuk-label nhsuk-radios__label" for="@radioId">
                             @radio.Label
                         </label>
@@ -105,20 +105,20 @@
                 }
 
             }
-            @if(Model.OptionalRadio != null)
+            @if (Model.OptionalRadio != null)
             {
                 <div class="nhsuk-radios__divider nhsuk-u-padding-left-2">or</div>
                 var radioId = $"{Model.OptionalRadio.Value}-{++counter}";
                 <div class="nhsuk-radios__item">
                     <input class="nhsuk-radios__input"
-                       id="@radioId"
-                       name="@Model.AspFor"
-                       type="radio"
-                       value="@Model.OptionalRadio.Value"
-                       aria-describedby="@Model.OptionalRadio.Value-item-hint"
-                       data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "" )"
-                       data-val="@(Model.Required ? "true" : "false" )"
-                       @(Model.OptionalRadio.Selected ? "checked" : string.Empty) />
+                           id="@radioId"
+                           name="@Model.AspFor"
+                           type="radio"
+                           value="@Model.OptionalRadio.Value"
+                           aria-describedby="@(!string.IsNullOrEmpty(Model.OptionalRadio.HintText) ? $"{Model.OptionalRadio.Value}-item-hint" : string.Empty)"
+                           data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "")"
+                           data-val="@(Model.Required ? "true" : "false")"
+                    @(Model.OptionalRadio.Selected ? "checked" : string.Empty) />
                     <label class="nhsuk-label nhsuk-radios__label" for="@radioId">
                         @Model.OptionalRadio.Label
                     </label>
@@ -134,4 +134,4 @@
         </div>
     </fieldset>
 
-</div>
+</div>