diff --git a/application/controllers/monfin2/Monfin2overzicht.php b/application/controllers/monfin2/Monfin2overzicht.php index 0dab3fa..4900945 100644 --- a/application/controllers/monfin2/Monfin2overzicht.php +++ b/application/controllers/monfin2/Monfin2overzicht.php @@ -174,7 +174,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']; @@ -215,14 +215,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){ @@ -399,21 +402,19 @@ class Monfin2overzicht extends MY_Controller{ $regelsom2 = 0; $regelsom3 = 0; foreach($uitgavetypes as $uitgavetype){ - $somasarray[$index] = new stdClass; + $somasarray[$index ] = new stdClass; $somasarray[$index]->code = $uitgavetype->code; $somasarray[$index]->naam = $sombasis[$uitgavetype->code]->naam; $somasarray[$index ]->som = round($sombasis[$uitgavetype->code]->som,0); $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]->budgetsom = $regelsom2; - $somasarray[0]->budgetrestant = $regelsom - $regelsom2; + $somasarray[0]->budgetrestant = $somasarray[0]->budgetsom - $regelsom; return $somasarray; } diff --git a/application/views/monpas/pages/monfin2/overzicht.php b/application/views/monpas/pages/monfin2/overzicht.php index 857aa4e..03c7200 100644 --- a/application/views/monpas/pages/monfin2/overzicht.php +++ b/application/views/monpas/pages/monfin2/overzicht.php @@ -124,6 +124,11 @@