Skip to content

Commit

Permalink
Merge pull request #887 from SkillsFundingAgency/CON-1956-Content-cha…
Browse files Browse the repository at this point in the history 
…nges-to-recruit-dashboard

CON-1956-Content changes to recruit dashboard
  • Loading branch information
@narendranogothu
narendranogothu authored Jun 26, 2020
2 parents 4970b46 + d75f81e commit a0635bb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions src/Employer/Employer.Web/ViewModels/Dashboard/DashboardViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ public class DashboardViewModel
public bool HasOneVacancy => Vacancies.Count == 1;
public Guid CurrentVacancyId => HasOneVacancy ? Vacancies.Single().Id : new Guid();
public int VacancyCountDraft => Vacancies.Count(v => v.Status == VacancyStatus.Draft);
public string VacancyTextDraft => "vacancy".ToQuantity(VacancyCountDraft, ShowQuantityAs.None);
public string VacancyTextDraft => "advert".ToQuantity(VacancyCountDraft, ShowQuantityAs.None);
public bool HasDraftVacancy => VacancyCountDraft > 0;
public int VacancyCountLive => Vacancies.Count(v => v.Status == VacancyStatus.Live);
public string VacancyTextLive => "vacancy".ToQuantity(VacancyCountLive, ShowQuantityAs.None);
public string VacancyTextLive => "advert".ToQuantity(VacancyCountLive, ShowQuantityAs.None);
public bool HasLiveVacancy => VacancyCountLive > 0;
public int VacancyCountClosed => Vacancies.Count(v => v.Status == VacancyStatus.Closed);
public string VacancyTextClosed => "vacancy".ToQuantity(VacancyCountClosed, ShowQuantityAs.None);
public string VacancyTextClosed => "advert".ToQuantity(VacancyCountClosed, ShowQuantityAs.None);
public bool HasClosedVacancy => VacancyCountClosed > 0;
public int VacancyCountReferred => Vacancies.Count(v => v.Status == VacancyStatus.Referred);
public string VacancyTextReferred => "vacancy".ToQuantity(VacancyCountReferred, ShowQuantityAs.None);
public string VacancyTextReferred => "advert".ToQuantity(VacancyCountReferred, ShowQuantityAs.None);
public bool HasReferredVacancy => VacancyCountReferred > 0;
public int VacancyCountSubmitted => Vacancies.Count(v => v.Status == VacancyStatus.Submitted);
public bool HasSubmittedVacancy => VacancyCountSubmitted > 0;
Expand All @@ -35,9 +35,9 @@ public class DashboardViewModel
public bool ShowAllApplications => AllApplications > 0;
public string ApplicationTextLive => "application".ToQuantity(NoOfNewApplications, ShowQuantityAs.None);
public int NoOfVacanciesClosingSoon { get; set; }
public string VacancyTextClosingSoon => "vacancy".ToQuantity(NoOfVacanciesClosingSoon, ShowQuantityAs.None);
public string VacancyTextClosingSoon => "advert".ToQuantity(NoOfVacanciesClosingSoon, ShowQuantityAs.None);
public int NoOfVacanciesClosingSoonWithNoApplications { get; set; }
public string VacancyTextClosingSoonWithNoApplications => "vacancy".ToQuantity(NoOfVacanciesClosingSoonWithNoApplications, ShowQuantityAs.None);
public string VacancyTextClosingSoonWithNoApplications => "advert".ToQuantity(NoOfVacanciesClosingSoonWithNoApplications, ShowQuantityAs.None);
public bool ShowNoOfVacanciesClosingSoon => NoOfVacanciesClosingSoon > 0;
public bool ShowNoOfVacanciesClosingSoonWithNoApplications => NoOfVacanciesClosingSoonWithNoApplications > 0;
public bool HasAnyVacancies => Vacancies.Any();
Expand Down
24 changes: 12 additions & 12 deletions src/Employer/Employer.Web/Views/Dashboard/Dashboard.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<h1 class="govuk-heading-xl">Recruitment</h1>
<h1 class="govuk-heading-xl">Your apprenticeship adverts</h1>
</div>
<div class="govuk-grid-column-one-half ">
<a asp-route="@RouteNames.CreateVacancyOptions_Get" asp-route-employerAccountId="@Model.EmployerAccountId" class="govuk-button float-right clear govuk-!-margin-top-2 govuk-!-margin-bottom-4" esfa-automation="create-vacancy">Create vacancy</a>
<a asp-route="@RouteNames.CreateVacancyOptions_Get" asp-route-employerAccountId="@Model.EmployerAccountId" class="govuk-button float-right clear govuk-!-margin-top-2 govuk-!-margin-bottom-4" esfa-automation="create-vacancy">Create an advert</a>
</div>
</div>

