Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions Client/Modules/Grower/Edit.razor
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ else
@if (_growerId > 0)
{
<div class="d-flex align-items-center gap-2 flex-wrap">
<span class="badge @GetStatusBadgeClass(_grower.Status)">@GetStatusText(_grower.Status)</span>
<span class="badge @GetStatusBadgeClass(_grower.Status)"
title="@GetStatusDescription(_grower.Status)"
aria-label="Status: @GetStatusText(_grower.Status) — @GetStatusDescription(_grower.Status)">
@GetStatusText(_grower.Status)
</span>
@if (UserSecurity.IsAuthorized(PageState.User, AppRoleNames.TenTreesAdmin))
{
@if (_grower.Status == GrowerStatus.Active)
Expand Down Expand Up @@ -360,7 +364,7 @@ else
{
<span class="badge bg-secondary me-1">General</span>
}
<small class="text-muted">@note.CreatedOn.ToLocalTime().ToString("yyyy-MM-dd HH:mm") � @note.CreatedBy</small>
<small class="text-muted">@note.CreatedOn.ToLocalTime().ToString("yyyy-MM-dd HH:mm") � @note.CreatedBy</small>
</div>
<div class="text-body" style="white-space: pre-wrap;">@note.Text</div>
</li>
Expand Down Expand Up @@ -657,4 +661,12 @@ else
GrowerStatus.Exited => "Exited",
_ => status.ToString()
};

private string GetStatusDescription(GrowerStatus status) => status switch
{
GrowerStatus.Active => "Currently participating in the program.",
GrowerStatus.Inactive => "Temporarily paused (e.g. illness or travel) but has not left the program.",
GrowerStatus.Exited => "Has permanently left the program.",
_ => string.Empty
};
}
11 changes: 10 additions & 1 deletion Client/Modules/Grower/Index.razor
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@
<td>@grower.GrowerName</td>
<td>@GetVillageName(grower.VillageId)</td>
<td>
<span class="badge @GetStatusBadgeClass(grower.Status)">
<span class="badge @GetStatusBadgeClass(grower.Status)"
title="@GetStatusDescription(grower.Status)">
@GetStatusText(grower.Status)
</span>
Comment on lines +126 to 129
</td>
Expand Down Expand Up @@ -342,6 +343,14 @@
};
}

private string GetStatusDescription(GrowerStatus status) => status switch
{
GrowerStatus.Active => "Currently participating in the program.",
GrowerStatus.Inactive => "Temporarily paused (e.g. illness or travel) but has not left the program.",
GrowerStatus.Exited => "Has permanently left the program.",
_ => string.Empty
};
Comment on lines +346 to +352

private async Task DeleteGrower(Models.Grower grower)
{
try
Expand Down
2 changes: 1 addition & 1 deletion Server/Controllers/GrowerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public async Task<ActionResult<GrowerStatusSummary>> GetStatusSummary(int? villa
}

[HttpPut("{id}")]
[Authorize]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task<ActionResult<Models.Grower>> Put(int id, [FromBody] Models.Grower grower, int moduleId)
{
try
Expand Down
12 changes: 6 additions & 6 deletions Server/Repository/GrowerRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,32 @@ public Models.Grower GetGrower(int growerId, bool tracking)
query = query.Where(g => g.VillageId == villageId.Value);
}

return query.ToList();
return query.OrderBy(g => g.GrowerName).ToList();
}

public IEnumerable<Models.Grower> GetGrowersByVillage(int villageId)
{
using var db = _factory.CreateDbContext();
return db.Grower.Where(g => g.VillageId == villageId).ToList();
return db.Grower.Where(g => g.VillageId == villageId).OrderBy(g => g.GrowerName).ToList();
}

public IEnumerable<Models.Grower> GetGrowersByMentor(string mentorUsername)
{
using var db = _factory.CreateDbContext();
return db.Grower.Where(g => g.MentorUsername == mentorUsername).ToList();
return db.Grower.Where(g => g.MentorUsername == mentorUsername).OrderBy(g => g.GrowerName).ToList();
}

public IEnumerable<Models.Grower> GetGrowersByStatus(GrowerStatus status, int? villageId = null)
{
using var db = _factory.CreateDbContext();
var query = db.Grower.Where(g => g.Status == status);

if (villageId.HasValue)
{
query = query.Where(g => g.VillageId == villageId.Value);
}
return query.ToList();

return query.OrderBy(g => g.GrowerName).ToList();
}

public IEnumerable<Models.Grower> GetActiveGrowers(int? villageId = null)
Expand Down
12 changes: 2 additions & 10 deletions Server/Services/GrowerService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,8 @@ public Task<GrowerStatusSummary> GetStatusSummaryAsync(int? villageId = null)

public Task<Models.Grower> UpdateGrowerAsync(Models.Grower grower, int moduleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, moduleId, PermissionNames.Edit))
{
grower = _growerRepository.UpdateGrower(grower);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Grower Updated {Grower}", grower);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Grower Update Attempt {Grower}", grower);
grower = null;
}
grower = _growerRepository.UpdateGrower(grower);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Grower Updated {Grower}", grower);
return Task.FromResult(grower);
}

Expand Down