Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/budgetmonfin' into develop

Browse Source
This commit is contained in:
Monique
2023-04-05 21:53:37 +02:00
parent 72f9e0691f 236c949fc9
commit 60b577f279
10 changed files with 545 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/pages/monfin2/bestemmingen.php
+157 -108
View File
@@ -9,7 +9,7 @@
<span style="margin-right: 20px;"
data-bind="text: 'Dit jaar is financieel afgesloten', visible: jaarclosed()"><span>
</h4>
<div data-bind="visible: !jaartoewijzing()">
<div data-bind="visible: ! jaartoewijzing()">
<p>Er zijn nog geen budgetgegevens voor dit kalenderjaar</p>
</div>
</div>
@@ -32,7 +32,8 @@
<th style="width: 14%"></th>
<th style="width: 14%"></th>
<th style="width:14%"></th>
<th style="width:14%"></th>
<th style="width:7%"></th>
<th style="width:7%"></th>
</tr>
</thead>
<tbody data-bind="foreach: basissoorten">
@@ -56,7 +57,7 @@
<td class="blokheader" style="text-align: right; padding-right: 5px;padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Som</span>
</td>
<td class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<td colspan="2" class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Percentage</span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting,
@@ -71,9 +72,9 @@
<td style="text-align: left; color: #008028 ">budget</td>
<!-- ko foreach: uitgavetypes() -->
<!-- ko if (code == $root.uitgavetypes()[$index()].code) -->
<td style="text-align: right; ">
<td style="text-align: right; padding-top: 1px; vertical-align: top ">
<input class="decimal"
style="width: 150px; max-width: 100%; background-color: #e6ffee"
style="width: 145px; max-width: 98%; background-color: #e6ffee"
data-bind="textInput: budgetFormat,
event:{change:$root.fSaveBudget.bind($data, $parent.subsoortID, 'BASIS') } ,
enable: ! $root.jaarclosed()"
@@ -81,8 +82,8 @@
</td>
<!-- /ko -->
<!-- /ko -->
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:150px; max-width: 100%; height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
<td style="padding: 0; padding-top: 1px; padding-left: 4px; vertical-align: top">
<div style="width:145px; max-width: 98%; height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px; ">
<span data-bind="text: subbudgetform,
@@ -91,10 +92,19 @@
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:150px; max-width: 100%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? gebudgetprocent() + ' ('+ budgetprocent() + ')' : '',
<span data-bind="text: subbudgetform() != '' ? gebudgetprocent(): '',
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? budgetprocent() : ' ' ,
visible: ! $root.jaarclosed()">
</span>
</div>
@@ -107,7 +117,7 @@
<!-- ko if (code == $root.uitgavetypes()[$index()].code) -->
<td style="text-align: right; padding-bottom: 10px;">
<input class="decimal"
style="width: 150px; max-width:100%; background-color: #e6f2ff"
style="width: 145px; max-width:98%; background-color: #e6f2ff"
data-bind="textInput: formatted,
style: { color : budget() < bedrag() ? '#ff0000' : '#000000'},
event: {change:$root.fSaveBedrag.bind($data, $parent.subsoortID, 'BASIS' )} ,
@@ -115,9 +125,9 @@
</td>
<!-- /ko -->
<!-- /ko -->
<td style="padding: 0; vertical-align: top">
<div style="width:150px; max-width: 100%; height: 24px;background-color: #e6f2ff; border-radius: 2px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; margin: 0; margin-top: 1px;text-align: right; padding-right: 3px; ">
<td style="padding: 0; padding-left: 4px; vertical-align: top">
<div style="width:145px; max-width: 98%; height: 24px;background-color: #e6f2ff; border-radius: 2px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; margin: 0; margin-top: 1px;text-align: right; padding-right: 2px; ">
<span data-bind="text: formtotaal,
style: { color : subbudget() < totaal() ? '#ff0000' : '#000000'},
visible: ! $root.jaarclosed()">
@@ -125,13 +135,23 @@
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:150px; max-width: 100%; height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; margin: 0; margin-top: 1px; text-align: right; padding-right: 3px;">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: procent,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind=" text: totaalbudgetprocent,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
</tr>
@@ -146,13 +166,17 @@
<span style="display:inline-block; width: 100px; text-align:right"
data-bind="text: totaalbasis">
</span>
<span data-bind="text: totbasispct() == '0,0' ? '' : '(' + totbasispct() + '% van het totaalbudget)' ">
</span>
<br>
<span style="display:inline-block; width: 250px" >Gebudgeteerd per kostenpost</span>
<span style="display:inline-block; width: 100px; text-align:right"
data-bind="text: gebudgetbasis ">
</span>
<span data-bind= "text: gebudgetbasispct()== '0,0' ? '' : '(' + gebudgetbasispct() + '% van het totaalbudget)' "></span>
<br>
<span style="display:inline-block; width: 250px" >Totaal budget</span>
<span style="display:inline-block; width: 250px" >Totaalbudget</span>
<span style="display:inline-block; width: 100px; text-align:right"
data-bind="text: jaartoewijzing() ? jaartoewijzing().basis : '' ">
</span>
@@ -172,111 +196,133 @@
<th style="width: 14%"></th>
<th style="width: 14%"></th>
<th style="width:14%"></th>
<th style="width:14%"></th>
<th style="width:7%"></th>
<th style="width:7%"></th>
</tr>
</thead>
<tbody data-bind="foreach: extrasoorten">
<tr class="blokheader" style="text-align:left; padding-left:5px">
<td data-bind="text:naam"></td>
<td></td>
<!-- ko if: $index() ==0-->
<!-- ko foreach: $root.uitgavetypes -->
<td style="text-align:right">
<span data-bind="text: code"></span>
</td>
<!-- /ko -->
<!-- /ko -->
<!-- ko if: $index() != 0-->
<!-- ko foreach: $root.uitgavetypes -->
<td >
</td>
<!-- /ko -->
<!-- /ko -->
<td class="blokheader" style="text-align: right; padding-right: 5px;padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Som</span>
</td>
<td class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Percentage</span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting,
visible: $index() ==0">
</i>
</td>
</tr>
<!-- ko foreach:subsoorten -->
<tr >
<td data-bind="text: naam"></td>
<td style="text-align: left; color: #00802b">budget</td>
<!-- ko foreach: uitgavetypes() -->
<!-- ko if (code == $root.uitgavetypes()[$index()].code) -->
<td style="text-align: right; ">
<input class="decimal"
style="width: 150px; max-width: 100%; background-color: #e6ffee"
data-bind="textInput: budgetFormat,
event:{change:$root.fSaveBudget.bind($data, $parent.subsoortID, 'EXTRA') } ,
enable: ! $root.jaarclosed()"
/>
</td>
<!-- /ko -->
<!-- /ko -->
<tbody data-bind="foreach: extrasoorten">
<tr class="blokheader" style="; text-align:left; padding-left:5px; ">
<td data-bind="text:naam">
</td>
<td></td>
<!-- ko if: $index() ==0-->
<!-- ko foreach: $root.uitgavetypes -->
<td style="text-align:right">
<span data-bind="text: code"></span>
</td>
<!-- /ko -->
<!-- /ko -->
<!-- ko if: $index() != 0-->
<!-- ko foreach: $root.uitgavetypes -->
<td >
</td>
<!-- /ko -->
<!-- /ko -->
<td class="blokheader" style="text-align: right; padding-right: 5px;padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Som</span>
</td>
<td colspan="2" class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Percentage</span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting,
visible: $index() ==0">
</i>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:150px; max-width: 100%; height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
</tr>
<!-- ko foreach:subsoorten -->
<tr>
<td data-bind="text: naam"></td>
<td style="text-align: left; color: #008028 ">budget</td>
<!-- ko foreach: uitgavetypes() -->
<!-- ko if (code == $root.uitgavetypes()[$index()].code) -->
<td style="text-align: right; padding-top: 1px; vertical-align: top ">
<input class="decimal"
style="width: 145px; max-width: 98%; background-color: #e6ffee"
data-bind="textInput: budgetFormat,
event:{change:$root.fSaveBudget.bind($data, $parent.subsoortID, 'EXTRA') } ,
enable: ! $root.jaarclosed()"
/>
</td>
<!-- /ko -->
<!-- /ko -->
<td style="padding: 0; padding-top: 1px; padding-left: 4px; vertical-align: top">
<div style="width:145px; max-width: 98%; height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px; ">
<span data-bind="text: subbudgetform,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:150px; max-width: 100%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? gebudgetprocent() + ' ('+ budgetprocent() + ')' : '',
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
</tr>
<tr >
<td ></td>
<td style="text-align: left; color: #003399">uitgaven</td>
<!-- ko foreach: uitgavetypes() -->
<!-- ko if (code == $root.uitgavetypes()[$index()].code) -->
<td style="text-align: right; padding-bottom: 10px; ">
<input class="decimal"
style="width: 150px;max-width:100%; background-color: #e6f2ff"
data-bind="textInput: formatted,
style: { color : budget() < bedrag() ? '#ff0000' : '#000000'},
event:{change:$root.fSaveBedrag.bind($data, $parent.subsoortID, 'EXTRA' )} ,
enable: ! $root.jaarclosed()" />
</td>
<!-- /ko -->
<!-- /ko -->
<td style="padding: 0; vertical-align: top">
<div style="width:150px; max-width: 100%; height: 24px;background-color: #e6f2ff; border-radius: 2px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; margin: 0; margin-top: 1px;text-align: right; padding-right: 3px; ">
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? gebudgetprocent(): '',
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? budgetprocent() : ' ' ,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
</tr>
<tr >
<td ></td>
<td style="text-align: left; color:#003e80; ">uitgaven</td>
<!-- ko foreach: uitgavetypes() -->
<!-- ko if (code == $root.uitgavetypes()[$index()].code) -->
<td style="text-align: right; padding-bottom: 10px;">
<input class="decimal"
style="width: 145px; max-width:98%; background-color: #e6f2ff"
data-bind="textInput: formatted,
style: { color : budget() < bedrag() ? '#ff0000' : '#000000'},
event: {change:$root.fSaveBedrag.bind($data, $parent.subsoortID, 'BASIS' )} ,
enable: ! $root.jaarclosed()" />
</td>
<!-- /ko -->
<!-- /ko -->
<td style="padding: 0; padding-left: 4px; vertical-align: top">
<div style="width:145px; max-width: 98%; height: 24px;background-color: #e6f2ff; border-radius: 2px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; margin: 0; margin-top: 1px;text-align: right; padding-right: 2px; ">
<span data-bind="text: formtotaal,
style: { color : subbudget() < totaal() ? '#ff0000' : '#000000'},
visible: ! $root.jaarclosed()">
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:150px; max-width: 100%; height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; margin: 0; margin-top: 1px; text-align: right; padding-right: 3px;">
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: procent,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
</tr>
<!-- /ko -->
</tbody> <!-- FOREACH extrasoorten -->
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind=" text: totaalbudgetprocent,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
</tr>
<!-- /ko -->
</tbody>
<!-- FOREACH extrasoorten -->
</table>
</div> <!-- visible extrageopend -->
@@ -287,13 +333,16 @@
<span style="display:inline-block; width: 100px; text-align:right"
data-bind="text: totaalextra">
</span>
<span data-bind="text: totextrapct() =='0,0' ? '' : '(' + totextrapct() + '% van het totaalbudget)'"></span>
<br>
<span style="display:inline-block; width: 250px" >Gebudgeteerd per kostenpost</span>
<span style="display:inline-block; width: 100px; text-align:right"
data-bind="text: gebudgetextra ">
data-bind="text: gebudgetextra() ">
</span>
<span data-bind="text: gebudgetextrapct() =='0,0' ? '' : '(' + gebudgetextrapct() + '% van het totaalbudget)' "></span>
<br>
<span style="display:inline-block; width: 250px" >Totaal budget</span>
<span style="display:inline-block; width: 250px" >Totaalbudget</span>
<span style="display:inline-block; width: 100px; text-align:right"
data-bind="text: jaartoewijzing() ? jaartoewijzing().extra : '' ">
</span>
application/views/monpas/pages/monfin2/overzicht.php
+99 -133
View File
@@ -77,50 +77,38 @@
style="padding: 3px; width: 22%; vertical-align:bottom; background-color: #968026;">Basisondersteuning</th>
<!-- ko foreach: uitgavetypes-->
<th style="writing-mode: vertical-rl; padding: 3px; width: 8%; vertical-align:text-top; text-align: right; font-size:0.9em; background-color: #968026;" ><span data-bind="text: naam"></span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting.bind($data, 'KOSTEN')">
</i>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting.bind($data, 'KOSTEN')">
</i>
</th>
<!-- /ko -->
<th style="writing-mode: vertical-rl; width: 8%; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>som</span>
<th style="writing-mode: vertical-rl; width: 8%; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>uitgavensom</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'SOM')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:8%; background-color: #968026; font-size: 12px;"><span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:8%; background-color: #968026; font-size: 12px;"><span>% uitgaven</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</th>
<th style="width: 8%; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>Budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'BUDGET')">
</i>
<th style="width: 8%; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>budgetsom</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'BUDGET')">
</i>
</th>
<th style="text-align:right; background-color: #968026; width: 2%">
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:8%; background-color: #968026; ; font-size: 12px;"><span>% gebudgett.</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%GEBUDGET')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:8%; background-color: #968026; font-size: 12px;"><span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET2')">
</i>
</th>
<th style="writing-mode: vertical-rl; padding: 3px; width: 8%; vertical-align:text-top; text-align:right; background-color: #968026;"><span>verschil</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'VERSCHIL')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:8%; background-color: #968026; font-size: 12px;"><span>% uitgaven</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:8%; background-color: #968026; font-size: 12px;"><span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET')">
</i>
</th>
</tr>
</thead>
<tbody >
@@ -131,7 +119,8 @@
<td class="naam2" style="text-align:left;">Totaal basis</td>
<!--ko if: sombasisperuitgavetype() -->
<!-- ko foreach: sombasisperuitgavetype-->
<td style="text-align:right" data-bind="text: som"></td>
<td style="text-align:right" data-bind="text: som"></td>
<!-- /ko -->
<!-- /ko -->
@@ -141,20 +130,21 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragbudgetpct : '0,00',
style: {color: $root.budgetten() && $root.budgetten().basisbedragbudgetkaal > 100 ? 'red' : 'black'}"></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00' "></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basis : '0,00' "></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basis : '0,00' "></td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
click: $root.fOpenDetails.bind($data, 'BASIS') "
></i></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basisgebudgetpct : '0,00' "></td>
<td style="text-align:right"
data-bind="text : $root.budgetten() ?$root.budgetten().basisverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' } ">
</td>
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' }">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basisbudgetpct : '0,00' "></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basisverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' } "></td>
</tr>
<!-- ko foreach: basis -->
@@ -164,41 +154,35 @@
<td></td>
<td data-bind="text:naam" class="naam" style="padding:0;" > </td>
<td data-bind="text: isNaN(uitgavetypes[0].bedrag.replace(/\./g,'') ) || uitgavetypes[0].bedrag ==0 ? '' : uitgavetypes[0].bedrag,
style: {color: uitgavetypes[0].budget && Number(uitgavetypes[0].budget) < Number(uitgavetypes[0].bedrag) ? 'red' : 'black' }"
style: {color: uitgavetypes[0].budget && Number(uitgavetypes[0].budget.replace(/\./g,'') ) < Number(uitgavetypes[0].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right; width:98px ">
</td>
<td data-bind="text: isNaN(uitgavetypes[1].bedrag.replace(/\./g,'') ) || uitgavetypes[1].bedrag ==0 ? '' : uitgavetypes[1].bedrag,
style: {color: uitgavetypes[1].budget && Number(uitgavetypes[1].budget) < Number(uitgavetypes[1].bedrag) ? 'red' : 'black' }"
style: {color: uitgavetypes[1].budget && Number(uitgavetypes[1].budget.replace(/\./g,'')) < Number(uitgavetypes[1].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right; width:91px ">
</td>
<td data-bind="text: isNaN(uitgavetypes[2].bedrag.replace(/\./g,'') ) || uitgavetypes[2].bedrag ==0 ? '' : uitgavetypes[2].bedrag,
style: {color: uitgavetypes[2].budget && Number(uitgavetypes[2].budget <uitgavetypes[2].bedrag ? 'red' : 'black' }"
style: {color: uitgavetypes[2].budget && Number(uitgavetypes[2].budget.replace(/\./g,'')) <Number(uitgavetypes[2].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right;width:91px">
</td>
<td data-bind="text: isNaN(uitgavetypes[3].bedrag.replace(/\./g,'') ) || uitgavetypes[3].bedrag ==0 ? '' : uitgavetypes[3].bedrag,
style: {color: uitgavetypes[3].budget && Number(uitgavetypes[3].budget) < Number(uitgavetypes[3].bedrag) ? 'red' : 'black' }"
style: {color: uitgavetypes[3].budget && Number(uitgavetypes[3].budget.replace(/\./g,'')) < Number(uitgavetypes[3].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right;width:91px">
</td>
<td style="text-align:right;" data-bind="text: isNaN(uitgavetypes[3].bedrag.replace(/\./g,'') ) || uitgavetypes[3].bedrag ==0 ? '' : uitgavetypes[3].bedragbudgetpct,
style: {color: Number(uitgavetypes[3].bedrag) && Number(uitgavetypes[3].bedragbudgetpct) > 100 ? 'red' : 'black' }">
</td>
<td data-bind="text: uitgavetypes[3].bedrag!= 0 ? uitgavetypes[3].bedragpct : ' ' "
style="text-align:right;">
</td>
<td data-bind="text: isNaN(uitgavetypes[3].budget.replace(/\./g,'') ) || uitgavetypes[3].budget ==0 ? '' : uitgavetypes[3].budget" style="text-align:right;width:91px"></td>
<td ><i class="fa fa-info-circle"
data-bind="visible: Number(uitgavetypes[3].budget)> 0,
data-bind="visible: Number(uitgavetypes[3].budget.replace(/\./g,''))> 0,
click: $root.fOpenDetails.bind($data, 'DETAIL')">
</i>
</i>
</td>
<td style="text-align:right;" data-bind="text: uitgavetypes[3].budget !=0 ? uitgavetypes[3].gebudgetpct : ' ' ">
</td>
<td style="text-align:right;" data-bind="text: uitgavetypes[3].budget !=0 ? uitgavetypes[3].budgetpct : '' "></td>
<td data-bind="text: uitgavetypes[0].bedrag !=0 || uitgavetypes[0].budget !=0 ? uitgavetypes[3].verschil : ' ' ,
style: {color: Number(uitgavetypes[3].verschil)< 0 ? 'red': 'black'}"
<td data-bind="text: Number(uitgavetypes[0].bedrag.replace(/\./g,'')) !=0 || Number(uitgavetypes[0].budget.replace(/\./g,'')) !=0 ? uitgavetypes[3].verschil : ' ' ,
style: {color: Number(uitgavetypes[3].verschil.replace(/\./g,''))< 0 ? 'red': 'black'}"
style="text-align:right; ">
</td>
<td style="text-align:right;" data-bind="text: isNaN(uitgavetypes[3].bedrag.replace(/\./g,'') ) || Number(uitgavetypes[3].bedrag.replace(/\./g,'')) ==0 ? '' : uitgavetypes[3].bedragpct,
style: {color: Number(uitgavetypes[3].verschil.replace(/\./g,''))< 0 ? 'red': 'black'}">
</td>
<td style="text-align:right;" data-bind="text: Number(uitgavetypes[3].budget.replace(/\./g,'')) > 0 ? uitgavetypes[3].budgetpct : '' "></td>
</tr>
@@ -225,18 +209,6 @@
data-bind="click: fToelichting.bind($data, 'SOM')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<span>% uitgaven</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</td>
<td style="writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;">
<span>Budget</span>
<i class="fa fa-info-circle"
@@ -245,24 +217,25 @@
</td>
<td style="text-align:right; background-color: #968026;">
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<span>% gebuggett.</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%GEBUDGET')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'BUDGET')">
</i>
</td>
<td style="writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; text-align:right; background-color: #968026;">
<span>Verschil</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'VERSCHIL')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<span>% uitgaven</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET')">
</i>
</td>
</tr>
</tbody>
@@ -285,23 +258,24 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().extrabedragbudgetpct : '0,00',
style: {color: $root.budgetten() && $root.budgetten().extrabedragbudgetkaal > 100 ? 'red' : 'black'}">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ? $root.budgetten().extrabedragpct : '0,00' "></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ? $root.budgetten().extra : '0,00' "></td>
<td
><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
click: $root.fOpenDetails.bind($data, 'EXTRA') "
></i></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ? $root.budgetten().extragebudgetpct : '0,00' "></td>
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().extrabudgetpct : '0,00' "></td>
<td style="text-align:right" data-bind="text : $root.budgetten() ? $root.budgetten().extraverschil : '0,00',
style : {color: $root.budgetten() && $root.budgetten().extraverschil < 0 ? 'red' : 'black' }">
></i>
</td>
<td style="text-align:right"
data-bind="text : $root.budgetten() ?$root.budgetten().extraverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().extraverschil) < 0 ? 'red' : 'black' } ">
</td>
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().extrabedragpct : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().extraverschil) < 0 ? 'red' : 'black' }">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().extrabudgetpct : '0,00' "></td>
</tr>
<!-- ko foreach: extra -->
@@ -311,39 +285,35 @@
<td></td>
<td data-bind="text:naam" class="naam" style="padding:0;" > </td>
<td data-bind="text: isNaN(uitgavetypes[0].bedrag.replace(/\./g,'') ) || uitgavetypes[0].bedrag ==0 ? '' : uitgavetypes[0].bedrag,
style: {color: uitgavetypes[0].budget && Number(uitgavetypes[0].budget) < Number(uitgavetypes[0].bedrag) ? 'red' : 'black' }"
style="text-align:right;width:98px">
style: {color: uitgavetypes[0].budget && Number(uitgavetypes[0].budget.replace(/\./g,'') ) < Number(uitgavetypes[0].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right; width:98px ">
</td>
<td data-bind="text: isNaN(uitgavetypes[1].bedrag.replace(/\./g,'') ) || uitgavetypes[1].bedrag ==0 ? '' : uitgavetypes[1].bedrag,
style: {color: uitgavetypes[1].budget && Number(uitgavetypes[1].budget) < Number(uitgavetypes[1].bedrag) ? 'red' : 'black' }"
style="text-align:right;width:91px">
style: {color: uitgavetypes[1].budget && Number(uitgavetypes[1].budget.replace(/\./g,'')) < Number(uitgavetypes[1].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right; width:91px ">
</td>
<td data-bind="text: isNaN(uitgavetypes[2].bedrag.replace(/\./g,'') ) || uitgavetypes[2].bedrag ==0 ? '' : uitgavetypes[2].bedrag,
style: {color: uitgavetypes[2].budget && Number(uitgavetypes[2].budget < Number(uitgavetypes[2].bedrag) ? 'red' : 'black' }"
style="text-align:right;width:91px">
style: {color: uitgavetypes[2].budget && Number(uitgavetypes[2].budget.replace(/\./g,'')) <Number(uitgavetypes[2].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right;width:91px">
</td>
<td data-bind="text: isNaN(uitgavetypes[3].bedrag.replace(/\./g,'') ) || uitgavetypes[3].bedrag ==0 ? '' : uitgavetypes[3].bedrag,
style: {color: uitgavetypes[3].budget && Number(uitgavetypes[0].budget) < Number(uitgavetypes[3].bedrag) ? 'red' : 'black' }"
style="text-align:right;width:91px">
style: {color: uitgavetypes[3].budget && Number(uitgavetypes[3].budget.replace(/\./g,'')) < Number(uitgavetypes[3].bedrag.replace(/\./g,'')) ? 'red' : 'black' }"
style="text-align:right;width:91px">
</td>
<td></td>
<td data-bind="text: uitgavetypes[3].bedrag!= 0 ? uitgavetypes[3].bedragpct : ' ' ,
style: {color: uitgavetypes[3].bedrag && Number(uitgavetypes[0].bedragpct) > 100 ? 'red' : 'black' }" style="text-align:right;width:91px">
</td>
<td data-bind="text: color: #00802b ) || uitgavetypes[3].budget ==0 ? '' : uitgavetypes[3].budget" style="text-align:right;width:91px"></td>
<td data-bind="text: isNaN(uitgavetypes[3].budget.replace(/\./g,'') ) || uitgavetypes[3].budget ==0 ? '' : uitgavetypes[3].budget" style="text-align:right;width:91px"></td>
<td ><i class="fa fa-info-circle"
data-bind="visible: Number(uitgavetypes[3].budget) > 0 ,
click: $root.fOpenDetails.bind($data, 'DETAIL')">
data-bind="visible: Number(uitgavetypes[3].budget.replace(/\./g,''))> 0,
click: $root.fOpenDetails.bind($data, 'EXTRA')">
</i>
</td>
<td style="text-align:right;" data-bind="text: uitgavetypes[3].budget !=0 ? uitgavetypes[3].gebudgetpct : ' ' ">
</td>
<td style="text-align:right;" data-bind="text: uitgavetypes[3].budget !=0 ? uitgavetypes[3].budgetpct : '' "></td>
<td data-bind="text: uitgavetypes[0].bedrag !=0 || uitgavetypes[0].budget !=0 ? uitgavetypes[3].verschil : ' ',
style: {color: uitgavetypes[3].verschil< 0 ? 'red': 'black'}"
<td data-bind="text: Number(uitgavetypes[0].bedrag.replace(/\./g,'')) !=0 || Number(uitgavetypes[0].budget.replace(/\./g,'')) !=0 ? uitgavetypes[3].verschil : ' ' ,
style: {color: Number(uitgavetypes[3].verschil.replace(/\./g,''))< 0 ? 'red': 'black'}"
style="text-align:right; ">
</td>
<td style="text-align:right;" data-bind="text: isNaN(uitgavetypes[3].bedrag.replace(/\./g,'') ) || Number(uitgavetypes[3].bedrag.replace(/\./g,'')) ==0 ? '' : uitgavetypes[3].bedragpct,
style: {color: Number(uitgavetypes[3].verschil.replace(/\./g,''))< 0 ? 'red': 'black'}">
</td>
<td style="text-align:right;" data-bind="text: Number(uitgavetypes[3].budget.replace(/\./g,'')) > 0 ? uitgavetypes[3].budgetpct : '' "></td>
</tr>
@@ -355,7 +325,7 @@
<tbody>
<tr style="background-color:#f8f8f8">
<td></td>
<td style="text-align:left">Totaal besteed</td>
<td style="text-align:left">Totaal</td>
<!-- ko if: totsomperuitgavetype() -->
<!-- ko foreach: totsomperuitgavetype-->
<td style="text-align:right" data-bind="text: som"></td>
@@ -367,29 +337,25 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.schooltotaal().budget : '0,00'">
</td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
click: $root.fOpenDetails.bind($data, 'TOTAAL') ">
</i>
</td>
<td style="text-align:right"
data-bind="text: $root.schooltotaal() && $root.schooltotaal().verschil ? $root.schooltotaal().verschil : '0,00',
style : {color: $root.schooltotaal() && Number($root.schooltotaal().verschil) < 0 ? 'red' : 'black' }">
</td>
<td style="text-align:right"
data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,
style: {color: parseFloat($root.budgetten().totbedragbudgetkaal) > 100 ? 'red' : 'black'}" >
</td>
<td style="text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbedragpct: '0,00' ">
</td>
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.schooltotaal().budget : '0,00'">
</td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
click: $root.fOpenDetails.bind($data, 'TOTAAL') ">
</i>
</td>
<td style="text-align:right"
data-bind="text: $root.budgetten() ? $root.budgetten().totgebudgetpct: '0,00' ">
</td>
<td style="text-align:right"
data-bind="text: $root.budgetten() ? $root.budgetten().totbudgetpct: '0,00' ">
</td>
<td style="text-align:right"
data-bind="text: $root.schooltotaal() && $root.schooltotaal().verschil ? $root.schooltotaal().verschil : '0,00',
style : {color: $root.schooltotaal() && Number($root.schooltotaal().verschil) < 0 ? 'red' : 'black' }">
</td>
</tr>
</tbody>
</table>