Compare commits

...

1 Commits

4 changed files with 9 additions and 6 deletions

View File

@@ -9,4 +9,5 @@ public class WorkshopAccountViewModel
public string Insurance { get; set; }
public string Tax { get; set; }
public string IsActiveSting { get; set; }
public string WorkshopIsActive { get; set; }
}

View File

@@ -30,6 +30,7 @@ public class WorkshopAccountRepository : RepositoryBase<long, WorkshopAccount>,
Tax = x.Tax,
IsActiveSting = x.IsActiveSting,
WorkshopName = x.Workshop.WorkshopFullName,
WorkshopIsActive = x.Workshop.IsActiveString
}).ToList();

View File

@@ -45,7 +45,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
public IActionResult OnGetWorkshopsWithDocumentsAwaitingUploadAjax()
{
var accountId = _authHelper.CurrentAccountId();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true")
.Select(x => x.WorkshopId).ToList();
var resultData = _adminWorkFlowApplication.GetWorkshopsWithDocumentsAwaitingUploadForAdmin(accountWorkshops);
return new JsonResult(new
@@ -70,7 +71,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
public async Task<IActionResult> OnGetClientRejectedDocumentWorkshopsForAdmin()
{
var accountId = _authHelper.CurrentAccountId();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
var resultData = await _employeeDocumentsApplication.GetClientRejectedDocumentWorkshopsForAdmin(accountWorkshops,_roleId);
return new JsonResult(new
@@ -95,7 +96,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
public async Task<IActionResult> OnGetCreatedEmployeesWorkshopDocumentForAdmin()
{
var accountId = _authHelper.CurrentAccountId();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
var resultData = await _employeeDocumentsApplication.GetCreatedEmployeesWorkshopDocumentForAdmin(accountWorkshops, _roleId);
return new JsonResult(new
@@ -119,7 +120,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
public async Task<IActionResult> OnGetWorkshopDocumentRejectedForAdmin()
{
var accountId = _authHelper.CurrentAccountId();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
var resultData =
await _employeeDocumentsApplication.GetWorkshopDocumentRejectedForAdmin(accountWorkshops,
_roleId);
@@ -147,7 +148,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
public async Task<IActionResult> OnGetCountWorkFlowUploadDocument()
{
var accountId = _authHelper.CurrentAccountId();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
var resultDataWorkshopDocumentRejectedForAdmin = await _employeeDocumentsApplication.GetWorkshopDocumentRejectedForAdmin(accountWorkshops, _roleId);
var resultDataCreatedEmployeesWorkshopDocumentForAdmin = await _employeeDocumentsApplication.GetCreatedEmployeesWorkshopDocumentForAdmin(accountWorkshops, _roleId);

View File

@@ -32,7 +32,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
public async System.Threading.Tasks.Task OnGet()
{
var accountId = _authHelper.CurrentAccountId();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
EmployeeDocumentsAwaitingSubmitCount = await _adminWorkFlowApplication.GetEmployeeDocumentWorkFlowCountsForAdmin(accountWorkshops,_roleId );
}