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/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)) {
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');
-
}
}