Tabelle A12 überarbeitet, Tabelle A13 fertiggestellt
This commit is contained in:
@@ -89,7 +89,7 @@ $: result = A12BerechnungNutzenergiebedarfHeizung();
|
||||
|
||||
</td>
|
||||
<td class="border-2 border-gray-600 px-2 py-1">{Math.round(result.waermeSenken.März)}</td>
|
||||
<td class="border border-gray-300 px-2 py-1 bg-yellow-100">{Math.round(result.waermeQuellen.März)}</td>
|
||||
<td class="border border-gray-300 px-2 py-1 bg-yellow-100">{Math.round(result.waermeQuellen.Maerz)}</td>
|
||||
<td class="border-2 border-gray-600 px-2 py-1">{Math.round(result.waermequellensenkenverhaeltnisMärz*1000)/1000}</td>
|
||||
<td class="border border-gray-300 px-2 py-1 bg-blue-100">{Math.round(result.ausnutzungsgradMärz*1000)/1000}</td>
|
||||
<td class="border-2 border-gray-600 px-2 py-1">{Math.round(result.faktorBelastungMärz*1000)/1000}</td>
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
|
||||
<script lang="ts">
|
||||
|
||||
import { A13BerechnungRechnerischeLaufzeitHeizung } from "#lib/Berechnungen/BedarfsausweisWohnen/A13BerechnungRechnerischeLaufzeitHeizung.js";
|
||||
|
||||
$: result = A13BerechnungRechnerischeLaufzeitHeizung();
|
||||
</script>
|
||||
|
||||
|
||||
<div class="overflow-x-auto mt-16">
|
||||
@@ -14,7 +19,7 @@
|
||||
Rechnerische Laufzeit Heizung
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<th class="border border-gray-300 px-4 py-2">Monat</th>
|
||||
<th class="border border-gray-300 px-4 py-2">t<sub>h</sub> [h] (aus Tabelle A.12)<br>(1)</th>
|
||||
<th class="border border-gray-300 px-4 py-2">f<sub>WE</sub> [-]<br>(2)</th>
|
||||
@@ -24,109 +29,109 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Januar</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Januar)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">19,86</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[0])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Februar</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Februar)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">18,58</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[1])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">März</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Maerz)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">18,69</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[2])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">April</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.April)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100 ">17,25</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,25</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[3])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Mai</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Mai)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[4])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Juni</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Juni)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2b bg-gray-100">17,00</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[5])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Juli</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Juli)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[6])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">August</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.August)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[7])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">September</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.September)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[8])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Oktober</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Oktober)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,16</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[9])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">November</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.November)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">18,88</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[10])}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Dezember</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-yellow-100">{Math.round(result.heizstunden.Dezember)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">0,042</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">17,00</td>
|
||||
<td class="border border-gray-300 px-4 py-2 bg-gray-100">19,90</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeiten[11])}</td>
|
||||
</tr>
|
||||
<tr class="text-center">
|
||||
<td class="border border-gray-300 px-4 py-2">Jahressumme</td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.heizstundenGesamt)}</td>
|
||||
<td class="border border-gray-300 px-4 py-2"></td>
|
||||
<td class="border border-gray-300 px-4 py-2"></td>
|
||||
<td class="border border-gray-300 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2"></td>
|
||||
<td class="border-2 border-gray-600 px-4 py-2">{Math.round(result.rechnerischeLaufzeitGesamt)}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user