diff --git a/src/Employer/Employer.Web/Configuration/ViewNames.cs b/src/Employer/Employer.Web/Configuration/ViewNames.cs index c58492394f..87fb39dfc5 100644 --- a/src/Employer/Employer.Web/Configuration/ViewNames.cs +++ b/src/Employer/Employer.Web/Configuration/ViewNames.cs @@ -12,9 +12,7 @@ public class ViewNames public const string ManageClosedVacancyWithApplicationsView = "ClosedWithApplications"; public const string ManageReferredVacancyView = "Referred"; public const string FullVacancyView = "FullVacancyView"; - public const string ManageReviewVacancyView = "Review"; - public const string DashboardWithReview = "DashboardWithReview"; - public const string DashboardNoReview = "Dashboard"; + public const string ManageReviewVacancyView = "Review"; public const string Training = "Training"; public const string SelectTrainingProvider = "SelectTrainingProvider"; diff --git a/src/Employer/Employer.Web/Controllers/DashboardController.cs b/src/Employer/Employer.Web/Controllers/DashboardController.cs index 62313ff71c..1812f173cc 100644 --- a/src/Employer/Employer.Web/Controllers/DashboardController.cs +++ b/src/Employer/Employer.Web/Controllers/DashboardController.cs @@ -23,7 +23,7 @@ public async Task Dashboard([FromRoute] string employerAccountId) { var vm = await _orchestrator.GetDashboardViewModelAsync(employerAccountId, User.ToVacancyUser()); vm.FromMaHome = ShowReferredFromMaBackLink(); - return View(vm.HasEmployerReviewPermission ? ViewNames.DashboardWithReview : ViewNames.DashboardNoReview, vm); + return View(vm); } private bool ShowReferredFromMaBackLink() { diff --git a/src/Employer/Employer.Web/Views/Dashboard/Dashboard.cshtml b/src/Employer/Employer.Web/Views/Dashboard/Dashboard.cshtml index 5e733b9733..4ca2e0ba6a 100644 --- a/src/Employer/Employer.Web/Views/Dashboard/Dashboard.cshtml +++ b/src/Employer/Employer.Web/Views/Dashboard/Dashboard.cshtml @@ -2,17 +2,15 @@ @model Esfa.Recruit.Employer.Web.ViewModels.Dashboard.DashboardViewModel -@{ - var vacanciesSearchSuggestionsEndpointUrl = Url.RouteUrl(RouteNames.VacanciesSearchSuggestions_Get, null, Context.Request.Scheme); - string GetCardStatus(int count) +@{ var vacanciesSearchSuggestionsEndpointUrl = Url.RouteUrl(RouteNames.VacanciesSearchSuggestions_Get, null, Context.Request.Scheme); + string GetCardStatus(bool hasPermission) { - return count == 0 ? "das-card--inactive" : string.Empty; + return hasPermission ? String.Empty : "das-card--inactive"; } ViewBag.ShowReturnToMaLink = Model.FromMaHome; ViewBag.Vpv = "/recruitment/employer/page-dashboard"; ViewBag.ZenDeskLabel = "recruit-recruitment"; - ViewBag.Title = "Your apprenticeship adverts"; -} + ViewBag.Title = "Your apprenticeship adverts"; } @@ -51,60 +49,74 @@ -
+
-
+

@Model.VacancyCountDraft - + @FilteringOptions.Draft @Model.VacancyTextDraft - @FilteringOptions.Draft @Model.VacancyTextDraft

Adverts that you need to complete and send for review.

-
+
+
+

+ @Model.VacancyCountReview + + @FilteringOptions.Review @Model.VacancyTextReview + + @FilteringOptions.Review @Model.VacancyTextReview +

+

Adverts created by training providers that you need to review.

+

+ If you want to review adverts before they are published you need to + manage your permissions. +

+
+
+
+
+

@Model.VacancyCountSubmitted - + @FilteringOptions.Submitted.GetDisplayName(UserType.Employer) - @FilteringOptions.Submitted.GetDisplayName(UserType.Employer)

Adverts that you've sent for review.

+
+
-
+

@Model.VacancyCountReferred - + @FilteringOptions.Referred.GetDisplayName() @Model.VacancyTextReferred - @FilteringOptions.Referred.GetDisplayName() @Model.VacancyTextReferred

Adverts that you need to edit and resubmit.

-
-
-
+

@Model.VacancyCountLive - + @FilteringOptions.Live @Model.VacancyTextLive - @FilteringOptions.Live @Model.VacancyTextLive

Your adverts on the Find an apprenticeship service.

@@ -122,14 +134,13 @@
-
+

@Model.NoOfNewApplications - + New @Model.ApplicationTextLive - New @Model.ApplicationTextLive

Applications from Find an apprenticeship service.
    @@ -142,20 +153,23 @@
+
+
-
+

@Model.VacancyCountClosed - + @FilteringOptions.Closed @Model.VacancyTextClosed - @FilteringOptions.Closed @Model.VacancyTextClosed

Adverts that have passed the closing date. You can clone these adverts to republish them.
+
+
diff --git a/src/Employer/Employer.Web/Views/Dashboard/DashboardWithReview.cshtml b/src/Employer/Employer.Web/Views/Dashboard/DashboardWithReview.cshtml deleted file mode 100644 index a999b0c903..0000000000 --- a/src/Employer/Employer.Web/Views/Dashboard/DashboardWithReview.cshtml +++ /dev/null @@ -1,220 +0,0 @@ -@using Esfa.Recruit.Vacancies.Client.Domain.Entities - -@model Esfa.Recruit.Employer.Web.ViewModels.Dashboard.DashboardViewModel - -@{ var vacanciesSearchSuggestionsEndpointUrl = Url.RouteUrl(RouteNames.VacanciesSearchSuggestions_Get, null, Context.Request.Scheme); - string GetCardStatus(int count) - { - return count == 0 ? "das-card--inactive" : string.Empty; - } - ViewBag.ShowReturnToMaLink = Model.FromMaHome; - ViewBag.Vpv = "/recruitment/employer/page-dashboard"; - ViewBag.ZenDeskLabel = "recruit-recruitment"; - ViewBag.Title = "Your apprenticeship adverts"; -} - - - -
- - - -
-
-

Your apprenticeship adverts

-
- -
- -
-
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
-
-
-
-
-
-

- @Model.VacancyCountDraft - - @FilteringOptions.Draft @Model.VacancyTextDraft - - @FilteringOptions.Draft @Model.VacancyTextDraft -

-

Adverts that you need to complete and send for review.

-
-
-
-
-
-
-

- @Model.VacancyCountReview - - @FilteringOptions.Review @Model.VacancyTextReview - - @FilteringOptions.Review @Model.VacancyTextReview -

-

Adverts created by training providers that you need to review.

-
-
-
-
-
-
-

- @Model.VacancyCountSubmitted - - @FilteringOptions.Submitted.GetDisplayName(UserType.Employer) - - @FilteringOptions.Submitted.GetDisplayName(UserType.Employer) -

-

Adverts that you've sent for review.

-
-
-
-
-
-
-
-
-

- @Model.VacancyCountReferred - - @FilteringOptions.Referred.GetDisplayName() @Model.VacancyTextReferred - - @FilteringOptions.Referred.GetDisplayName() @Model.VacancyTextReferred -

-

Adverts that you need to edit and resubmit.

-
-
-
- -
-
-
-

- @Model.NoOfNewApplications - - New @Model.ApplicationTextLive - - New @Model.ApplicationTextLive -

- Applications from Find an apprenticeship service. - -
-
-
-
-
-
-
-
-

- @Model.VacancyCountClosed - - @FilteringOptions.Closed @Model.VacancyTextClosed - - @FilteringOptions.Closed @Model.VacancyTextClosed -

- Adverts that have passed the closing date. You can clone these adverts to republish them. -
-
-
-
-
-
-
- - - -
-
-
- -
-

- - Set up permission -

-

Give training providers permission to add apprentice records, recruit apprentices and create job adverts on your behalf.

-
- - -
-

- - Manage your emails -

-

Set up and manage the emails you receive about your adverts and applications.

-
-
-
-
- -@section FooterJS -{ - - - -} \ No newline at end of file