clayschaad/ShiftScheduler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor export methods to directly use ShiftWithTransport instead of converting to separate parameters

Browse source 
Co-authored-by: clayschaad <11883505+clayschaad@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-08-19 19:15:17 +00:00
parent 246e90d493
commit 33c007e66c
3 changed files with 212 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Server/Controllers/ShiftController.cs
View file

@ -113,16 +113,7 @@ namespace ShiftScheduler.Server.Controllers
[HttpPost("export_ics_with_transport")] [HttpPost("export_ics_with_transport")]
public IActionResult ExportIcsWithTransport([FromBody] List<ShiftWithTransport> shiftsWithTransport) public IActionResult ExportIcsWithTransport([FromBody] List<ShiftWithTransport> shiftsWithTransport)
{ {
var schedule = shiftsWithTransport.ToDictionary(s => s.Date, s => s.Shift.Name); var ics = _icsService.GenerateIcs(shiftsWithTransport);
var shifts = shiftsWithTransport.Select(s => s.Shift).DistinctBy(s => s.Name).ToList();
var shiftTransports = shiftsWithTransport.Select(s => new ShiftTransport
{
ShiftName = s.Shift.Name,
MorningTransport = s.MorningTransport,
AfternoonTransport = s.AfternoonTransport
}).DistinctBy(s => s.ShiftName).ToList();
var ics = _icsService.GenerateIcs(schedule, shifts, shiftTransports);
return File(System.Text.Encoding.UTF8.GetBytes(ics), "text/calendar", "schedule.ics"); return File(System.Text.Encoding.UTF8.GetBytes(ics), "text/calendar", "schedule.ics");
} }
@ -138,16 +129,7 @@ namespace ShiftScheduler.Server.Controllers
[HttpPost("export_pdf_with_transport")] [HttpPost("export_pdf_with_transport")]
public IActionResult ExportPdfWithTransport([FromBody] List<ShiftWithTransport> shiftsWithTransport) public IActionResult ExportPdfWithTransport([FromBody] List<ShiftWithTransport> shiftsWithTransport)
{ {
var schedule = shiftsWithTransport.ToDictionary(s => s.Date, s => s.Shift.Name); var pdf = _pdfExportService.GenerateMonthlySchedulePdf(shiftsWithTransport);
var shifts = shiftsWithTransport.Select(s => s.Shift).DistinctBy(s => s.Name).ToList();
var shiftTransports = shiftsWithTransport.Select(s => new ShiftTransport
{
ShiftName = s.Shift.Name,
MorningTransport = s.MorningTransport,
AfternoonTransport = s.AfternoonTransport
}).DistinctBy(s => s.ShiftName).ToList();
var pdf = _pdfExportService.GenerateMonthlySchedulePdf(schedule, shifts, shiftTransports);
return File(pdf, "application/pdf", "schedule.pdf"); return File(pdf, "application/pdf", "schedule.pdf");
} }
} }

58
Services/IcsExportService.cs
View file

