diff --git a/application/controllers/monfin2/Monfin2overzicht.php b/application/controllers/monfin2/Monfin2overzicht.php index 4900945..8f049eb 100644 --- a/application/controllers/monfin2/Monfin2overzicht.php +++ b/application/controllers/monfin2/Monfin2overzicht.php @@ -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, ',' , '.' ); @@ -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 diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 8005406..0ecd1aa 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -94,7 +94,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.17';// verversen bestemmingen ging niet goed // public $version = '1.20.21';// 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.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 diff --git a/application/views/monpas/pages/monfin2/overzicht.php b/application/views/monpas/pages/monfin2/overzicht.php index 03c7200..960ec30 100644 --- a/application/views/monpas/pages/monfin2/overzicht.php +++ b/application/views/monpas/pages/monfin2/overzicht.php @@ -93,7 +93,7 @@