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

verschil

Browse Source
This commit is contained in:
Monique
2024-03-03 21:00:47 +01:00
parent c3aa042801
commit 411f0374a8
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monfin2/Monfin2overzicht.php
+7 -6
View File
@@ -174,7 +174,7 @@ class Monfin2overzicht extends MY_Controller{
$sommen = $this->get_som_per_regel($basis, $budgetten->basis, $sombasisperuitgavetype[0]); $sommen = $this->get_som_per_regel($basis, $budgetten->basis, $sombasisperuitgavetype[0]);
$basis = $sommen['soorten']; $basis = $sommen['soorten'];
// $somgebudgetpct = $sommen['somgebudgetpct'];
$sombudgetpct = $sommen['sombudgetpct']; $sombudgetpct = $sommen['sombudgetpct'];
$sombedragpct = $sommen['sombedragpct']; $sombedragpct = $sommen['sombedragpct'];
// $sombedragbudgetpct = $sommen['sombedragbudgetpct']; // $sombedragbudgetpct = $sommen['sombedragbudgetpct'];
@@ -215,14 +215,17 @@ class Monfin2overzicht extends MY_Controller{
$budgetten->basis = number_format($budgetten->basis , 0 , ',' , '.'); $budgetten->basis = number_format($budgetten->basis , 0 , ',' , '.');
$budgetten->extra = number_format($budgetten->extra, 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->som = number_format($sompertype->som,0, ',' , '.' );
$sompertype->budgetsom = number_format($sompertype->budgetsom,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 $sompertype){
$sompertype->som = number_format($sompertype->som,0, ',' , '.' ); $sompertype->som = number_format($sompertype->som,0, ',' , '.' );
$sompertype->budgetsom = number_format($sompertype->budgetsom,0, ',' , '.' ); $sompertype->budgetsom = number_format($sompertype->budgetsom,0, ',' , '.' );
if($index == 0) $sompertype->budgetrestant = number_format($sompertype->budgetrestant,0, ',' , '.' );
} }
foreach($totsomperuitgavetype as $sompertype){ foreach($totsomperuitgavetype as $sompertype){
@@ -399,21 +402,19 @@ class Monfin2overzicht extends MY_Controller{
$regelsom2 = 0; $regelsom2 = 0;
$regelsom3 = 0; $regelsom3 = 0;
foreach($uitgavetypes as $uitgavetype){ foreach($uitgavetypes as $uitgavetype){
$somasarray[$index] = new stdClass; $somasarray[$index ] = new stdClass;
$somasarray[$index]->code = $uitgavetype->code; $somasarray[$index]->code = $uitgavetype->code;
$somasarray[$index]->naam = $sombasis[$uitgavetype->code]->naam; $somasarray[$index]->naam = $sombasis[$uitgavetype->code]->naam;
$somasarray[$index ]->som = round($sombasis[$uitgavetype->code]->som,0); $somasarray[$index ]->som = round($sombasis[$uitgavetype->code]->som,0);
$somasarray[$index ]->budgetsom = round($sombasis[$uitgavetype->code]->budgetsom,0); $somasarray[$index ]->budgetsom = round($sombasis[$uitgavetype->code]->budgetsom,0);
if($index != 0) { if($index != 0) {
$regelsom += $somasarray[$index]->som; $regelsom += $somasarray[$index]->som;
$regelsom2 += $somasarray[$index]->budgetsom;
} }
$index += 1; $index += 1;
}; };
$somasarray[0]->som = $regelsom; $somasarray[0]->som = $regelsom;
$somasarray[0]->budgetsom = $regelsom2; $somasarray[0]->budgetrestant = $somasarray[0]->budgetsom - $regelsom;
$somasarray[0]->budgetrestant = $regelsom - $regelsom2;
return $somasarray; return $somasarray;
} }
application/views/monpas/pages/monfin2/overzicht.php
+10 -8
View File
@@ -124,6 +124,11 @@
<!-- ko if: $index() ==0 --> <!-- ko if: $index() ==0 -->
<td style="text-align:right" data-bind="text: budgetsom"></td> <td style="text-align:right" data-bind="text: budgetsom"></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: budgetrestant" ></td>
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
@@ -134,14 +139,11 @@
<!-- /ko --> <!-- /ko -->
<td style="text-align:right" >0,00</td> <td style="text-align:right" >0,00</td>
<!-- /ko --> <!-- /ko -->
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0, <!-- <td style="text-align:right"-->
click: $root.fOpenDetails.bind($data, 'BASIS') " <!-- data-bind="text : sombasisperuitgavetype() ? sombasisperuitgavetype()[0].budgetrestant: '0,00',-->
></i></td> <!-- ">-->
<td style="text-align:right" <!-- </td>-->
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', <td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00',