Skip to content

TD-5511-Displaying View/Review link based on framework review #3267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged

TD-5511-Displaying View/Review link based on framework review #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ FROM FrameworkCollaborators fc
JOIN AdminAccounts aa1 ON fc.AdminID = aa1.ID
WHERE fc.FrameworkID = fw.ID
AND fc.CanModify = 1 AND fc.IsDeleted = 0
AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = 12842)) > 0 THEN 2
AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = @adminId)) > 0 THEN 2
WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
fwr.ID AS FrameworkReviewID";

Expand Down
174 changes: 87 additions & 87 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,100 +3,100 @@
<h1>My Frameworks</h1>
@if (Model.NoDataFound)
{
<p class="nhsuk-u-margin-top-4" role="alert">
<b>You are not currently working on any frameworks.</b>
</p>
<p class="nhsuk-u-margin-top-4" role="alert">
<b>You are not currently working on any frameworks.</b>
</p>
}
else
{
<form method="get" role="search" asp-action="ViewFrameworks" asp-route-tabname="Mine" asp-route-page="@Model.Page">
<form method="get" role="search" asp-action="ViewFrameworks" asp-route-tabname="Mine" asp-route-page="@Model.Page">

<partial name="Shared/_FrameworksSearchAndSort" model="Model" />
<partial name="Shared/_FrameworksSearchAndSort" model="Model" />

<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
@if (Model.MatchingSearchResults > 0)
{
<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model.BrandedFrameworks)
{
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-name">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
else if (framework.UserRole == 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
Review
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
</td>
</tr>
}
</tbody>
</table>
}
<partial name="SearchablePage/_BottomPagination" model="Model" />
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
@if (Model.MatchingSearchResults > 0)
{
<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model.BrandedFrameworks)
{
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-name">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
else if (framework.UserRole == 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
@(framework.FrameworkReviewID == null ? "View" : "Review")
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
</td>
</tr>
}
</tbody>
</table>
}
<partial name="SearchablePage/_BottomPagination" model="Model" />

</form>
</form>
}
@if (Model.IsFrameworkDeveloper)
{
<a class="nhsuk-button nhsuk-u-margin-top-4" asp-action="StartNewFrameworkSession">
Create new framework
</a>
<a class="nhsuk-button nhsuk-u-margin-top-4" asp-action="StartNewFrameworkSession">
Create new framework
</a>
}
156 changes: 78 additions & 78 deletions DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,85 +2,85 @@
@model IEnumerable<BrandedFramework>
@if (Model != null && Model.Count() > 0)
{
<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">
Frameworks
</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model)
{
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-brand">
@framework.Brand
</span>
@if (framework.Category != null)
<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">
Frameworks
</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model)
{
<span>/</span>
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-brand">
@framework.Brand
</span>
@if (framework.Category != null)
{
<span>/</span>

<span class="framework-category"> @framework.Category </span>
}<span>/</span>
<span class="framework-name nhsuk-u-font-weight-bold">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
else
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
<span class="framework-category"> @framework.Category </span>
}<span>/</span>
<span class="framework-name nhsuk-u-font-weight-bold">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
else
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
@(framework.FrameworkReviewID == null ? "View" : "Review")
<span class="visually-hidden">@framework.FrameworkName</span>
</a>
}
</td>
</tr>
}
</td>
</tr>
}
</tbody>
</table>
</tbody>
</table>
}
Loading