Cleaned up logic for calculating power draw

This commit is contained in:
Jeremy Stretch
2019-06-19 10:51:53 -04:00
parent bdf95b2e34
commit 0f1453c16d
7 changed files with 108 additions and 88 deletions

View File

@@ -349,24 +349,36 @@
<tr>
<th>Input</th>
<th>Outlets</th>
<th>Allocated/Max (W)</th>
<th>Available (VA)</th>
<th>Utilization (Allocated)</th>
<th>Allocated</th>
<th>Available</th>
<th>Utilization</th>
</tr>
{% for pp in power_ports %}
{% for leg in pp.get_power_stats %}
{% with utilization=pp.get_power_draw powerfeed=pp.connected_endpoint %}
<tr>
{% if leg.name %}
<td style="padding-left: 20px">{{ leg.name }}</td>
<td>{{ pp }}</td>
<td>{{ utilization.outlet_count }}</td>
<td>{{ utilization.allocated }}VA</td>
{% if powerfeed %}
<td>{{ powerfeed.available_power }}VA</td>
<td>{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}</td>
{% else %}
<td>{{ pp }}</td>
<td class="text-muted">&mdash;</td>
<td class="text-muted">&mdash;</td>
{% endif %}
<td>{{ leg.outlets|placeholder }}</td>
<td>{{ leg.allocated_draw_total }} / {{ leg.maximum_draw_total }}</td>
<td>{{ leg.available_power }}</td>
<td>{% utilization_graph leg.allocated_utilization %}</td>
</tr>
{% endfor %}
{% for leg in utilization.legs %}
<tr>
<td style="padding-left: 20px">Leg {{ leg.name }}</td>
<td>{{ leg.outlet_count }}</td>
<td>{{ leg.allocated }}</td>
<td>{{ powerfeed.available_power|divide:3 }}VA</td>
{% with phase_available=powerfeed.available_power|divide:3 %}
<td>{% utilization_graph leg.allocated|percentage:phase_available %}</td>
{% endwith %}
</tr>
{% endfor %}
{% endwith %}
{% endfor %}
</table>
</div>