From ae37ec7a8bcb8abac0fe9b60d642036f6d6bf23a Mon Sep 17 00:00:00 2001 From: Oluwatobi Awe Date: Thu, 21 Mar 2024 07:24:54 +0000 Subject: [PATCH] TD-3950 add bookmark partial view error --- .../Controllers/HomeController.cs | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs index 3d2828b61..daa8612ee 100644 --- a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs @@ -246,17 +246,29 @@ public async Task LoadPage(string dashBoardTray = "my-learning", Catalogues = new Nhs.Models.Dashboard.DashboardCatalogueResponseViewModel { Type = catalogueDashBoard }, }; - switch (dashBoardTray) + bool isAjax = this.HttpContext.Request.Headers["X-Requested-With"] == "XMLHttpRequest"; + + if (isAjax) { - case "my-learning": - model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, pageNumber); - return this.PartialView("_MyAccessedLearningTray", model); - case "resources": - model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, pageNumber); - return this.PartialView("_ResourceTray", model); - case "catalogues": - model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, pageNumber); - return this.PartialView("_CatalogueTray", model); + switch (dashBoardTray) + { + case "my-learning": + model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, pageNumber); + return this.PartialView("_MyAccessedLearningTray", model); + case "resources": + model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, pageNumber); + return this.PartialView("_ResourceTray", model); + case "catalogues": + model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, pageNumber); + return this.PartialView("_CatalogueTray", model); + } + } + else + { + model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1); + model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1); + model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1); + return this.View("Dashboard", model); } }