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

tussenopslag

Browse Source
This commit is contained in:
Monique
2024-03-03 20:02:18 +01:00
parent 8b50a10e7b
commit c3aa042801
8 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monfin2/Monfin2overzicht.php
+22 -1
View File
@@ -412,7 +412,8 @@ class Monfin2overzicht extends MY_Controller{
};
$somasarray[0]->som = $regelsom;
$somasarray[0]->budgetrestant = $somasarray[0]->budgetsom - $regelsom2;
$somasarray[0]->budgetsom = $regelsom2;
$somasarray[0]->budgetrestant = $regelsom - $regelsom2;
return $somasarray;
}
@@ -426,14 +427,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 +462,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 +496,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 +540,9 @@ class Monfin2overzicht extends MY_Controller{
return $budgetten;
}
private function getorgids($orgid){
$organisaties = array();
$level2 = array();
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
+7 -7
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>
@@ -49,8 +49,8 @@
<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: schooltotaal() ? schooltotaal().gebudget: '' "></td>
<td style="text-align:right; " data-bind="text: grandTot() ? grandTot().verschil: ''"></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
+1 -1
View File
@@ -93,7 +93,7 @@
</th>
<th class="pdfmonfin" style="text-align:right; background-color: #968026; width: 2%">
</th>
<th class="pdfmonfin" style="writing-mode: vertical-rl; padding: 3px;font-size:0.9em; width: 9%; vertical-align:text-top; text-align:right; background-color: #968026;"><span >verschil</span>
<th class="pdfmonfin" style="writing-mode: vertical-rl; padding: 3px;font-size:0.9em; width: 9%; vertical-align:text-top; text-align:right; background-color: #968026;"><span >verschil>?</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'VERSCHIL')">
</i>
public/js/monpas/models/monfin2/bestemmingen.js
+1 -1
View File
@@ -241,7 +241,7 @@ ls.initBestemmingenModel = function(){
var self = ls.BestemmingenModel;
var budget = 0;
var bedrag = 0;
var totbudget = self.jaartoewijzing() ? self.jaartoewijzing().basis: 0;
var totbudget = self.jaartoewijzing() ? self.jaartoewijzing().basis: '0';
totbudget = totbudget.replace(/[.| ,]/g, '');
var totbasispct = '';
var gebudgetbasispct = '';
public/js/monpas/models/monfin2/monfinoverzicht2.js
+4 -8
View File
@@ -120,6 +120,7 @@ ls.initMonfinOverzicht2Model = function(){
var sd={orgid : self.selectedOrg().id,
jaarnr : self.selectedKalenderjaar().jaarnr}
$.post("index.php/monfin2/monfin2overzicht/getschoolbedragen", sd, function(result){
console.log(result, 'result janee = 1')
self.schooltotaal( result.schooltotaal) ;
self.uitgavetypes(result.uitgavetypes);
@@ -153,7 +154,7 @@ ls.initMonfinOverzicht2Model = function(){
var sd={orgid : self.selectedOrg().id,
jaarnr : self.selectedKalenderjaar().jaarnr}
$.post("index.php/monfin2/monfin2overzicht/getbestuursbedragen", sd, function(result){
console.log(result, 'result janee = 0')
self.otherOrgs.removeAll();
self.otherOrgs(result.others);
self.subTot(result.subtot);
@@ -161,13 +162,6 @@ ls.initMonfinOverzicht2Model = function(){
self.targetOrg(result.targetorg);
$.post("index.php/monfin2/monfin2overzicht/getschoolbedragenNieuw", sd, function(result){
self.schooltotaal( result.schooltotaal) ;
},'json');
},'json');
@@ -176,6 +170,7 @@ ls.initMonfinOverzicht2Model = function(){
jaarnr : self.selectedKalenderjaar().jaarnr,
zelfjanee : self.zelfjanee()}
$.post("index.php/monfin2/monfin2overzicht/getschoolbedragenNieuw", sd, function(result){
console.log(result, 'result janee = 3')
self.schooltotaal( result.schooltotaal) ;
self.uitgavetypes(result.uitgavetypes);
@@ -203,6 +198,7 @@ ls.initMonfinOverzicht2Model = function(){
var sd={orgid : self.selectedOrg().id,
jaarnr : self.selectedKalenderjaar().jaarnr}
$.post("index.php/monfin2/monfin2overzicht/getbestuurperuitgavetype", sd, function(result){
console.log(result, 'result janee = anders')
self.pmsTargetOrg(result.targetorg);
self.otherPMSOrgs(result.otherorgs);
self.sumotherPMS(result.sumother);