Expand All @@ -36,7 +36,7 @@
<div class="form-group search-field">
<div class="search-input-with-button">
<label class="govuk-label" for="search">
Search for vacancy by title or vacancy ID
Search by advert title or reference number
</label>
<input id="search-input" name="searchTerm" class="govuk-input search-input" maxlength="200">
</div>
Expand All @@ -61,7 +61,7 @@
</a>
<span asp-hide="@Model.HasDraftVacancy">@FilteringOptions.Draft @Model.VacancyTextDraft</span>
</h3>
<p class="govuk-body das-card--description">Vacancies that need completing and sending for review.</p>
<p class="govuk-body das-card--description">Adverts that you need to complete and send for review.</p>
</div>
</div>
</div>
Expand All @@ -75,7 +75,7 @@
</a>
<span asp-hide="@Model.HasSubmittedVacancy">@FilteringOptions.Submitted.GetDisplayName()</span>
</h3>
<p class="govuk-body das-card--description">Vacancies that have been sent for review.</p>
<p class="govuk-body das-card--description">Adverts that you've sent for review.</p>
</div>
</div>
</div>
Expand All @@ -89,7 +89,7 @@
</a>
<span asp-hide="@Model.HasReferredVacancy">@FilteringOptions.Referred.GetDisplayName() @Model.VacancyTextReferred</span>
</h3>
<p class="govuk-body das-card--description">Rejected vacancies will need to be edited and resubmitted.</p>
<p class="govuk-body das-card--description">Adverts that you need to edit and resubmit.</p>
</div>
</div>
</div>
Expand All @@ -105,7 +105,7 @@
</a>
<span asp-hide="@Model.HasLiveVacancy">@FilteringOptions.Live @Model.VacancyTextLive</span>
</h3>
<span class="govuk-body das-card--description">Vacancies on Find an apprenticeship service.</span>
<span class="govuk-body das-card--description">Your adverts on the Find an apprenticeship service.</span>
<p class="govuk-body das-card--description"></p>
<ul class="das-card--tasks govuk-list">
<li asp-show="@Model.ShowNoOfVacanciesClosingSoon">
Expand Down Expand Up @@ -151,20 +151,20 @@
</a>
<span asp-hide="@Model.HasClosedVacancy">@FilteringOptions.Closed @Model.VacancyTextClosed</span>
</h3>
<span class="govuk-body das-card--description">Vacancies that have passed the closing date. You can clone these vacancies to republish them.</span>
<span class="govuk-body das-card--description">Adverts that have passed the closing date. You can clone these adverts to republish them.</span>
</div>
</div>
</div>
</div>
<div class="govuk-grid-row">
<div asp-show="@Model.HasOneVacancy" class="govuk-grid-column-full">
<a asp-route="@RouteNames.VacancyManage_Get" asp-route-vacancyId="@Model.CurrentVacancyId" class="govuk-link govuk-!-font-size-24 govuk-!-font-weight-bold govuk-link--no-visited-state" name="button">
View your vacancy
View your advert
</a>
</div>
<div asp-hide="@Model.HasOneVacancy" class="govuk-grid-column-full">
<a asp-route="@RouteNames.Vacancies_Get" asp-route-filter="@FilteringOptions.All" class="govuk-link govuk-!-font-size-24 govuk-!-font-weight-bold govuk-link--no-visited-state" name="button">
View all your vacancies (@Model.Vacancies.Count)
View all your adverts (@Model.Vacancies.Count)
</a>
</div>

Expand All @@ -176,9 +176,9 @@
<div class="govuk-grid-column-one-third">
<h3 class="govuk-heading-s">

<a class="govuk-link govuk-link--no-visited-state" asp-route="@RouteNames.ManageNotifications_Get">Manage your recruitment emails</a>
<a class="govuk-link govuk-link--no-visited-state" asp-route="@RouteNames.ManageNotifications_Get">Manage your emails</a>
</h3>
<p class="govuk-body">Set up and manage the emails you’re sent about your vacancies and applications</p>
<p class="govuk-body">Set up and manage the emails you receive about your adverts and applications.</p>
</div>
</esfaFeatureEnabled>
</div>
Expand Down

0 comments on commit a0635bb

Please sign in to comment.