added collaborator view.
This commit is contained in:
@@ -672,6 +672,9 @@ namespace CarCareTracker.Controllers
|
|||||||
{
|
{
|
||||||
viewModel.Years.Add(DateTime.Now.AddYears(i * -1).Year);
|
viewModel.Years.Add(DateTime.Now.AddYears(i * -1).Year);
|
||||||
}
|
}
|
||||||
|
//get collaborators
|
||||||
|
var collaborators = _userLogic.GetCollaboratorsForVehicle(vehicleId);
|
||||||
|
viewModel.Collaborators = collaborators;
|
||||||
return PartialView("_Report", viewModel);
|
return PartialView("_Report", viewModel);
|
||||||
}
|
}
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ namespace CarCareTracker.Logic
|
|||||||
{
|
{
|
||||||
public interface IUserLogic
|
public interface IUserLogic
|
||||||
{
|
{
|
||||||
|
List<UserCollaborator> GetCollaboratorsForVehicle(int vehicleId);
|
||||||
bool AddUserAccessToVehicle(int userId, int vehicleId, UserAccessType accessType);
|
bool AddUserAccessToVehicle(int userId, int vehicleId, UserAccessType accessType);
|
||||||
List<Vehicle> FilterUserVehicles(List<Vehicle> results, int userId);
|
List<Vehicle> FilterUserVehicles(List<Vehicle> results, int userId);
|
||||||
bool UserCanAccessVehicle(int userId, int vehicleId);
|
bool UserCanAccessVehicle(int userId, int vehicleId);
|
||||||
@@ -16,8 +17,28 @@ namespace CarCareTracker.Logic
|
|||||||
public class UserLogic: IUserLogic
|
public class UserLogic: IUserLogic
|
||||||
{
|
{
|
||||||
private readonly IUserAccessDataAccess _userAccess;
|
private readonly IUserAccessDataAccess _userAccess;
|
||||||
public UserLogic(IUserAccessDataAccess userAccess) {
|
private readonly IUserRecordDataAccess _userData;
|
||||||
|
public UserLogic(IUserAccessDataAccess userAccess,
|
||||||
|
IUserRecordDataAccess userData) {
|
||||||
_userAccess = userAccess;
|
_userAccess = userAccess;
|
||||||
|
_userData = userData;
|
||||||
|
}
|
||||||
|
public List<UserCollaborator> GetCollaboratorsForVehicle(int vehicleId)
|
||||||
|
{
|
||||||
|
var result = _userAccess.GetUserAccessByVehicleId(vehicleId);
|
||||||
|
var convertedResult = new List<UserCollaborator>();
|
||||||
|
//convert useraccess to usercollaborator
|
||||||
|
foreach(UserAccess userAccess in result)
|
||||||
|
{
|
||||||
|
var userCollaborator = new UserCollaborator
|
||||||
|
{
|
||||||
|
UserName = _userData.GetUserRecordById(userAccess.Id.UserId).UserName,
|
||||||
|
AccessType = userAccess.AccessType,
|
||||||
|
UserVehicle = userAccess.Id
|
||||||
|
};
|
||||||
|
convertedResult.Add(userCollaborator);
|
||||||
|
}
|
||||||
|
return convertedResult;
|
||||||
}
|
}
|
||||||
public bool AddUserAccessToVehicle(int userId, int vehicleId, UserAccessType accessType)
|
public bool AddUserAccessToVehicle(int userId, int vehicleId, UserAccessType accessType)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,5 +6,6 @@
|
|||||||
public CostMakeUpForVehicle CostMakeUpForVehicle { get; set; } = new CostMakeUpForVehicle();
|
public CostMakeUpForVehicle CostMakeUpForVehicle { get; set; } = new CostMakeUpForVehicle();
|
||||||
public ReminderMakeUpForVehicle ReminderMakeUpForVehicle { get; set; } = new ReminderMakeUpForVehicle();
|
public ReminderMakeUpForVehicle ReminderMakeUpForVehicle { get; set; } = new ReminderMakeUpForVehicle();
|
||||||
public List<int> Years { get; set; } = new List<int>();
|
public List<int> Years { get; set; } = new List<int>();
|
||||||
|
public List<UserCollaborator> Collaborators { get; set; } = new List<UserCollaborator>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
9
Models/User/UserCollaborator.cs
Normal file
9
Models/User/UserCollaborator.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
namespace CarCareTracker.Models
|
||||||
|
{
|
||||||
|
public class UserCollaborator
|
||||||
|
{
|
||||||
|
public string UserName { get; set; }
|
||||||
|
public UserAccessType AccessType { get; set; }
|
||||||
|
public UserVehicle UserVehicle { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
7
Views/Vehicle/_Collaborators.cshtml
Normal file
7
Views/Vehicle/_Collaborators.cshtml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
@model List<UserCollaborator>
|
||||||
|
<ul>
|
||||||
|
@foreach (UserCollaborator user in Model)
|
||||||
|
{
|
||||||
|
<li>@user.UserName</li>
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
@@ -69,8 +69,16 @@
|
|||||||
</div>
|
</div>
|
||||||
<hr />
|
<hr />
|
||||||
<div class="row hideOnPrint">
|
<div class="row hideOnPrint">
|
||||||
<div class="d-flex justify-content-center">
|
<div class="col-md-3 col-12">
|
||||||
<button onclick="generateVehicleHistoryReport()" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Generate and Print Vehicle Maintenance Report</button>
|
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6 col-12">
|
||||||
|
<div class="d-flex justify-content-center">
|
||||||
|
<button onclick="generateVehicleHistoryReport()" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Generate and Print Vehicle Maintenance Report</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 col-12">
|
||||||
|
@await Html.PartialAsync("_Collaborators", Model.Collaborators)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="vehicleHistoryReport" class="showOnPrint"></div>
|
<div id="vehicleHistoryReport" class="showOnPrint"></div>
|
||||||
|
|||||||
Reference in New Issue
Block a user