Merge pull request 'Changed logic in production mail report for efficiency colour' (#1352) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 20s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 20s
Reviewed-on: #1352
This commit was merged in pull request #1352.
This commit is contained in:
@@ -162,7 +162,7 @@
|
|||||||
|
|
||||||
if ((float) $planQuantity == 0 && (float) $actualQuantity == 0)
|
if ((float) $planQuantity == 0 && (float) $actualQuantity == 0)
|
||||||
{
|
{
|
||||||
return '#4caf50';
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$efficiency = (float) $value;
|
$efficiency = (float) $value;
|
||||||
@@ -171,7 +171,8 @@
|
|||||||
return '#ff4d4d'; // red
|
return '#ff4d4d'; // red
|
||||||
} elseif ($efficiency < 95) {
|
} elseif ($efficiency < 95) {
|
||||||
return '#ffd633'; // yellow
|
return '#ffd633'; // yellow
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
return '#4caf50'; // green
|
return '#4caf50'; // green
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -218,8 +219,15 @@
|
|||||||
{{-- <td style="text-align:center; border:1px solid #444; padding:8px;">
|
{{-- <td style="text-align:center; border:1px solid #444; padding:8px;">
|
||||||
{{ $row['dayShiftEfficiency'] }}
|
{{ $row['dayShiftEfficiency'] }}
|
||||||
</td> --}}
|
</td> --}}
|
||||||
<td style="text-align:center; border:1px solid #444; padding:8px; background-color: {{ $dayEfficiencyColor }}; color: #fff; font-weight: bold;">
|
|
||||||
|
{{-- <td style="text-align:center; border:1px solid #444; padding:8px; background-color: {{ $dayEfficiencyColor }}; color: #fff; font-weight: bold;">
|
||||||
{{ $row['dayShiftEfficiency'] }}
|
{{ $row['dayShiftEfficiency'] }}
|
||||||
|
</td> --}}
|
||||||
|
|
||||||
|
<td style="text-align: center; vertical-align: middle; border: 1px solid #444; padding: 8px; background-color: {{ $dayEfficiencyColor }}; color: #fff; font-weight: bold;">
|
||||||
|
<div style="text-align: center; width: 100%;">
|
||||||
|
{{ $row['dayShiftEfficiency'] }}
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td style="text-align:center; border:1px solid #444; padding:8px;">
|
<td style="text-align:center; border:1px solid #444; padding:8px;">
|
||||||
@@ -234,8 +242,14 @@
|
|||||||
{{ $row['nightShiftEfficiency'] }}
|
{{ $row['nightShiftEfficiency'] }}
|
||||||
</td> --}}
|
</td> --}}
|
||||||
|
|
||||||
<td style="text-align:center; border:1px solid #444; padding:8px; background-color: {{ $nightEfficiencyColor }}; color: #fff; font-weight: bold;">
|
{{-- <td style="text-align:center; border:1px solid #444; padding:8px; background-color: {{ $nightEfficiencyColor }}; color: #fff; font-weight: bold;">
|
||||||
{{ $row['nightShiftEfficiency'] }}
|
{{ $row['nightShiftEfficiency'] }}
|
||||||
|
</td> --}}
|
||||||
|
|
||||||
|
<td style="text-align: center; vertical-align: middle; border: 1px solid #444; padding: 8px; background-color: {{ $nightEfficiencyColor }}; color: #fff; font-weight: bold;">
|
||||||
|
<div style="text-align: center; width: 100%;">
|
||||||
|
{{ $row['nightShiftEfficiency'] }}
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td style="text-align:center; border:1px solid #444; padding:8px;">
|
<td style="text-align:center; border:1px solid #444; padding:8px;">
|
||||||
@@ -253,7 +267,9 @@
|
|||||||
</td> --}}
|
</td> --}}
|
||||||
|
|
||||||
<td style="text-align:center; border:1px solid #444; padding:8px; background-color: {{ $efficiencyColor }}; color: #fff; font-weight: bold;">
|
<td style="text-align:center; border:1px solid #444; padding:8px; background-color: {{ $efficiencyColor }}; color: #fff; font-weight: bold;">
|
||||||
{{ $row['efficiency'] }}
|
<div style="text-align: center;">
|
||||||
|
{{ $row['efficiency'] }}
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td style="text-align:center; border:1px solid #444; padding:8px;">
|
<td style="text-align:center; border:1px solid #444; padding:8px;">
|
||||||
{{ $row['nonPlannedQuantity'] }}
|
{{ $row['nonPlannedQuantity'] }}
|
||||||
|
|||||||
Reference in New Issue
Block a user