Skip to content

Commit d3f3569

Browse files
committed
Improves navigation and tweaks email JWT param name
1 parent dfe3334 commit d3f3569

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

DigitalLearningSolutions.Web/Helpers/ExternalApis/TableauConnectionHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public string GetTableauJwt(string email)
4242
{ "exp", new DateTimeOffset(DateTime.UtcNow.AddMinutes(5)).ToUnixTimeSeconds() },
4343
{ "sub", user },
4444
{ "scp", new[] { "tableau:views:embed" } },
45-
{ "users.primaryemail", email}
45+
{ "UserEmail", email}
4646
};
4747
var token = new JwtSecurityToken(header, payload);
4848
var tokenHandler = new JwtSecurityTokenHandler();

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/Index.cshtml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@
3939
}
4040
</li>
4141
}
42+
@if (Model.SelfAssessmentSelects.Any())
43+
{
44+
<li>
45+
<a asp-controller="SelfAssessmentReports" asp-action="TableauCompetencyDashboard">@($"View Tableau Competency Dashboards")</a>
46+
</li>
47+
}
4248
}
4349
</ul>
44-
@if (Model.SelfAssessmentSelects.Any())
45-
{
46-
<a asp-controller="SelfAssessmentReports" asp-action="TableauCompetencyDashboard">@($"View Tableau Competency Dashboards")</a>
47-
}
50+
4851

4952
</div>
5053
</div>

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/TableauCompetencyDashboard.cshtml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@
55
var jwtToken = ViewBag.JwtToken;
66
var siteName = ViewBag.SiteName;
77
var srcUrl = $"{tableauServerUrl}/t/{siteName}/views/{workbookName}/{viewName}";
8+
ViewData["Title"] = "Supervised self assessments dashboard";
89
}
9-
<h1>Supervised competency self assessments dashboard report</h1>
10+
<div class="nhsuk-back-link">
11+
<a class="nhsuk-back-link__link" role="button" asp-action="Index">
12+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
13+
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
14+
</svg>
15+
Back
16+
</a>
17+
</div>
18+
<h1>@ViewData["Title"]</h1>
1019
<tableau-viz id='tableau-viz'
1120
src='@srcUrl' token='@jwtToken' toolbar='bottom'>
1221
</tableau-viz>

0 commit comments

Comments
 (0)