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

Merge branch 'fouten/monfin' into develop

Browse Source
This commit is contained in:
Monique
2024-03-04 09:32:20 +01:00
parent 5d46c8f998 ee398549b1
commit e345399e03
9 changed files with 153 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monfin2/Monfin2overzicht.php
+70 -42
View File
@@ -54,28 +54,41 @@ class Monfin2overzicht extends MY_Controller{
$sombedragpctex = $sommenex['sombedragpct'];
// todo
// bereken budget - besteding verschil per basis/extra/overig
$budgetten->basisverschil = number_format($budgetten->basis - $sombasisperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->extraverschil = number_format($budgetten->extra - $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->totaalverschil = $budgetten->totaal - ($sombasisperuitgavetype[0]->som +$somextraperuitgavetype[0]->som);
$budgetten->basisbudgetpct = number_format($sombudgetpct, 1,',', '.');
$budgetten->basisbedragpct = number_format($sombedragpct, 1,',', '.');
$budgetten->extrabudgetpct = number_format($sombudgetpctex, 1,',', '.');
$budgetten->extrabedragpct = number_format($sombedragpctex, 1,',', '.');
$bedrag = $budgetten->totaal > 0 ? ($totbesteed/$budgetten->totaal) *100: 0;
$budgetten->totbedragbudgetkaal = $bedrag;
$budgetten->totbedragbudgetpct = number_format($bedrag, 1, ',', '.');
$bedrag2 = $budgetten->totaal > 0 ?($totgebudgeteerd/$budgetten->totaal)*100 : 0;
$budgetten->totbudgetpct = number_format($bedrag2, 1, ',', '.');
// $budgetten->basisverschil = number_format($budgetten->basis - $sombasisperuitgavetype[0]->som, 0, ',' , '.' );
// $budgetten->extraverschil = number_format($budgetten->extra - $somextraperuitgavetype[0]->som, 0, ',' , '.' );
// $budgetten->totaalverschil = $budgetten->totaal - ($sombasisperuitgavetype[0]->som +$somextraperuitgavetype[0]->som);
//
//
// $budgetten->basisbudgetpct = number_format($sombudgetpct, 1,',', '.');
// $budgetten->basisbedragpct = number_format($sombedragpct, 1,',', '.');
//
// $budgetten->extrabudgetpct = number_format($sombudgetpctex, 1,',', '.');
// $budgetten->extrabedragpct = number_format($sombedragpctex, 1,',', '.');
//
// $bedrag = $budgetten->totaal > 0 ? ($totbesteed/$budgetten->totaal) *100: 0;
// $budgetten->totbedragbudgetkaal = $bedrag;
// $budgetten->totbedragbudgetpct = number_format($bedrag, 1, ',', '.');
// $bedrag2 = $budgetten->totaal > 0 ?($totgebudgeteerd/$budgetten->totaal)*100 : 0;
// $budgetten->totbudgetpct = number_format($bedrag2, 1, ',', '.');
$budgetten->basis = number_format( $sombasisperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->extra = number_format( $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->totaal = number_format( $sombasisperuitgavetype[0]->som + $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->basisverschil = number_format($sombasisperuitgavetype[0]->budgetsom - $sombasisperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->extraverschil = number_format($somextraperuitgavetype[0]->budgetsom- $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->totaalverschil = number_format($sombasisperuitgavetype[0]->budgetsom + $somextraperuitgavetype[0]->budgetsom - $sombasisperuitgavetype[0]->som -$somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->basisbudgetpct = number_format($sombudgetpct, 2,',', '.');
$budgetten->basisbedragpct = number_format($sombedragpct, 1,',', '.');
$budgetten->extrabudgetpct = number_format($sombudgetpctex, 1,',', '.');
$budgetten->extrabedragpct = number_format($sombedragpctex, 1,',', '.');
$budgetten->totbedragpct = number_format(($sombedragpctex + $sombedragpct)/2, 1, ',', '.' );
$budgetten->totbudgetpct = number_format(($sombudgetpct + $sombudgetpctex)/2, 1, ',', '.');
//
// todo
// zorg dat alle getallen geformateerd zijn met een duizendtalscheidingsteken
$budgetten->totaal = number_format($budgetten->totaal, 0 , ',' , '.');
$budgetten->basis = number_format($budgetten->basis , 0 , ',' , '.');
$budgetten->extra = number_format($budgetten->extra, 0 , ',' , '.');
// $budgetten->totaal = number_format($budgetten->totaal, 0 , ',' , '.');
// $budgetten->basis = number_format($budgetten->basis , 0 , ',' , '.');
// $budgetten->extra = number_format($budgetten->extra, 0 , ',' , '.');
foreach($sombasisperuitgavetype as $sompertype){
$sompertype->som = number_format($sompertype->som,0, ',' , '.' );
@@ -174,7 +187,7 @@ class Monfin2overzicht extends MY_Controller{
$sommen = $this->get_som_per_regel($basis, $budgetten->basis, $sombasisperuitgavetype[0]);
$basis = $sommen['soorten'];
// $somgebudgetpct = $sommen['somgebudgetpct'];
$sombudgetpct = $sommen['sombudgetpct'];
$sombedragpct = $sommen['sombedragpct'];
// $sombedragbudgetpct = $sommen['sombedragbudgetpct'];
@@ -187,27 +200,20 @@ class Monfin2overzicht extends MY_Controller{
// $sombedragbudgetpctex = $sommen['sombedragbudgetpct'];
// todo
// bereken budget - besteding verschil per basis/extra/overig
$budgetten->basisverschil = number_format($budgetten->basis - $sombasisperuitgavetype[3]->som, 0, ',' , '.' );
$budgetten->extraverschil = number_format($budgetten->extra - $somextraperuitgavetype[3]->som, 0, ',' , '.' );
$budgetten->totaalverschil = $budgetten->totaal - ($sombasisperuitgavetype[3]->som +$somextraperuitgavetype[3]->som);
$budgetten->basis = number_format( $sombasisperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->extra = number_format( $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->totaal = number_format( $sombasisperuitgavetype[0]->som + $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->basisverschil = number_format($sombasisperuitgavetype[0]->budgetsom - $sombasisperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->extraverschil = number_format($somextraperuitgavetype[0]->budgetsom- $somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->totaalverschil = number_format($sombasisperuitgavetype[0]->budgetsom + $somextraperuitgavetype[0]->budgetsom - $sombasisperuitgavetype[0]->som -$somextraperuitgavetype[0]->som, 0, ',' , '.' );
$budgetten->basisbudgetpct = number_format($sombudgetpct, 2,',', '.');
// $budgetten->basisgebudgetpct = number_format($somgebudgetpct, 2,',', '.');
$budgetten->basisbedragpct = number_format($sombedragpct, 2,',', '.');
// $budgetten->basisbedragbudgetpct = number_format($sombedragbudgetpct, 2,',', '.');
$budgetten->extrabudgetpct = number_format($sombudgetpctex, 2,',', '.');
// $budgetten->extragebudgetpct = number_format($somgebudgetpctex, 2,',', '.');
$budgetten->extrabedragpct = number_format($sombedragpctex, 2,',', '.');
// $budgetten->extrabedragbudgetpct = number_format($sombedragbudgetpctex, 2,',', '.');
$bedrag = $budgetten->totaal > 0 ? ($totbesteed/$budgetten->totaal) *100: 0;
$budgetten->totbedragbudgetkaal = $bedrag;
$budgetten->totbedragbudgetpct = number_format($bedrag, 2, ',', '.');
$budgetten->totbedragpct = $totbesteed > 0 ? '100,00': 0;
$bedrag2 = $budgetten->totaal > 0 ?($totgebudgeteerd/$budgetten->totaal)*100 : 0;
$budgetten->totbudgetpct = number_format($bedrag2, 2, ',', '.');
$budgetten->basisbedragpct = number_format($sombedragpct, 1,',', '.');
$budgetten->extrabudgetpct = number_format($sombudgetpctex, 1,',', '.');
$budgetten->extrabedragpct = number_format($sombedragpctex, 1,',', '.');
$budgetten->totbedragpct = number_format(($sombedragpctex + $sombedragpct)/2, 1, ',', '.' );
$budgetten->totbudgetpct = number_format(($sombudgetpct + $sombudgetpctex)/2, 1, ',', '.');
//
// todo
// zorg dat alle getallen geformateerd zijn met een duizendtalscheidingsteken
@@ -215,14 +221,17 @@ class Monfin2overzicht extends MY_Controller{
$budgetten->basis = number_format($budgetten->basis , 0 , ',' , '.');
$budgetten->extra = number_format($budgetten->extra, 0 , ',' , '.');
foreach($sombasisperuitgavetype as $sompertype){
foreach($sombasisperuitgavetype as $index => $sompertype){
$sompertype->som = number_format($sompertype->som,0, ',' , '.' );
$sompertype->budgetsom = number_format($sompertype->budgetsom,0, ',' , '.' );
if($index == 0) $sompertype->budgetrestant = number_format($sompertype->budgetrestant,0, ',' , '.' );
}
foreach($somextraperuitgavetype as $sompertype){
$sompertype->som = number_format($sompertype->som,0, ',' , '.' );
$sompertype->budgetsom = number_format($sompertype->budgetsom,0, ',' , '.' );
if($index == 0) $sompertype->budgetrestant = number_format($sompertype->budgetrestant,0, ',' , '.' );
}
foreach($totsomperuitgavetype as $sompertype){
@@ -406,13 +415,12 @@ class Monfin2overzicht extends MY_Controller{
$somasarray[$index ]->budgetsom = round($sombasis[$uitgavetype->code]->budgetsom,0);
if($index != 0) {
$regelsom += $somasarray[$index]->som;
$regelsom2 += $somasarray[$index ]->budgetsom;
}
$index += 1;
};
$somasarray[0]->som = $regelsom;
$somasarray[0]->budgetrestant = $somasarray[0]->budgetsom - $regelsom2;
$somasarray[0]->budgetrestant = $somasarray[0]->budgetsom - $regelsom;
return $somasarray;
}
@@ -426,14 +434,18 @@ class Monfin2overzicht extends MY_Controller{
$subtot->extra =0;
$subtot->som =0;
$subtot->budget =0;
$subtot->gebudget = 0;
$subtot->verschil =0;
$subtot->verschilGeb =0;
$grandtot = new stdClass;
$grandtot->basis =0;
$grandtot->extra =0;
$grandtot->som =0;
$grandtot->budget =0;
$grandtot->gebudget =0;
$grandtot->verschil =0;
$grandtot->verschilGeb =0;
$targetorg = $this->Organisaties_model->get_record_by_id($targetorgid);
$targetorg->bestemmingen = $this->get_bestuur_bestemmingen($targetorgid, $kalenderjaarnr);
@@ -457,19 +469,28 @@ class Monfin2overzicht extends MY_Controller{
$others[$index]->naam = $organisatie->brin.'-'.$organisatie->naamkort;
$others[$index]->id = $organisatie->id;
$others[$index]->budget = $this->get_budgetten_inclusief($orgids, $kalenderjaarnr);
$others[$index]->gebudget = $this->Finbestemmingen_model->get_gebudgeteerd_totbedrag_over_orgs($orgids, $kalenderjaarnr);
$others[$index]->gebudgetForm = number_format($others[$index]->gebudget,0 , ',' , '.');
$others[$index]->bestemmingen = $this->get_bestemmingen_inclusief($orgids, $kalenderjaarnr);
$others[$index]->verschil = $others[$index]->budget->totaal - $others[$index]->bestemmingen->som;
$others[$index]->verschilGeb = $others[$index]->gebudget - $others[$index]->bestemmingen->som;
$others[$index]->formVerschil = number_format($others[$index]->verschil, 0 ,',' , '.' );
$others[$index]->verschilGebForm = number_format($others[$index]->verschilGeb,0 , ',' , '.');
$subtot->basis += $others[$index]->bestemmingen->basis;
$subtot->extra += $others[$index]->bestemmingen->extra;
$subtot->som += $others[$index]->bestemmingen->som;
$subtot->budget += $others[$index]->budget->totaal;
$subtot->gebudget += $others[$index]->gebudget;
$subtot->verschil += $others[$index]->verschil;
$subtot->verschilGeb += $others[$index]->verschilGeb;
$grandtot->basis += $others[$index]->bestemmingen->basis;
$grandtot->extra += $others[$index]->bestemmingen->extra;
$grandtot->som += $others[$index]->bestemmingen->som;
$grandtot->budget += $others[$index]->budget->totaal;
$grandtot->gebudget += $others[$index]->gebudget;
$grandtot->verschil += $others[$index]->verschil;
$grandtot->verschilGeb += $others[$index]->verschilGeb;
$index += 1;
}
}
@@ -482,13 +503,17 @@ class Monfin2overzicht extends MY_Controller{
$subtot->extra = number_format($subtot->extra,0 , ',' , '.');
$subtot->som = number_format($subtot->som,0 , ',' , '.');
$subtot->budget = number_format($subtot->budget,0 , ',' , '.');
$subtot->gebudget = number_format($subtot->gebudget,0 , ',' , '.');
$subtot->verschil = number_format($subtot->verschil,0 , ',' , '.');
$subtot->verschilGeb = number_format($subtot->verschilGeb,0 , ',' , '.');
$grandtot->basis = number_format($grandtot->basis,0 , ',' , '.');
$grandtot->extra = number_format($grandtot->extra,0 , ',' , '.');
$grandtot->som = number_format($grandtot->som,0 , ',' , '.');
$grandtot->budget = number_format($grandtot->budget,0 , ',' , '.');
$grandtot->gebudget = number_format($grandtot->gebudget,0 , ',' , '.');
$grandtot->verschil = number_format($grandtot->verschil,0 , ',' , '.');
$grandtot->verschilGeb = number_format($grandtot->verschilGeb,0 , ',' , '.');
// $result = $this->get_orgs_bestemmingen($orgids, $kalenderjaarnr);
echo json_encode(['targetorg' =>$targetorg,
@@ -522,6 +547,9 @@ class Monfin2overzicht extends MY_Controller{
return $budgetten;
}
private function getorgids($orgid){
$organisaties = array();
$level2 = array();
application/core/MY_Controller.php
+5 -1
View File
@@ -93,7 +93,11 @@ class MY_Controller extends CI_Controller{
// public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen
// public $version = '1.20.17';// verversen bestemmingen ging niet goed
// public $version = '1.20.21';// tussenstand vormgeving ijkpunten
public $version = '1.20.22';// tussenstand vormgeving ijkpunten
// public $version = '1.20.23';// bugetsom gebudgeteerde bedragen in plaats van budget in totaal
// public $version = '1.20.24';// foutje in afvangen te vroeg aanroepen jaarbudget in callback
public $version = '1.20.25';//gebudgetterde bedragen ipv toegekende budgtten in overzicht monfin, analoog aan bestemmingen
public $partituurid;
application/models/monfin2/Finbestemmingen_model.php
+15
View File
@@ -233,6 +233,21 @@ class Finbestemmingen_model extends MY_Model{
return $row;
}
function get_gebudgeteerd_totbedrag_over_orgs($orglist, $jaarnr){
$this->sql = " SELECT FORMAT(sum(B.budget) / 100,2) as budget
FROM finbestemmingen B
WHERE B.organisatie_id in ({$orglist})
AND B.kalenderjaar = {$jaarnr }
AND B.uitgavetype = 'TOTAAL' ";
$row= $this->get_query_row();
if ($row) $row->budget = str_replace(',' , '' , $row->budget);
return $row->budget;
}
function getTotaalSchoolBestedingen($orgid, $jaarnr){
$this->sql = "SELECT SUM(bedrag) AS totaal
FROM finbestemmingen
application/models/monpas/Toewijzingen_model.php
+2 -1
View File
@@ -32,7 +32,8 @@ class Toewijzingen_model extends MY_Model{
$this->sql = " SELECT id,
round(sum(basis) /100) as basis,
round(sum(extra) /100 ) as extra,
round(sum(basis + extra) /100) as totaal
round(sum(basis + extra) /100) as totaal,
kalenderjaarnr
FROM tb_toewijzingen
WHERE orgid in ({$orgids})
AND kalenderjaarnr = {$jaarnr}
application/views/monpas/pages/monfin/overzicht.php
+4 -4
View File
@@ -133,7 +133,7 @@
<th style="text-align: right">Overig</th>
<th style="text-align: right">Totaal bestemd</th>
<th style="text-align: right">Totaal budget</th>
<th style="text-align: right">Verschil</th>
<th style="text-align: right">is het deze?</th>
</tr>
</thead>
<tbody data-bind="foreach: borganisaties">
@@ -144,7 +144,7 @@
<td style="text-align: right" data-bind="text: besom, visible: !$parent.basisextra() "></td>
<td style="text-align: right" data-bind="text: overig"></td>
<td style="text-align: right" data-bind="text: totaal"></td>
<td style="text-align: right" data-bind="text: totaalbudget"></td>
<td style="text-align: right" data-bind="text: schooltotaal().gebudget"></td>
<td style="text-align: right" data-bind="text: verschil"></td>
</tr>
</tbody>
@@ -156,7 +156,7 @@
<td style="text-align: right" data-bind="text: besom, visible: !$parent.basisextra() "></td>
<td style="text-align: right" data-bind="text: overig"></td>
<td style="text-align: right" data-bind="text: totaal"></td>
<td style="text-align: right" data-bind="text: totaalbudget"></td>
<td style="text-align: right" data-bind="text: schooltotaal().gebudget"></td>
<td style="text-align: right" data-bind="text: verschil"></td>
</tr>
</tbody>
@@ -180,7 +180,7 @@
<td style="text-align: right" data-bind="text: besom, visible: !$parent.basisextra() "></td>
<td style="text-align: right" data-bind="text: overig"></td>
<td style="text-align: right" data-bind="text: totaal"></td>
<td style="text-align: right" data-bind="text: totaalbudget"></td>
<td style="text-align: right" data-bind="text: schooltotaal().gebudget"></td>
<td style="text-align: right" data-bind="text: verschil"></td>
</tr>
</tbody>
application/views/monpas/pages/monfin2/overorgs.php
+11 -11
View File
@@ -15,8 +15,8 @@
<td style="text-align:right" data-bind="text: (typeof bestemmingen != 'undefined' ) ? bestemmingen.formBasis : '' "></td>
<td style="text-align:right" data-bind="text: (typeof bestemmingen != 'undefined' ) ? bestemmingen.formExtra : '' "></td>
<td style="text-align:right;border-left:1px solid #777777;" data-bind="text: (typeof bestemmingen != 'undefined' ) ? bestemmingen.formSom : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof budget != 'undefined' ) ? budget.formTotaal : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof formVerschil != 'undefined' ) ? formVerschil : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof budget != 'undefined' ) ? gebudgetForm : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof formVerschil != 'undefined' ) ? verschilGebForm : '' "></td>
</tr>
</tbody>
<tr style="background-color: #e7e2e5 ; font-style:italic" data-bind="with: subTot">
@@ -25,8 +25,8 @@
<td style="text-align:right; " data-bind="text: basis"></td>
<td style="text-align:right; " data-bind="text: extra"></td>
<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: som"></td>
<td style="text-align:right; " data-bind="text: budget"></td>
<td style="text-align:right; " data-bind="text: verschil"></td>
<td style="text-align:right; " data-bind="text: gebudget"></td>
<td style="text-align:right; " data-bind="text: verschilGeb"></td>
<!-- <td style="text-align:right; " data-bind="text: $root.selectedOrg().soort"></td>-->
</tr>
@@ -35,7 +35,7 @@
<td style="text-align:right; " data-bind="text: soort == 3 ?bestemmingen.formBasis : '' "></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? bestemmingen.formExtra: '' "></td>
<td style="border-left:1px solid #777777;text-align:right;" data-bind="text: soort == 3 ? bestemmingen.formSom: '' "></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? budgetten.totaal: ''"></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? $root.grandTot().gebudget: ''"></td>
<td style="text-align:right; " data-bind="text: soort == 3 ? budgetten.verschil: ''"></td>
</tr>
@@ -44,13 +44,13 @@
<!-- ko if: targetOrg().soort -->
<!-- ko if: targetOrg().soort == 3 -->
<tr style="background-color: #ded0d7; font-weight: 600" data-bind="with: grandTot">
<tr style="background-color: #ded0d7; font-weight: 600" >
<td >Totaal</td>
<td style="text-align:right; " data-bind="text: basis"></td>
<td style="text-align:right;" data-bind="text: extra"></td>
<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: som"></td>
<td style="text-align:right;" data-bind="text: budget"></td>
<td style="text-align:right; " data-bind="text: verschil"></td>
<td style="text-align:right; " data-bind="text: grandTot() ? grandTot().basis: '' "></td>
<td style="text-align:right;" data-bind="text: grandTot() ? grandTot().extra: ''"></td>
<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: grandTot() ? grandTot().som : '' "></td>
<td style="text-align:right;" data-bind="text: grandTot() ? grandTot().gebudget : '' "></td>
<td style="text-align:right; " data-bind="text: grandTot() ? grandTot().verschilGeb: ''"></td>
</tr>
<!-- /ko -->
application/views/monpas/pages/monfin2/overzicht.php
+20 -16
View File
@@ -124,6 +124,11 @@
<!-- ko if: $index() ==0 -->
<td style="text-align:right" data-bind="text: budgetsom"></td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.budgetten(),
click: $root.fOpenDetails.bind($data, 'BASIS') "
></i></td>
<td style="text-align:right" data-bind="text: budgetrestant" ></td>
<!-- /ko -->
<!-- /ko -->
@@ -133,15 +138,14 @@
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<td style="text-align:right" >0,00</td>
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<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().basisverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' } ">
</td>
<!-- <td style="text-align:right"-->
<!-- data-bind="text : sombasisperuitgavetype() ? sombasisperuitgavetype()[0].budgetrestant: '0,00',-->
<!-- ">-->
<!-- </td>-->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00',
@@ -332,7 +336,7 @@
<td style="text-align:right" data-bind="text: som"></td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.schooltotaal().budget">
<td style="text-align:right" data-bind="text: $root.schooltotaal().gebudget">
</td>
<!-- /ko -->
<!-- ko if: ! totsomperuitgavetype() -->
@@ -342,13 +346,13 @@
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
data-bind="visible: $root.budgetten().totaal > 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' }">
data-bind="text: $root.budgetten() && $root.budgetten().totaalverschil ? $root.budgetten().totaalverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().totaalverschil) < 0 ? 'red' : 'black' }">
</td>
<!-- <td style="text-align:right"-->
<!-- data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,-->
@@ -362,7 +366,7 @@
<!-- >-->
<!-- </td>-->
<td style="padding: 3px; text-align: right" >100</td>
<td style="padding: 3px; text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbedragpct : '0,0' "></td>
<td style="padding: 3px; text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbudgetpct : '0,0' "></td>
</tr>
@@ -725,7 +729,7 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.schooltotaal().gebudget : '0,00'">
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten(0.basis : '0,00'">
</td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
@@ -733,8 +737,8 @@
</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' }">
data-bind="text: $root.budgetten() && $root.budgetten().totaalverschil ? $root.budgetten().totaalverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().totaalverschil) < 0 ? 'red' : 'black' }">
</td>
<td style="text-align:right"
data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,