Merge pull request #1769 from TechnologyEnhancedLearning/Develop/Fixes/TD-7108-My-courses-and-elearning-Tray

Develop/fixes/td 7108 my courses and elearning tray

Author: swapnamol-abraham

LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml

@@ -93,7 +93,7 @@
                                 <partial name="_LearningActivityCard" model="activityViewModel" />
                             </li>
                         }
-                        @if (isLastPage && pagingViewModel.TotalCount >=8)
+                        @if (isLastPage && pagingViewModel.TotalCount >= 8)
                         {
                             <li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
                                 <div class="nhsuk-card dashboard-card">
@@ -190,16 +190,17 @@
             else
             {
                 <div class="nhsuk-bg-white  nhsuk-u-padding-5">
-                    @if (Model.MyLearnings.Type == "my-in-progress" && Model.MyLearnings.TotalCount <= 0)
-                    {
-                        <h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
-                        <p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
-                    }
-                    else if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
+                    @if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
                     {
                         <h3 nhsuk-card__heading nhsuk-heading-m>You have no certificates.</h3>
                         <p class="nhsuk-card__description dashboard-card-body">Certificates when available will be displayed here.</p>
                     }
+                    else if (Model.DashboardTrayLearningResourceType == "elearning" && Model.MyLearnings.TotalCount <= 0)
+                    {
+                        <h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
+                        <p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
+                    }
+
                 </div>
             }
         </div>

LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml

@@ -69,18 +69,26 @@
 
     <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-full">
-            <ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred nhsuk-u-margin-bottom-2">
-                @if (@Model.Resources.Resources != null)
-                {
+            @if (@Model.Resources.Resources.Count() > 0)
+            {
+                <ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred nhsuk-u-margin-bottom-2">
                     @foreach (var resource in Model.Resources.Resources)
                     {
                         var resourceViewModel = new Tuple<string, DashboardResourceViewModel>("resources", resource);
                         <li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
                             <partial name="_ResourceCard" model="resourceViewModel" />
                         </li>
                     }
+                </ul>
+            }
+            else
+            {
+                if (Model.Resources.Type == "my-recent-completed")
+                {
+                    <h3 nhsuk-card__heading nhsuk-heading-m>You have not recently completed any learning.</h3>
+                    <p class="nhsuk-card__description dashboard-card-body">When available your completed learning will be displayed here.</p>
                 }
-            </ul>
+            }
         </div>
     </div>
     <div class="nhsuk-grid-row">