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

Add more icons

Browse source
This commit is contained in:
Claudio Schaad 2025-08-21 23:08:46 +02:00
parent 8885c8d57f
commit 1bf8e9b63c
10 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Client/Pages/Index.razor
View file

@ -42,7 +42,7 @@ else
{
@if (shift.IsPngIcon)
{
<img src="@shift.Icon" alt="@shift.Name" style="width: 24px; height: 24px;" />
<img src="icons\@shift.Icon" alt="@shift.Name" style="width: 24px; height: 24px;" />
}
else
{

27
Client/ShiftScheduler.Client.csproj
View file

@ -16,4 +16,31 @@
<ProjectReference Include="..\Services\ShiftScheduler.Services.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="wwwroot\break-icon.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\break-icon.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\G2.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\Bg.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\F1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\G1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\G2TS.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\icons\Kompensation.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

BIN
Client/wwwroot/icons/Bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Client/wwwroot/icons/F1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Client/wwwroot/icons/G1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Client/wwwroot/icons/G2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Client/wwwroot/icons/G2TS.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
Client/wwwroot/icons/Kompensation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

0
Client/wwwroot/break-icon.png → Client/wwwroot/icons/break-icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 186 B

25
Services/PdfExportService.cs
View file

@ -103,21 +103,20 @@ namespace ShiftScheduler.Services
if (shift != null && shift.IsPngIcon)
{
// For PNG icons, embed the image
var iconPath = Path.Combine(AppContext.BaseDirectory, "wwwroot", shift.Icon);
var iconPath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "icons", shift.Icon);
if (File.Exists(iconPath))
{
table.Cell().Element(CellStyleMiddle).Image(iconPath).FitArea();
table.Cell().Height(24).Element(CellStyleMiddle).Image(iconPath).FitArea();
}
else
{
// Fallback to shift name if PNG not found
table.Cell().Element(CellStyleMiddle).Text(shift.Name);
}
}
else
{
// For text/emoji icons, render as text
var icon = shift?.Icon ?? "";
var icon = shift?.Icon ?? shift?.Name;
table.Cell().Element(CellStyleMiddle).Text(icon);
}
}
@ -126,23 +125,11 @@ namespace ShiftScheduler.Services
RenderEmptyCell(table);
}
// Shifname
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);
}
// Morning times
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var morningTime = $"🌅 {shiftWithTransport?.Shift.MorningTime}";
var morningTime = shiftWithTransport?.Shift.MorningTime.Length > 0 ? $"🌅 {shiftWithTransport?.Shift.MorningTime}" : "";
table.Cell().Element(CellStyleMiddle).Text(morningTime);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
@ -154,7 +141,7 @@ namespace ShiftScheduler.Services
foreach (var day in Enumerable.Range(0, dayInWeek))
{
var shiftWithTransport = shiftsWithTransport.GetValueOrDefault(weekDates.ElementAtOrDefault(day));
var afternoonTime = $"🌆 {shiftWithTransport?.Shift.AfternoonTime}";
var afternoonTime = shiftWithTransport?.Shift.AfternoonTime.Length > 0 ? $"🌆 {shiftWithTransport?.Shift.AfternoonTime}" : "";
table.Cell().Element(CellStyleMiddle).Text(afternoonTime);
}
foreach (var day in Enumerable.Range(dayInWeek, 7 - dayInWeek))
@ -201,7 +188,7 @@ namespace ShiftScheduler.Services
transportLines.Add(afternoonInfo);
}
return transportLines.Count > 0 ? string.Join("\n", transportLines) : "-";
return transportLines.Count > 0 ? string.Join("\n", transportLines) : "";
}
private static string FormatTransportConnection(TransportConnection transport)