Add reduced load on furnishing

pull/1/head
Made Baruna 2022-06-04 01:15:33 +07:00
parent 4e15c412a9
commit 8f887f1b90
15 changed files with 37 additions and 15 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -794,6 +794,7 @@
"name": "Name",
"energy": "Energy",
"load": "Load",
"reduced": "Reduced",
"ratio": "Ratio",
"using": "Amount",
"interior": "Interior",

View File

@ -64,7 +64,10 @@
};
$: currentLoad = Object.entries(currentUsage[type]).reduce(
(prev, [id, val]) => {
prev.load += data[id].load * val;
let reduced = Math.max(val - 1, 0);
let first = Math.min(1, val);
prev.load += data[id].load * first;
prev.load += data[id].reduced * reduced;
prev.energy += data[id].energy * val;
return prev;
},
@ -92,6 +95,9 @@
case 'load':
if (sortOrder) return a.load - b.load;
else return b.load - a.load;
case 'reduced':
if (sortOrder) return a.reduced - b.reduced;
else return b.reduced - a.reduced;
case 'using':
if (sortOrder) return (currentUsage[type][a.id] || 0) - (currentUsage[type][b.id] || 0);
else return (currentUsage[type][b.id] || 0) - (currentUsage[type][a.id] || 0);
@ -285,6 +291,15 @@
>
{$t('furnishing.load')}
</TableHeader>
<TableHeader
className="sticky top-0 bg-item z-30"
on:click={() => sort('reduced')}
sort={sortBy === 'reduced'}
order={sortOrder}
align="center"
>
{$t('furnishing.reduced')}
</TableHeader>
<TableHeader
className="sticky top-0 bg-item z-30"
on:click={() => sort('ratio')}
@ -315,9 +330,10 @@
loading="lazy"
/>
</td>
<td class="px-4 text-gray-200">{item.name}</td>
<td class="px-4 text-gray-200 name-row">{item.name}</td>
<td class="px-4 text-gray-200 text-center">{item.energy}</td>
<td class="px-4 text-gray-200 text-center">{item.load}</td>
<td class="px-4 text-gray-200 text-center">{item.reduced}</td>
<td class="px-4 text-gray-200 text-center" style={calculateColor(item.ratio)}>{item.ratio.toFixed(2)}</td>
<td class="px-4">
<div
@ -376,4 +392,9 @@
@apply block absolute top-0 left-0 w-full h-full bg-item;
content: '';
}
.name-row {
max-width: 400px;
white-space: break-spaces;
}
</style>