Janus007/PlanTempusApp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactors employee details and UI controls

Browse source 
Enhances employee hours view with dynamic weekly schedule rendering
Updates toggle slider and theme switch components with improved interactions
Adds more flexible notification and settings configurations for employees

Improves user experience by streamlining UI controls and schedule display
This commit is contained in:
Janus C. H. Knudsen 2026-01-15 16:59:56 +01:00
parent 6746e876d7
commit 545d6606a6
18 changed files with 506 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

69
PlanTempus.Application/Features/Employees/Components/EmployeeDetailHours/Default.cshtml
View file

@ -1,37 +1,36 @@
@model PlanTempus.Application.Features.Employees.Components.EmployeeDetailHoursViewModel
<swp-detail-grid>
<swp-card>
<swp-section-label>@Model.LabelWeeklySchedule</swp-section-label>
<swp-schedule-grid>
<swp-schedule-row>
<swp-schedule-day>@Model.LabelMonday</swp-schedule-day>
<swp-schedule-time>09:00 - 17:00</swp-schedule-time>
</swp-schedule-row>
<swp-schedule-row>
<swp-schedule-day>@Model.LabelTuesday</swp-schedule-day>
<swp-schedule-time>09:00 - 17:00</swp-schedule-time>
</swp-schedule-row>
<swp-schedule-row>
<swp-schedule-day>@Model.LabelWednesday</swp-schedule-day>
<swp-schedule-time>09:00 - 17:00</swp-schedule-time>
</swp-schedule-row>
<swp-schedule-row>
<swp-schedule-day>@Model.LabelThursday</swp-schedule-day>
<swp-schedule-time>09:00 - 19:00</swp-schedule-time>
</swp-schedule-row>
<swp-schedule-row>
<swp-schedule-day>@Model.LabelFriday</swp-schedule-day>
<swp-schedule-time>09:00 - 16:00</swp-schedule-time>
</swp-schedule-row>
<swp-schedule-row class="off">
<swp-schedule-day>@Model.LabelSaturday</swp-schedule-day>
<swp-schedule-time>Fri</swp-schedule-time>
</swp-schedule-row>
<swp-schedule-row class="off">
<swp-schedule-day>@Model.LabelSunday</swp-schedule-day>
<swp-schedule-time>Fri</swp-schedule-time>
</swp-schedule-row>
</swp-schedule-grid>
</swp-card>
</swp-detail-grid>
@{
string GetBadgeClass(string status) => status switch
{
"work" => "",
"off" => "off",
"vacation" => "vacation",
"sick" => "sick",
_ => "off"
};
}
<swp-schedule-scroll>
<swp-schedule-table class="hours-view">
<!-- Header row -->
<swp-schedule-cell class="header week-number"></swp-schedule-cell>
@foreach (var dayName in Model.DayNames)
{
<swp-schedule-cell class="header"><swp-day-name>@dayName</swp-day-name></swp-schedule-cell>
}
<!-- Week rows -->
@foreach (var week in Model.Weeks)
{
<swp-schedule-cell class="employee week-label">
<swp-employee-name>Uge @week.WeekNumber</swp-employee-name>
<swp-employee-hours>@week.TotalHours @Model.LabelHours</swp-employee-hours>
</swp-schedule-cell>
@foreach (var day in week.Days)
{
<swp-schedule-cell class="day"><swp-time-badge class="@GetBadgeClass(day.Status)">@day.Display</swp-time-badge></swp-schedule-cell>
}
}
</swp-schedule-table>
</swp-schedule-scroll>

129
PlanTempus.Application/Features/Employees/Components/EmployeeDetailHours/EmployeeDetailHoursViewComponent.cs
View file

