Simplify employee salary specification view
Reduces complexity of salary details table by streamlining columns and layout Removes detailed salary configuration display Focuses on essential weekly salary information Improves readability of salary specifications accordion
This commit is contained in:
Janus C. H. Knudsen
parent
a1059adf06
commit
4d7e1ecbd5
3 changed files with 89 additions and 110 deletions
|
|
@ -90,110 +90,73 @@
|
|||
</swp-edit-section>
|
||||
</swp-card>
|
||||
</swp-card-column>
|
||||
|
||||
<swp-card-column>
|
||||
<!-- Loenspecifikationer -->
|
||||
<swp-card class="salary-specifications">
|
||||
<swp-card-header>
|
||||
<swp-card-title>@Model.LabelSpecifications</swp-card-title>
|
||||
</swp-card-header>
|
||||
<swp-accordion id="salary-specifications-accordion">
|
||||
@foreach (var spec in Model.Specifications)
|
||||
{
|
||||
<swp-accordion-item data-period="@spec.PeriodKey">
|
||||
<swp-accordion-header>
|
||||
<swp-accordion-info>
|
||||
<swp-accordion-title>@spec.Period</swp-accordion-title>
|
||||
<swp-accordion-meta>@spec.Weeks.Sum(w => w.NormalHours + w.OvertimeHours)t</swp-accordion-meta>
|
||||
</swp-accordion-info>
|
||||
<swp-accordion-summary>
|
||||
<swp-summary-item>
|
||||
<swp-summary-value>@spec.GrossSalaryFormatted</swp-summary-value>
|
||||
<swp-summary-label>@Model.LabelTotal</swp-summary-label>
|
||||
</swp-summary-item>
|
||||
<swp-accordion-toggle>
|
||||
<i class="ph ph-caret-down"></i>
|
||||
</swp-accordion-toggle>
|
||||
</swp-accordion-summary>
|
||||
</swp-accordion-header>
|
||||
<swp-accordion-content>
|
||||
<!-- Weeks table -->
|
||||
<swp-accordion-table>
|
||||
<swp-data-table class="specification-weeks-compact">
|
||||
<swp-data-table-header>
|
||||
<swp-data-table-cell>@Model.LabelWeek</swp-data-table-cell>
|
||||
<swp-data-table-cell>Timer</swp-data-table-cell>
|
||||
<swp-data-table-cell>Overtid</swp-data-table-cell>
|
||||
<swp-data-table-cell>I alt</swp-data-table-cell>
|
||||
</swp-data-table-header>
|
||||
@foreach (var week in spec.Weeks)
|
||||
{
|
||||
<swp-data-table-row>
|
||||
<swp-data-table-cell>Uge @week.WeekNumber</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.NormalHoursFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono @(week.HasOvertime ? "warning" : "")">@week.OvertimeHoursFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.TotalPayFormatted</swp-data-table-cell>
|
||||
</swp-data-table-row>
|
||||
}
|
||||
<swp-data-table-footer>
|
||||
<swp-data-table-cell>TOTAL</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.NormalHours))t</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.OvertimeHours))t</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.TotalPay).ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("da-DK"))) kr</swp-data-table-cell>
|
||||
</swp-data-table-footer>
|
||||
</swp-data-table>
|
||||
</swp-accordion-table>
|
||||
<swp-accordion-footer>
|
||||
<a href="/medarbejdere/loenspecifikation/@spec.PeriodKey" target="_blank" class="swp-btn secondary">
|
||||
<i class="ph ph-file-text"></i>
|
||||
Se lønberegning
|
||||
</a>
|
||||
</swp-accordion-footer>
|
||||
</swp-accordion-content>
|
||||
</swp-accordion-item>
|
||||
}
|
||||
</swp-accordion>
|
||||
</swp-card>
|
||||
</swp-card-column>
|
||||
</swp-detail-grid>
|
||||
|
||||
<!-- Loenspecifikationer (full width accordion) -->
|
||||
<swp-card class="salary-specifications">
|
||||
<swp-card-header>
|
||||
<swp-card-title>@Model.LabelSpecifications</swp-card-title>
|
||||
</swp-card-header>
|
||||
<swp-accordion id="salary-specifications-accordion">
|
||||
@foreach (var spec in Model.Specifications)
|
||||
{
|
||||
<swp-accordion-item data-period="@spec.PeriodKey">
|
||||
<swp-accordion-header>
|
||||
<swp-accordion-info>
|
||||
<swp-accordion-title>@spec.Period</swp-accordion-title>
|
||||
<swp-accordion-meta>@spec.Weeks.Sum(w => w.NormalHours + w.OvertimeHours)t</swp-accordion-meta>
|
||||
</swp-accordion-info>
|
||||
<swp-accordion-summary>
|
||||
<swp-summary-item>
|
||||
<swp-summary-value>@spec.GrossSalaryFormatted</swp-summary-value>
|
||||
<swp-summary-label>@Model.LabelTotal</swp-summary-label>
|
||||
</swp-summary-item>
|
||||
<swp-accordion-toggle>
|
||||
<i class="ph ph-caret-down"></i>
|
||||
</swp-accordion-toggle>
|
||||
</swp-accordion-summary>
|
||||
</swp-accordion-header>
|
||||
<swp-accordion-content>
|
||||
<!-- Config row -->
|
||||
<swp-config-row>
|
||||
<swp-config-item>
|
||||
<swp-config-label>@Model.LabelNormalRate:</swp-config-label>
|
||||
<swp-config-value class="mono">@spec.Config.HourlyRateFormatted</swp-config-value>
|
||||
</swp-config-item>
|
||||
<swp-config-item>
|
||||
<swp-config-label>@Model.LabelWeeklyNorm:</swp-config-label>
|
||||
<swp-config-value>@spec.Config.WeeklyHoursFormatted</swp-config-value>
|
||||
</swp-config-item>
|
||||
<swp-config-item>
|
||||
<swp-config-label>@Model.LabelOvertimeMultiplier:</swp-config-label>
|
||||
<swp-config-value>@spec.Config.OvertimeFormatted</swp-config-value>
|
||||
</swp-config-item>
|
||||
<swp-config-item>
|
||||
<swp-config-label>@Model.LabelMinimum:</swp-config-label>
|
||||
<swp-config-value class="mono">@spec.Config.MinimumFormatted</swp-config-value>
|
||||
</swp-config-item>
|
||||
<swp-config-item>
|
||||
<swp-config-label>@Model.LabelProvision:</swp-config-label>
|
||||
<swp-config-value>@spec.Config.CommissionFormatted</swp-config-value>
|
||||
</swp-config-item>
|
||||
</swp-config-row>
|
||||
|
||||
<!-- Weeks table -->
|
||||
<swp-accordion-table>
|
||||
<swp-data-table class="specification-weeks">
|
||||
<swp-data-table-header>
|
||||
<swp-data-table-cell>@Model.LabelWeek</swp-data-table-cell>
|
||||
<swp-data-table-cell>Timer</swp-data-table-cell>
|
||||
<swp-data-table-cell>Overtid</swp-data-table-cell>
|
||||
<swp-data-table-cell>Ferie</swp-data-table-cell>
|
||||
<swp-data-table-cell>Services</swp-data-table-cell>
|
||||
<swp-data-table-cell>Produkter</swp-data-table-cell>
|
||||
<swp-data-table-cell>Minimum</swp-data-table-cell>
|
||||
<swp-data-table-cell>Provision</swp-data-table-cell>
|
||||
<swp-data-table-cell>I alt</swp-data-table-cell>
|
||||
</swp-data-table-header>
|
||||
@foreach (var week in spec.Weeks)
|
||||
{
|
||||
<swp-data-table-row>
|
||||
<swp-data-table-cell>Uge @week.WeekNumber</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.NormalHoursFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono @(week.HasOvertime ? "warning" : "")">@week.OvertimeHoursFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.VacationDaysFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.ServiceRevenueFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.ProductRevenueFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.MinimumThresholdFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono @(week.HasCommission ? "highlight" : "")">@week.CommissionFormatted</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@week.TotalPayFormatted</swp-data-table-cell>
|
||||
</swp-data-table-row>
|
||||
}
|
||||
<swp-data-table-footer>
|
||||
<swp-data-table-cell>TOTAL</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.NormalHours))t</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.OvertimeHours))t</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.VacationDays)) dg</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.ServiceRevenue).ToString("N0", System.Globalization.CultureInfo.GetCultureInfo("da-DK"))) kr</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.ProductRevenue).ToString("N0", System.Globalization.CultureInfo.GetCultureInfo("da-DK"))) kr</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">-</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.Commission).ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("da-DK"))) kr</swp-data-table-cell>
|
||||
<swp-data-table-cell class="mono">@(spec.Weeks.Sum(w => w.TotalPay).ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("da-DK"))) kr</swp-data-table-cell>
|
||||
</swp-data-table-footer>
|
||||
</swp-data-table>
|
||||
</swp-accordion-table>
|
||||
<swp-accordion-footer>
|
||||
<a href="/medarbejdere/loenspecifikation/@spec.PeriodKey" target="_blank" class="swp-btn secondary">
|
||||
<i class="ph ph-file-text"></i>
|
||||
Se lønberegning
|
||||
</a>
|
||||
</swp-accordion-footer>
|
||||
</swp-accordion-content>
|
||||
</swp-accordion-item>
|
||||
}
|
||||
</swp-accordion>
|
||||
</swp-card>
|
||||
|
||||
<!-- Rates drawer -->
|
||||
<div id="rates-drawer" data-drawer="lg">
|
||||
<swp-drawer-header>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue