maddo/WorkTracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

feat: enhance timesheet summary with today highlighting and improved CSS styles
All checks were successful
Publish Container / publish (push) Successful in 5m43s
Details

Browse source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Marco 2026-04-23 00:11:00 +02:00
commit 0d5b48b891
3 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Components/Pages/MonthlySummary.razor
View file

@ -294,12 +294,24 @@ else if (viewMode == SummaryViewMode.Timesheet && timesheet is not null)
private static string GetDayColumnClass(global::WorkTracker.Domain.MonthlyTimesheetDayModel day) private static string GetDayColumnClass(global::WorkTracker.Domain.MonthlyTimesheetDayModel day)
{ {
if (day.IsWeekend || day.IsHoliday) var classes = new List<string>();
if (day.Date == DateOnly.FromDateTime(DateTime.Today))
{ {
return "timesheet-summary-day-danger"; classes.Add("timesheet-summary-day-today");
} }
return day.IsClosure ? "timesheet-summary-day-closure" : string.Empty; if (day.IsWeekend || day.IsHoliday)
{
classes.Add("timesheet-summary-day-danger");
}
if (day.IsClosure)
{
classes.Add("timesheet-summary-day-closure");
}
return string.Join(" ", classes);
} }
private static string GetDayPopupClass(int index, int totalDays) private static string GetDayPopupClass(int index, int totalDays)

3
Services/WorkDays/CouchbaseLiteWorkDayService.cs
View file

@ -601,7 +601,8 @@ public sealed class CouchbaseLiteWorkDayService : IWorkDayService
var weekdayDaytimeHours = isWeekend ? 0m : Math.Max(0m, totalHours - nightHours); var weekdayDaytimeHours = isWeekend ? 0m : Math.Max(0m, totalHours - nightHours);
var suppressVacation = isWeekend || explicitHoliday || isAutomaticHoliday || illness; var suppressVacation = isWeekend || explicitHoliday || isAutomaticHoliday || illness;
var hasNonWorkingEvent = explicitHoliday || illness || dayOff || closure; var hasNonWorkingEvent = explicitHoliday || illness || dayOff || closure;
var permitHours = !isWeekend && !isAutomaticHoliday && !hasNonWorkingEvent && totalHours < standardHours var isFutureEmptyDay = date > DateOnly.FromDateTime(DateTime.Today) && includedUnits.Count == 0;
var permitHours = !isWeekend && !isAutomaticHoliday && !hasNonWorkingEvent && !isFutureEmptyDay && totalHours < standardHours
? standardHours - totalHours ? standardHours - totalHours
: 0m; : 0m;

20
wwwroot/app.css
View file

@ -958,6 +958,26 @@ h1:focus {
background-color: #e2e3e5 !important; background-color: #e2e3e5 !important;
} }
.timesheet-summary-table .timesheet-summary-day-today {
box-shadow:
inset 0.15rem 0 0 var(--wt-calendar-today-ring),
inset -0.15rem 0 0 var(--wt-calendar-today-ring);
}
.timesheet-summary-table thead .timesheet-summary-day-today {
box-shadow:
inset 0.15rem 0 0 var(--wt-calendar-today-ring),
inset -0.15rem 0 0 var(--wt-calendar-today-ring),
inset 0 0.15rem 0 var(--wt-calendar-today-ring);
}
.timesheet-summary-table tbody tr:last-child .timesheet-summary-day-today {
box-shadow:
inset 0.15rem 0 0 var(--wt-calendar-today-ring),
inset -0.15rem 0 0 var(--wt-calendar-today-ring),
inset 0 -0.15rem 0 var(--wt-calendar-today-ring);
}
[data-bs-theme=dark] .timesheet-summary-table .timesheet-summary-day-danger { [data-bs-theme=dark] .timesheet-summary-table .timesheet-summary-day-danger {
background-color: #5b2833 !important; background-color: #5b2833 !important;
} }