From 03e0043c77eb74a1fd7503541cb4678be3603fca Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Fri, 7 Mar 2025 16:22:03 +0100 Subject: [PATCH 1/2] afvangen als er geenjaar toewijzing is --- public/js/monpas/models/monfin2/bestemmingen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/monpas/models/monfin2/bestemmingen.js b/public/js/monpas/models/monfin2/bestemmingen.js index cdc2f61..035697b 100644 --- a/public/js/monpas/models/monfin2/bestemmingen.js +++ b/public/js/monpas/models/monfin2/bestemmingen.js @@ -311,7 +311,7 @@ ls.initBestemmingenModel = function(){ } ) }) - totbudget = self.jaartoewijzing().extra; + if(self.jaartoewijzing()) totbudget = self.jaartoewijzing().extra; totbudget = totbudget.replace(/[.| ,]/g, '') if(Number(totbudget > 0)) { From 89b98910336ee5918d564be8f432f440486eb57c Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Mon, 10 Mar 2025 13:57:21 +0100 Subject: [PATCH 2/2] geen rode tekst bij budgetoverschrijding --- .../controllers/monfin2/Monfin2overzicht.php | 2 +- .../views/monpas/pages/monfin2/overzicht.php | 132 +++++++++++------- .../views/monpas/pages/monfin2/pmsorgs.php | 120 +++++++++------- .../monpas/models/monfin2/monfinoverzicht2.js | 5 - 4 files changed, 155 insertions(+), 104 deletions(-) diff --git a/application/controllers/monfin2/Monfin2overzicht.php b/application/controllers/monfin2/Monfin2overzicht.php index 607d27a..28e4732 100644 --- a/application/controllers/monfin2/Monfin2overzicht.php +++ b/application/controllers/monfin2/Monfin2overzicht.php @@ -95,7 +95,7 @@ class Monfin2overzicht extends MY_Controller{ } - $schooltot = array( 'budget' => $budgetten->totaal, 0, + $schooltot = array( 'budget' => $budgetten->totaal, "bestemd" => number_format($totbesteed, 0, ',' , '.' ), "verschil" => $budgetten->totaalverschil ); if ($soortoverzicht == 3){ diff --git a/application/views/monpas/pages/monfin2/overzicht.php b/application/views/monpas/pages/monfin2/overzicht.php index 0f53bf6..f9ff901 100644 --- a/application/views/monpas/pages/monfin2/overzicht.php +++ b/application/views/monpas/pages/monfin2/overzicht.php @@ -158,21 +158,26 @@ - + + - + - + @@ -181,13 +186,16 @@ click: $root.fOpenDetails.bind($data, 'DETAIL')"> - + + "> + + @@ -270,9 +278,9 @@ + "> - + @@ -288,20 +296,24 @@ + - + - + + - + - + + @@ -349,8 +363,9 @@ + data-bind="text: $root.budgetten() && $root.budgetten().totaalverschil ? $root.budgetten().totaalverschil : '0,00' + "> + @@ -527,8 +542,9 @@ > + "> + - + + , + - + + - + - + - + - + + @@ -673,21 +692,27 @@ - + + - + + - + - + - + - + + @@ -735,11 +762,14 @@ + "> + + + " > + diff --git a/application/views/monpas/pages/monfin2/pmsorgs.php b/application/views/monpas/pages/monfin2/pmsorgs.php index af88140..64c08bf 100644 --- a/application/views/monpas/pages/monfin2/pmsorgs.php +++ b/application/views/monpas/pages/monfin2/pmsorgs.php @@ -46,26 +46,32 @@ uitgaven + "> + + data-bind="text: pms[1]"> + , + + data-bind="text: pms[2]"> + , + + data-bind="text: pms[3]"> + + + data-bind="text: pms[4]"> + + + data-bind="text: pms[5]"> + + @@ -83,18 +89,26 @@ uitgaven - - Materieel - Scholing - Personeel - Materieel - Scholing + + + + Materieel + + + Scholing + + + Personeel + + + Materieel + + + + Scholing + + + @@ -112,25 +126,31 @@ uitgaven + data-bind="text: pms[0]"> + + + data-bind="text: pms[1]"> + + + data-bind="text: pms[2]"> + + + data-bind="text: pms[3]"> + + + data-bind="text: pms[4]"> + + + data-bind="text: pms[5]"> + + Totaal @@ -146,30 +166,36 @@ uitgaven Personeel + data-bind="text: sumtotPMS()[0] ">Personeel + + Materieel + data-bind="text: sumtotPMS()[1]">Materieel + + Scholing + data-bind="text: sumtotPMS()[2]">Scholing + + Personeel + data-bind="text: sumtotPMS()[3]">Personeel + + Materieel + data-bind="text: sumtotPMS()[4]">Materieel + + Scholing + data-bind="text: sumtotPMS()[5]">Scholing + + diff --git a/public/js/monpas/models/monfin2/monfinoverzicht2.js b/public/js/monpas/models/monfin2/monfinoverzicht2.js index 3d8ab28..1f6390c 100644 --- a/public/js/monpas/models/monfin2/monfinoverzicht2.js +++ b/public/js/monpas/models/monfin2/monfinoverzicht2.js @@ -199,12 +199,7 @@ ls.initMonfinOverzicht2Model = function(){ self.sumotherPMS(result.sumother); self.sumtotPMS(result.sumtot); - - - - },'json'); - } }