blakeridgway/turf-tasker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Enhance UI/UX across multiple views with consistent styling and improved layout

Browse source
This commit is contained in:
Blake Ridgway 2025-06-21 16:30:59 -05:00
parent 9931687419
commit 36d4ae00dd
16 changed files with 609 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Controllers/LawnCareEventsContoller.cs
View file

@ -14,19 +14,15 @@ namespace turf_tasker.Controllers
_context = context;
}
// GET: LawnCareEvents
public async Task<IActionResult> Index(string sortOrder, string searchString)
{
// Use ViewData to pass sort order info to the view
ViewData["DateSortParm"] = String.IsNullOrEmpty(sortOrder) ? "date_desc" : "";
ViewData["TypeSortParm"] = sortOrder == "Type" ? "type_desc" : "Type";
ViewData["CurrentFilter"] = searchString;
// Start with a base query that can be modified
var events = from e in _context.LawnCareEvents
select e;
// Apply the filter if a search string is provided
if (!String.IsNullOrEmpty(searchString))
{
events = events.Where(e =>
@ -35,7 +31,6 @@ namespace turf_tasker.Controllers
);
}
// Apply the sorting based on the sortOrder parameter
switch (sortOrder)
{
case "date_desc":
@ -51,12 +46,9 @@ namespace turf_tasker.Controllers
events = events.OrderBy(e => e.EventDate);
break;
}
// Execute the query and return the view with the filtered/sorted list
return View(await events.AsNoTracking().ToListAsync());
}
// GET: LawnCareEvents/Details/5
public async Task<IActionResult> Details(int? id)
{
if (id == null)
@ -74,15 +66,13 @@ namespace turf_tasker.Controllers
return View(lawnCareEvent);
}
// GET: LawnCareEvents/Create
// MODIFIED: We now create a model with a default date.
public IActionResult Create()
{
var model = new LawnCareEvent { EventDate = DateTime.Now };
return View(model);
}
// POST: LawnCareEvents/Create
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Create([Bind("Id,EventType,EventDate,MowingPattern,Notes")] LawnCareEvent lawnCareEvent)
@ -95,8 +85,7 @@ namespace turf_tasker.Controllers
}
return View(lawnCareEvent);
}
// GET: LawnCareEvents/Edit/5
public async Task<IActionResult> Edit(int? id)
{
if (id == null)
@ -112,7 +101,6 @@ namespace turf_tasker.Controllers
return View(lawnCareEvent);
}
// POST: LawnCareEvents/Edit/5
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(int id, [Bind("Id,EventType,EventDate,MowingPattern,Notes")] LawnCareEvent lawnCareEvent)
@ -131,7 +119,7 @@ namespace turf_tasker.Controllers
}
catch (DbUpdateConcurrencyException)
{
if (!LawnCareEventExists(lawnCareEvent.Id))
if (!LawnCareEventExists(lawnCareEvent.Id)) // This uses the private method below
{
return NotFound();
}
@ -145,7 +133,6 @@ namespace turf_tasker.Controllers
return View(lawnCareEvent);
}
// GET: LawnCareEvents/Delete/5
public async Task<IActionResult> Delete(int? id)
{
if (id == null)
@ -163,7 +150,6 @@ namespace turf_tasker.Controllers
return View(lawnCareEvent);
}
// POST: LawnCareEvents/Delete/5
[HttpPost, ActionName("Delete")]
[ValidateAntiForgeryToken]
public async Task<IActionResult> DeleteConfirmed(int id)
@ -182,5 +168,36 @@ namespace turf_tasker.Controllers
{
return _context.LawnCareEvents.Any(e => e.Id == id);
}
public IActionResult Calendar()
{
return View();
}
[HttpGet]
public async Task<JsonResult> GetEventsJson()
{
var events = await _context.LawnCareEvents.AsNoTracking().ToListAsync();
var calendarEvents = events.Select(e => new
{
id = e.Id,
title = $"{e.EventType} {((e.EventType == LawnCareEventType.Mowing && e.MowingPattern.HasValue) ? $"({e.MowingPattern})" : "")}",
start = e.EventDate.ToString("yyyy-MM-dd"),
allDay = true,
url = $"/LawnCareEvents/Details/{e.Id}",
color = e.EventType switch
{
LawnCareEventType.Mowing => "#28a745",
LawnCareEventType.Watering => "#007bff",
LawnCareEventType.Fertilizing => "#ffc107",
LawnCareEventType.Aeration => "#6f42c1",
LawnCareEventType.WeedControl => "#dc3545",
_ => "#6c757d"
}
}).ToList();
return Json(calendarEvents);
}
}
}