@ -68,6 +68,64 @@ namespace ShiftScheduler.Services
return new CalendarSerializer().SerializeToString(calendar); return new CalendarSerializer().SerializeToString(calendar);
} }
public string GenerateIcs(List<ShiftWithTransport> shiftsWithTransport)
{
var calendar = new Calendar();
foreach (var shiftWithTransport in shiftsWithTransport)
{
var date = shiftWithTransport.Date;
var shift = shiftWithTransport.Shift;
if (string.IsNullOrEmpty(shift.MorningTime) && string.IsNullOrEmpty(shift.AfternoonTime))
continue;
if (!string.IsNullOrEmpty(shift.MorningTime))
{
var times = shift.MorningTime.Split('-');
var summary = $"{shift.Name} (Morning)";
var description = "";
if (shiftWithTransport.MorningTransport != null && !string.IsNullOrEmpty(shiftWithTransport.MorningTransport.DepartureTime))
{
var transportSummary = FormatTransportInfo(shiftWithTransport.MorningTransport);
description = $"Transport: {transportSummary}";
}
calendar.Events.Add(new CalendarEvent
{
Summary = summary,
Description = description,
Start = new CalDateTime(date.Add(TimeSpan.Parse(times[0]))),
End = new CalDateTime(date.Add(TimeSpan.Parse(times[1])))
});
}
if (!string.IsNullOrEmpty(shift.AfternoonTime))
{
var times = shift.AfternoonTime.Split('-');
var summary = $"{shift.Name} (Afternoon)";
var description = "";
if (shiftWithTransport.AfternoonTransport != null && !string.IsNullOrEmpty(shiftWithTransport.AfternoonTransport.DepartureTime))
{
var transportSummary = FormatTransportInfo(shiftWithTransport.AfternoonTransport);
description = $"Transport: {transportSummary}";
}
calendar.Events.Add(new CalendarEvent
{
Summary = summary,
Description = description,
Start = new CalDateTime(date.Add(TimeSpan.Parse(times[0]))),
End = new CalDateTime(date.Add(TimeSpan.Parse(times[1])))
});
}
}
return new CalendarSerializer().SerializeToString(calendar);
}
private string FormatTransportInfo(TransportConnection transport) private string FormatTransportInfo(TransportConnection transport)
{ {
var departure = DateTime.TryParse(transport.DepartureTime, out var dep) ? dep.ToString("HH:mm") : transport.DepartureTime; var departure = DateTime.TryParse(transport.DepartureTime, out var dep) ? dep.ToString("HH:mm") : transport.DepartureTime;

152
Services/PdfExportService.cs
View file

@ -39,6 +39,33 @@ namespace ShiftScheduler.Services
return document.GeneratePdf(); return document.GeneratePdf();
} }
public byte[] GenerateMonthlySchedulePdf(List<ShiftWithTransport> shiftsWithTransport)
{
if (!shiftsWithTransport.Any())
return new byte[0];
var year = shiftsWithTransport.First().Date.Year;
var month = shiftsWithTransport.First().Date.Month;
var document = Document.Create(container =>
{
container.Page(page =>
{
page.Margin(30);
page.Size(PageSizes.A4.Landscape());
page.DefaultTextStyle(x => x.FontSize(10));
page.Header()
.Text($"Shift Schedule for {CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(month)} {year}")
.FontSize(16).Bold().AlignCenter();
page.Content().Element(e => ComposeTable(e, shiftsWithTransport));
});
});
return document.GeneratePdf();
}
void ComposeTable(IContainer container, IReadOnlyDictionary<DateTime, string> schedule, IReadOnlyList<Shift> shifts, IReadOnlyList<ShiftTransport>? shiftTransports) void ComposeTable(IContainer container, IReadOnlyDictionary<DateTime, string> schedule, IReadOnlyList<Shift> shifts, IReadOnlyList<ShiftTransport>? shiftTransports)
{ {
@ -72,6 +99,39 @@ namespace ShiftScheduler.Services
}); });
} }
void ComposeTable(IContainer container, List<ShiftWithTransport> shiftsWithTransport)
{
container.Table(table =>
{
table.ColumnsDefinition(columns =>
{
columns.RelativeColumn();
columns.RelativeColumn();
columns.RelativeColumn();
columns.RelativeColumn();
columns.RelativeColumn();
columns.RelativeColumn();
columns.RelativeColumn();
});
var scheduleDictionary = shiftsWithTransport.ToDictionary(s => s.Date, s => s);
var year = shiftsWithTransport.First().Date.Year;
var month = shiftsWithTransport.First().Date.Month;
var daysInMonth = DateTime.DaysInMonth(year, month);
var monthDates = Enumerable.Range(1, daysInMonth)
.Select(day => new DateTime(year, month, day))
.ToList();
var weeks = monthDates
.GroupBy(d => CultureInfo.InvariantCulture.Calendar.GetWeekOfYear(
d, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday))
.ToList();
foreach (var week in weeks)
{
RenderShiftForWeek(table, week, scheduleDictionary);
}
});
}
private static void RenderShiftForWeek(TableDescriptor table, IGrouping<int, DateTime> week, private static void RenderShiftForWeek(TableDescriptor table, IGrouping<int, DateTime> week,
IReadOnlyDictionary<DateTime, string> schedule, IReadOnlyList<Shift> shifts, IReadOnlyList<ShiftTransport>? shiftTransports) IReadOnlyDictionary<DateTime, string> schedule, IReadOnlyList<Shift> shifts, IReadOnlyList<ShiftTransport>? shiftTransports)
{ {
@ -140,6 +200,77 @@ namespace ShiftScheduler.Services
} }
} }
private static void RenderShiftForWeek(TableDescriptor table, IGrouping<int, DateTime> week,
IReadOnlyDictionary<DateTime, ShiftWithTransport> shiftsWithTransport)
{
var weekDates = week.ToList();
var dayInWeek = weekDates.Count;
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var dddd = weekDates.ElementAtOrDefault(day).ToString("dd.MM.yyyy (ddd)");
table.Cell().Element(CellStyleFirst).Text(dddd);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
{
RenderEmptyCell(table);
}
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var shiftName = shiftWithTransport?.Shift.Name ?? "";
table.Cell().Element(CellStyleMiddle).Text(shiftName);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
{
RenderEmptyCell(table);
}
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var morningTime = shiftWithTransport?.Shift.MorningTime ?? "";
table.Cell().Element(CellStyleMiddle).Text(morningTime);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
{
RenderEmptyCell(table);
}
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var afternoonTime = shiftWithTransport?.Shift.AfternoonTime ?? "";
table.Cell().Element(CellStyleMiddle).Text(afternoonTime);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
{
RenderEmptyCell(table);
}
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var icon = shiftWithTransport?.Shift.Icon ?? "";
table.Cell().Element(CellStyleMiddle).Text(icon);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
{
RenderEmptyCell(table);
}
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var transportInfo = GetTransportSummary(shiftWithTransport);
table.Cell().Element(CellStyleLast).Text(transportInfo);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
{
RenderEmptyCell(table);
}
}
private static string GetTransportSummary(ShiftTransport? transport) private static string GetTransportSummary(ShiftTransport? transport)
{ {
var transportLines = new List<string>(); var transportLines = new List<string>();
@ -159,6 +290,27 @@ namespace ShiftScheduler.Services
return transportLines.Count > 0 ? string.Join("\n", transportLines) : "-"; return transportLines.Count > 0 ? string.Join("\n", transportLines) : "-";
} }
private static string GetTransportSummary(ShiftWithTransport? shiftWithTransport)
{
if (shiftWithTransport == null) return "-";
var transportLines = new List<string>();
if (shiftWithTransport.MorningTransport != null && !string.IsNullOrEmpty(shiftWithTransport.MorningTransport.DepartureTime))
{
var morningInfo = FormatTransportConnection(shiftWithTransport.MorningTransport, "Morning");
transportLines.Add(morningInfo);
}
if (shiftWithTransport.AfternoonTransport != null && !string.IsNullOrEmpty(shiftWithTransport.AfternoonTransport.DepartureTime))
{
var afternoonInfo = FormatTransportConnection(shiftWithTransport.AfternoonTransport, "Afternoon");
transportLines.Add(afternoonInfo);
}
return transportLines.Count > 0 ? string.Join("\n", transportLines) : "-";
}
private static string FormatTransportConnection(TransportConnection transport, string timeOfDay) private static string FormatTransportConnection(TransportConnection transport, string timeOfDay)
{ {
var departure = DateTime.TryParse(transport.DepartureTime, out var dep) ? dep.ToString("HH:mm") : transport.DepartureTime; var departure = DateTime.TryParse(transport.DepartureTime, out var dep) ? dep.ToString("HH:mm") : transport.DepartureTime;