@ -1,3 +1,4 @@
using System.Text.Json;
using Microsoft.AspNetCore.Mvc;
using PlanTempus.Application.Features.Localization.Services;
@ -6,38 +7,132 @@ namespace PlanTempus.Application.Features.Employees.Components;
public class EmployeeDetailHoursViewComponent : ViewComponent
{
private readonly ILocalizationService _localization;
private readonly IWebHostEnvironment _environment;
public EmployeeDetailHoursViewComponent(ILocalizationService localization)
public EmployeeDetailHoursViewComponent(ILocalizationService localization, IWebHostEnvironment environment)
{
_localization = localization;
_environment = environment;
}
public IViewComponentResult Invoke(string key)
{
var weekSchedule = LoadMockData();
var employee = weekSchedule.Employees.FirstOrDefault(e => e.EmployeeId == key);
var weeks = GenerateWeeks(weekSchedule, employee);
var model = new EmployeeDetailHoursViewModel
{
LabelWeeklySchedule = _localization.Get("employees.detail.hours.weekly"),
LabelMonday = _localization.Get("employees.detail.hours.monday"),
LabelTuesday = _localization.Get("employees.detail.hours.tuesday"),
LabelWednesday = _localization.Get("employees.detail.hours.wednesday"),
LabelThursday = _localization.Get("employees.detail.hours.thursday"),
LabelFriday = _localization.Get("employees.detail.hours.friday"),
LabelSaturday = _localization.Get("employees.detail.hours.saturday"),
LabelSunday = _localization.Get("employees.detail.hours.sunday")
EmployeeId = key,
Weeks = weeks,
DayNames = new[] { "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag", "Søndag" },
LabelHours = _localization.Get("employees.detail.hours.label")
};
return View(model);
}
private WeekScheduleData LoadMockData()
{
var jsonPath = Path.Combine(_environment.ContentRootPath, "Features", "Employees", "Data", "workScheduleMock.json");
var json = System.IO.File.ReadAllText(jsonPath);
return JsonSerializer.Deserialize<WeekScheduleData>(json, new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true
})!;
}
private List<WeekHoursData> GenerateWeeks(WeekScheduleData weekSchedule, EmployeeScheduleData? employee)
{
var weeks = new List<WeekHoursData>();
var startDate = DateTime.Parse(weekSchedule.StartDate);
// Generate 6 weeks of data (current week + 5 more)
for (int w = 0; w < 6; w++)
{
var weekStart = startDate.AddDays(w * 7);
var weekNumber = GetWeekNumber(weekStart);
var days = new List<DayHoursData>();
var totalMinutes = 0;
for (int d = 0; d < 7; d++)
{
var date = weekStart.AddDays(d);
var dateKey = date.ToString("yyyy-MM-dd");
var shift = employee?.Schedule.GetValueOrDefault(dateKey);
string status = "off";
string display = "—";
if (shift != null)
{
status = shift.Status;
if (shift.Status == "work" && shift.Start != null && shift.End != null)
{
display = $"{shift.Start} - {shift.End}";
totalMinutes += CalculateMinutes(shift.Start, shift.End);
}
else if (shift.Status == "vacation")
{
display = "Ferie";
}
else if (shift.Status == "sick")
{
display = "Syg";
}
}
days.Add(new DayHoursData
{
Date = dateKey,
Status = status,
Display = display
});
}
weeks.Add(new WeekHoursData
{
WeekNumber = weekNumber,
TotalHours = totalMinutes / 60,
Days = days
});
}
return weeks;
}
private int GetWeekNumber(DateTime date)
{
var cal = System.Globalization.CultureInfo.CurrentCulture.Calendar;
return cal.GetWeekOfYear(date, System.Globalization.CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
}
private int CalculateMinutes(string start, string end)
{
var startTime = TimeSpan.Parse(start);
var endTime = TimeSpan.Parse(end);
return (int)(endTime - startTime).TotalMinutes;
}
}
public class EmployeeDetailHoursViewModel
{
public required string LabelWeeklySchedule { get; init; }
public required string LabelMonday { get; init; }
public required string LabelTuesday { get; init; }
public required string LabelWednesday { get; init; }
public required string LabelThursday { get; init; }
public required string LabelFriday { get; init; }
public required string LabelSaturday { get; init; }
public required string LabelSunday { get; init; }
public required string EmployeeId { get; init; }
public required List<WeekHoursData> Weeks { get; init; }
public required string[] DayNames { get; init; }
public required string LabelHours { get; init; }
}
public class WeekHoursData
{
public int WeekNumber { get; init; }
public int TotalHours { get; init; }
public required List<DayHoursData> Days { get; init; }
}
public class DayHoursData
{
public required string Date { get; init; }
public required string Status { get; init; }
public required string Display { get; init; }
}