Merge branch 'master' into develop
This commit is contained in:
@@ -17,26 +17,33 @@ class Monfin2overzicht extends MY_Controller{
|
||||
die;
|
||||
};// if
|
||||
}
|
||||
function getschoolbedragen(){
|
||||
$orgid = $this->clean_input("orgid");
|
||||
$kalenderjaarnr = $this->clean_input("jaarnr");
|
||||
$uitgavetypes = $this->Finuitgavetypes_model->get_uitgavetypes();
|
||||
$budgetten = $this->Toewijzingen_model->gettoewijzingperjaar($orgid, $kalenderjaarnr);
|
||||
function getschoolbedragen()
|
||||
{
|
||||
$orgid = $this->clean_input("orgid");
|
||||
$kalenderjaarnr = $this->clean_input("jaarnr");
|
||||
$soortoverzicht = $this->clean_input('zelfjanee');
|
||||
|
||||
if ($budgetten) {
|
||||
$budgetten->totaal = ROUND(($budgetten->basis + $budgetten->extra) / 100);
|
||||
$budgetten->basis = ROUND($budgetten->basis / 100);
|
||||
$budgetten->extra = Round($budgetten->extra / 100);
|
||||
}
|
||||
else{
|
||||
$budgetten = new stdClass();
|
||||
$budgetten->totaal = 0;
|
||||
$budgetten->basis = 0;
|
||||
$budgetten->extra = 0;
|
||||
}
|
||||
$basis = $this->Finbestemmingen_model->get_bestemmingen($orgid, $kalenderjaarnr,"BASIS");
|
||||
$extra = $this->Finbestemmingen_model->get_bestemmingen($orgid, $kalenderjaarnr,"EXTRA");
|
||||
$suborgs = $this->Organisaties_model->getlistrecursief( $orgid, []);
|
||||
array_splice($suborgs, 0,1);
|
||||
$suborgslist= implode(',', $suborgs);
|
||||
|
||||
$uitgavetypes = $this->Finuitgavetypes_model->get_uitgavetypes();
|
||||
|
||||
|
||||
$budgetten = new stdClass();
|
||||
$budgetten->totaal = 0;
|
||||
$budgetten->basis = 0;
|
||||
$budgetten->extra = 0;
|
||||
|
||||
|
||||
if ($soortoverzicht == 3){
|
||||
$basis = $this->Finbestemmingen_model->get_bestemmingen_over_orgs($orgid, $suborgslist, $kalenderjaarnr,"BASIS");
|
||||
$extra = $this->Finbestemmingen_model->get_bestemmingen_over_orgs($orgid, $suborgslist, $kalenderjaarnr,"EXTRA");
|
||||
|
||||
} else {
|
||||
$basis = $this->Finbestemmingen_model->get_bestemmingen($orgid, $kalenderjaarnr, "BASIS");
|
||||
$extra = $this->Finbestemmingen_model->get_bestemmingen($orgid, $kalenderjaarnr, "EXTRA");
|
||||
}
|
||||
$sombasisperuitgavetype = $this->get_som_per_uitgavetype($basis, $uitgavetypes);
|
||||
$somextraperuitgavetype = $this->get_som_per_uitgavetype($extra, $uitgavetypes);
|
||||
$totsomperuitgavetype = $this->sommeer_per_uitgavetype($sombasisperuitgavetype,$somextraperuitgavetype, $uitgavetypes);
|
||||
@@ -52,27 +59,10 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$extra = $sommenex['soorten'];
|
||||
$sombudgetpctex = $sommenex['sombudgetpct'];
|
||||
$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->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->basis = number_format( $sombasisperuitgavetype[0]->budgetsom, 0, ',' , '.' );
|
||||
$budgetten->extra = number_format( $somextraperuitgavetype[0]->budgetsom, 0, ',' , '.' );
|
||||
$budgetten->totaal = number_format( $sombasisperuitgavetype[0]->budgetsom + $somextraperuitgavetype[0]->budgetsom, 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, ',' , '.' );
|
||||
@@ -83,22 +73,18 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$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 , ',' , '.');
|
||||
|
||||
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){
|
||||
foreach($somextraperuitgavetype 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, ',' , '.' );
|
||||
|
||||
|
||||
}
|
||||
@@ -108,20 +94,15 @@ class Monfin2overzicht extends MY_Controller{
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$schooltot = array( 'budget' => $budgetten->totaal ,
|
||||
"bestemd" => number_format($totbesteed, 0, ',' , '.' ),
|
||||
"gebudget" => number_format($totgebudgeteerd, 0, ',' , '.' ),
|
||||
"verschil" => number_format($budgetten->totaalverschil, 0, ',' , '.' ));
|
||||
|
||||
"verschil" => number_format($budgetten->totaalverschil, 0, ',' , '.' ));
|
||||
if ($soortoverzicht == 3){
|
||||
$opmerking = '';
|
||||
} else {
|
||||
$opmerking = $this->Bestedingopmerkingen_model->getopmerking($orgid, $kalenderjaarnr);
|
||||
// }; // if budgetten
|
||||
}
|
||||
//}; // if budgetten
|
||||
if (! isset($sombasisperuitgavetype)) $sombasisperuitgavetype = 0;
|
||||
if (! isset($somextraperuitgavetype)) $somextraperuitgavetype = 0;
|
||||
if (! isset($totsomperuitgavetype)) $totsomperuitgavetype = 0;
|
||||
@@ -138,134 +119,6 @@ class Monfin2overzicht extends MY_Controller{
|
||||
'opmerking' => $opmerking));
|
||||
}
|
||||
|
||||
function getschoolbedragenNieuw(){
|
||||
$orgid = $this->clean_input("orgid");
|
||||
$kalenderjaarnr = $this->clean_input("jaarnr");
|
||||
$soortoverzicht = $this->clean_input('zelfjanee');
|
||||
|
||||
$suborgs = $this->Organisaties_model->getlistrecursief( $orgid, []);
|
||||
array_splice($suborgs, 0,1);
|
||||
$suborgslist= implode(',', $suborgs);
|
||||
|
||||
$uitgavetypes = $this->Finuitgavetypes_model->get_uitgavetypes();
|
||||
if ($soortoverzicht == 3){
|
||||
$budgetten = $this->Toewijzingen_model->gettoewijzingenperjaaroverorgs($suborgslist, $kalenderjaarnr);
|
||||
} else {
|
||||
$budgetten = $this->Toewijzingen_model->gettoewijzingperjaar($orgid, $kalenderjaarnr);
|
||||
}
|
||||
|
||||
$basis = array();
|
||||
$extra = array();
|
||||
|
||||
$schooltot = 0;
|
||||
$opmerking = '';
|
||||
|
||||
if ($budgetten) {
|
||||
if ($soortoverzicht == 3) {
|
||||
$budgetten->totaal = ROUND(($budgetten->basis + $budgetten->extra));
|
||||
$budgetten->basis = ROUND($budgetten->basis);
|
||||
$budgetten->extra = ROUND($budgetten->extra);
|
||||
} else {
|
||||
$budgetten->totaal = ROUND(($budgetten->basis + $budgetten->extra) / 100);
|
||||
$budgetten->basis = ROUND($budgetten->basis / 100);
|
||||
$budgetten->extra = ROUND($budgetten->extra / 100);
|
||||
}
|
||||
|
||||
if ($soortoverzicht == 3){
|
||||
$basis = $this->Finbestemmingen_model->get_bestemmingen_over_orgs($orgid, $suborgslist, $kalenderjaarnr,"BASIS");
|
||||
$extra = $this->Finbestemmingen_model->get_bestemmingen_over_orgs($orgid, $suborgslist, $kalenderjaarnr,"EXTRA");
|
||||
|
||||
} else {
|
||||
$basis = $this->Finbestemmingen_model->get_bestemmingen($orgid, $kalenderjaarnr,"BASIS");
|
||||
$extra = $this->Finbestemmingen_model->get_bestemmingen($orgid, $kalenderjaarnr,"EXTRA");
|
||||
}
|
||||
$sombasisperuitgavetype = $this->get_som_per_uitgavetype($basis, $uitgavetypes);
|
||||
$somextraperuitgavetype = $this->get_som_per_uitgavetype($extra, $uitgavetypes);
|
||||
$totsomperuitgavetype = $this->sommeer_per_uitgavetype($sombasisperuitgavetype,$somextraperuitgavetype, $uitgavetypes);
|
||||
$totbesteed = $this->sommeeralles($totsomperuitgavetype, 'BEDRAG');
|
||||
$totgebudgeteerd = $this->sommeeralles($totsomperuitgavetype, 'BUDGET');
|
||||
$sommen = $this->get_som_per_regel($basis, $budgetten->basis, $sombasisperuitgavetype[0]);
|
||||
|
||||
$basis = $sommen['soorten'];
|
||||
|
||||
$sombudgetpct = $sommen['sombudgetpct'];
|
||||
$sombedragpct = $sommen['sombedragpct'];
|
||||
// $sombedragbudgetpct = $sommen['sombedragbudgetpct'];
|
||||
|
||||
$sommenex = $this->get_som_per_regel($extra, $budgetten->extra, $somextraperuitgavetype[0] );
|
||||
$extra = $sommenex['soorten'];
|
||||
// $somgebudgetpctex = $sommenex['somgebudgetpct'];
|
||||
$sombudgetpctex = $sommenex['sombudgetpct'];
|
||||
$sombedragpctex = $sommenex['sombedragpct'];
|
||||
// $sombedragbudgetpctex = $sommen['sombedragbudgetpct'];
|
||||
// todo
|
||||
// bereken budget - besteding verschil per basis/extra/overig
|
||||
$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 , ',' , '.');
|
||||
|
||||
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){
|
||||
$sompertype->som = number_format($sompertype->som,0, ',' , '.' );
|
||||
$sompertype->budgetsom = number_format($sompertype->budgetsom,0, ',' , '.' );
|
||||
|
||||
}
|
||||
|
||||
$schooltot = array( 'budget' => $budgetten->totaal ,
|
||||
"bestemd" => number_format($totbesteed, 0, ',' , '.' ),
|
||||
"gebudget" => number_format($totgebudgeteerd, 0, ',' , '.' ),
|
||||
"verschil" => number_format($budgetten->totaalverschil, 0, ',' , '.' ));
|
||||
|
||||
if ($soortoverzicht == 3){
|
||||
$opmerking = '';
|
||||
} else {
|
||||
$opmerking = $this->Bestedingopmerkingen_model->getopmerking($orgid, $kalenderjaarnr);
|
||||
}
|
||||
}; // if budgetten
|
||||
if (! isset($sombasisperuitgavetype)) $sombasisperuitgavetype = false;
|
||||
if (! isset($somextraperuitgavetype)) $somextraperuitgavetype = false;
|
||||
if (! isset($totsomperuitgavetype)) $totsomperuitgavetype = false;
|
||||
if (! isset($schooltot)) $schooltot = 0;
|
||||
|
||||
echo json_encode(array('uitgavetypes' =>$uitgavetypes,
|
||||
'basis' =>$basis,
|
||||
'extra' =>$extra,
|
||||
'sombasisperuitgavetype' =>$sombasisperuitgavetype,
|
||||
'somextraperuitgavetype' =>$somextraperuitgavetype,
|
||||
'totsomperuitgavetype' =>$totsomperuitgavetype,
|
||||
'schooltotaal' => $schooltot,
|
||||
'budgetten' => $budgetten,
|
||||
'opmerking' => $opmerking));
|
||||
}
|
||||
function sommeeralles($totsomperuitgavetype, $soort)
|
||||
{
|
||||
|
||||
@@ -306,7 +159,6 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$bedragpctformat = number_format($bedragpct, 1, ',', '.');
|
||||
}
|
||||
|
||||
|
||||
$totbudget = empty($subsoort->uitgavetypes[0]->budget) ? 0 : floatval($subsoort->uitgavetypes[0]->budget);
|
||||
$persbudget = empty($subsoort->uitgavetypes[1]->budget) ? 0 : floatval($subsoort->uitgavetypes[1]->budget);
|
||||
$matbudget = empty($subsoort->uitgavetypes[2]->budget) ? 0 : floatval($subsoort->uitgavetypes[2]->budget);
|
||||
@@ -353,7 +205,7 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$somtot[$index]->code = $uitgavetype->code;
|
||||
$somtot[$index]->naam = $uitgavetype->naam;
|
||||
$somtot[$index]->som =0;
|
||||
$somtot[$index]->budgetsom =0;
|
||||
$somtot[$index]->budgetsom = 0;
|
||||
foreach($sombasis as $basis){
|
||||
if ($basis->code == $somtot[$index]->code) {
|
||||
$somtot[$index]->som += $basis->som;
|
||||
@@ -406,7 +258,7 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$index = 0;
|
||||
$regelsom=0;
|
||||
$regelsom2 = 0;
|
||||
$regelsom3 = 0;
|
||||
|
||||
foreach($uitgavetypes as $uitgavetype){
|
||||
$somasarray[$index ] = new stdClass;
|
||||
$somasarray[$index]->code = $uitgavetype->code;
|
||||
@@ -416,11 +268,14 @@ class Monfin2overzicht extends MY_Controller{
|
||||
if($index != 0) {
|
||||
$regelsom += $somasarray[$index]->som;
|
||||
}
|
||||
if($index ==0){
|
||||
$regelsom2 += round($sombasis[$uitgavetype->code]->budgetsom,0);
|
||||
}
|
||||
$index += 1;
|
||||
};
|
||||
|
||||
$somasarray[0]->som = $regelsom;
|
||||
$somasarray[0]->budgetrestant = $somasarray[0]->budgetsom - $regelsom;
|
||||
$somasarray[0]->budgetsom = $regelsom2;
|
||||
$somasarray[0]->budgetrestant = $regelsom2 - $regelsom;
|
||||
|
||||
return $somasarray;
|
||||
}
|
||||
@@ -449,13 +304,18 @@ class Monfin2overzicht extends MY_Controller{
|
||||
|
||||
$targetorg = $this->Organisaties_model->get_record_by_id($targetorgid);
|
||||
$targetorg->bestemmingen = $this->get_bestuur_bestemmingen($targetorgid, $kalenderjaarnr);
|
||||
$targetorg->budgetten = $this->getbudgetten($targetorgid, $kalenderjaarnr,$targetorg->bestemmingen['som']);
|
||||
$targetorg->budgetten = $this->get_bestuur_gebudget($targetorgid, $kalenderjaarnr);
|
||||
$verschil = $targetorg->budgetten['som']-$targetorg->bestemmingen['som'];
|
||||
$targetorg->verschil = number_format($verschil,0 , ',' , '.');
|
||||
|
||||
$grandtot->basis = $targetorg->bestemmingen['basis'];
|
||||
$grandtot->extra = $targetorg->bestemmingen['extra'];
|
||||
$grandtot->som = $targetorg->bestemmingen['som'];
|
||||
$grandtot->budget = $targetorg->budgetten->totaal;
|
||||
$grandtot->verschil = $targetorg->budgetten->verschil;
|
||||
$grandtot->budgetbasis = $targetorg->budgetten['basis'];
|
||||
$grandtot->budgetextra = $targetorg->budgetten['extra'];
|
||||
$grandtot->budget = $targetorg->budgetten['som'];
|
||||
|
||||
$grandtot->verschil = $targetorg->budgetten['som'] - $targetorg->bestemmingen['som'];
|
||||
|
||||
//get de som van de uitgaven van de onderliggende organisaties
|
||||
$soort = $targetorg->soort +1;
|
||||
@@ -468,36 +328,27 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$others[$index] = new stdClass;
|
||||
$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 , ',' , '.');
|
||||
$gebudget = $this->Finbestemmingen_model->get_gebudgeteerd_totbedrag_over_orgs($orgids, $kalenderjaarnr);
|
||||
$others[$index]->budget = floatval($gebudget? $gebudget: 0);
|
||||
$others[$index]->budgetForm = number_format($others[$index]->budget,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]->verschil = $others[$index]->budget - $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->budget += $others[$index]->budget;
|
||||
$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->budget += $others[$index]->budget;
|
||||
$grandtot->verschil += $others[$index]->verschil;
|
||||
$grandtot->verschilGeb += $others[$index]->verschilGeb;
|
||||
$index += 1;
|
||||
}
|
||||
}
|
||||
$targetorg->budgetten->basis = number_format($targetorg->budgetten->basis, 0, ',' , '.');
|
||||
$targetorg->budgetten->extra = number_format($targetorg->budgetten->extra, 0, ',' , '.');
|
||||
$targetorg->budgetten->totaal = number_format($targetorg->budgetten->totaal, 0, ',' , '.');
|
||||
$targetorg->budgetten->verschil = number_format($targetorg->budgetten->verschil,0, ',' , '.');
|
||||
|
||||
$subtot->basis = number_format($subtot->basis,0 , ',' , '.');
|
||||
$subtot->extra = number_format($subtot->extra,0 , ',' , '.');
|
||||
@@ -511,10 +362,9 @@ class Monfin2overzicht extends MY_Controller{
|
||||
$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,
|
||||
'others' =>$others,
|
||||
@@ -626,6 +476,51 @@ class Monfin2overzicht extends MY_Controller{
|
||||
return $orgbestedingen;
|
||||
}
|
||||
|
||||
|
||||
private function get_bestuur_gebudget($orgid, $kalenderjaarnr){
|
||||
|
||||
$orggebudget = array();
|
||||
$orggebudget['basis'] =0;
|
||||
$orggebudget['formBasis'] ='' ;
|
||||
$orggebudget['extra'] =0;
|
||||
$orggebudget['formExtra'] = '';
|
||||
$orggebudget['som'] =0;
|
||||
|
||||
|
||||
$gebudgetOrgZelf = $this->Finbestemmingen_model->getbudgetpersoortoverorgs($orgid, $kalenderjaarnr);
|
||||
$soort = $this->Organisaties_model->get_fieldvalue(['id' => $orgid], 'soort');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if ($gebudgetOrgZelf){
|
||||
foreach($gebudgetOrgZelf as $gebudget){
|
||||
switch ($gebudget->categorie){
|
||||
// 25 sept tijdelijk oplossing, uiteindelijk wijzigen in eigen budget en uitgaven en uitgaven voor onder orgs
|
||||
case "BASIS":
|
||||
// $orgbestedingen['basis'] = $besteding->bedrag;
|
||||
// $orgbestedingen['basis'] = $besteding->bedrag;
|
||||
$orggebudget['basis'] = intval($soort)== 3 ?$gebudget->budget: 0;
|
||||
// $orgbestedingen['formBasis'] = number_format($besteding->bedrag,0, ',' , '.' );
|
||||
$orggebudget['formBasis'] = intval($soort)== 3? number_format($gebudget->budget,0, ',' , '.' ): 0;
|
||||
break;
|
||||
case "EXTRA":
|
||||
// $orgbestedingen['extra'] = $besteding->bedrag;
|
||||
// $orgbestedingen['formExtra'] = number_format($besteding->bedrag,0, ',' , '.' );
|
||||
$orggebudget['extra'] = intval($soort)== 3 ?$gebudget->budget: 0;
|
||||
$orggebudget['formExtra'] = intval($soort)== 3? number_format($gebudget->budget,0, ',' , '.' ): 0;
|
||||
|
||||
|
||||
break;
|
||||
};// switch
|
||||
$orggebudget['som'] += $gebudget->budget;
|
||||
}; // foreach bestedingen
|
||||
} ; // if bestedingen
|
||||
$orggebudget['formSom']=number_format($orggebudget['som'] ,0, ',' , '.' );
|
||||
return $orggebudget;
|
||||
}
|
||||
|
||||
private function getbudgetten($orgid, $kalenderjaarnr, $som){
|
||||
$budgetten =$this->Toewijzingen_model->gettoewijzingperjaar($orgid, $kalenderjaarnr);
|
||||
if (!$budgetten){
|
||||
|
||||
Reference in New Issue
Block a user