From 56b473523831f4769df4054f72ca4fc11e0a9181 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Fri, 19 Jan 2024 11:28:47 +0100 Subject: [PATCH 1/7] verversen bestemmingen --- application/core/MY_Controller.php | 3 ++- public/js/monpas/models/monfin2/bestemmingen.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index a38ab81..d431b06 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -90,7 +90,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.13';// wensid was foutief uitgesterd // public $version = '1.20.14';// spelfout in ijkpunten (kleur ipv kleurV) // public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor - public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen +// public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen + public $version = '1.20.17';// verversen bestemmingen ging niet goed public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in diff --git a/public/js/monpas/models/monfin2/bestemmingen.js b/public/js/monpas/models/monfin2/bestemmingen.js index c69842d..14eb574 100644 --- a/public/js/monpas/models/monfin2/bestemmingen.js +++ b/public/js/monpas/models/monfin2/bestemmingen.js @@ -248,6 +248,8 @@ ls.initBestemmingenModel = function(){ var sd ={jaarnr:self.selectedKalenderjaar().jaarnr} $.post("index.php/monfin2/bestemmingen/getBestemmingen ", sd, function(data) { + self.basissoorten.removeAll(); + self.extrasoorten.removeAll(); if (data.basisbestemmingen){ From e46a23920611fad22167361f53a5c196277b179d Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 25 Jan 2024 11:03:38 +0100 Subject: [PATCH 2/7] tussenstand --- .../controllers/monpas/Rapijkpunten.php | 45 ++++++ .../libraries/monpas/ijkpunten/Lijsten.php | 5 + application/models/monpas/Modules_model.php | 8 ++ application/views/monpas/pages/ijkpunten.php | 130 +++++++++-------- .../views/monpas/reports/ijkpuntenbar.php | 10 +- .../views/monpas/reports/ijkpuntenchart.php | 131 ++++++++++++++++++ public/css/monpas/main.css | 31 +++++ public/js/monpas/models/ijkpuntenmodel.js | 27 +++- 8 files changed, 321 insertions(+), 66 deletions(-) create mode 100644 application/views/monpas/reports/ijkpuntenchart.php diff --git a/application/controllers/monpas/Rapijkpunten.php b/application/controllers/monpas/Rapijkpunten.php index b8937da..d164aa9 100644 --- a/application/controllers/monpas/Rapijkpunten.php +++ b/application/controllers/monpas/Rapijkpunten.php @@ -496,6 +496,51 @@ $lijsten[0]->vorm=2; $this->Phantom_model->create_pdf($html, $filenaam, FALSE, FALSE, FALSE); } + function ijkpuntenpdf(){ + + $inputstring = $this->input->post('data'); + $input = json_decode($inputstring); + $versieID = $input->versie; + $titel = $this->Modules_model->get_module_bij_versie($versieID); + $data= []; + $datum = new DateTime(); + $datum = $datum->format('Y-m-d H:i:s'); + $filenaam = preg_replace('/\s+/', '', $titel)."_". preg_replace('/\s+/', '', $datum); + + $data['titel'] = $titel; + $data['chart'] = $input->chart; + $data['tabellen'] = $input->tabellen; + $data['legenda'] = $input->legenda; + $data['ambities'] = $input->ambities; + $data['resultaten'] = $input->resultaten; + + + + + $logo = []; + + $html = $this->load->view("monpas/reports/ijkpuntenchart", $data, true); + + $filenaam="ijkpunten"; + $orientatie = 'landscape'; + + $this->Phantom_model->create_pdf($html, $filenaam, FALSE, FALSE, FALSE, $orientatie); + + +// $this->Phantom_model->create_pdf($html, $filenaam, FALSE, TRUE, FALSE, 'portrait'); +// $pdf = $this->Phantom_model->create_and_get_pdf($html, $filenaam, FALSE, TRUE, FALSE, 'portrait'); +// $pdf = $pdf.'pdf'; +// $fileNameRapport = '../documents/tmp/'.random_string('alnum', 40).'.pdf'; +// file_put_contents($fileNameRapport, $pdf); +// +// header( 'Cache-Control: public' ); +// header( 'Content-type: application/pdf' ); +// header( 'Content-Disposition: inline; filename=" ' . $filenaam . ' ".pdf" ' ); +// header( 'Content-Length: ' . filesize( $fileNameRapport ) ); +// readfile($fileNameRapport ); +// unlink($fileNameRapport); + } + function maakijkpuntenpdf(){ //TODO clean input diff --git a/application/libraries/monpas/ijkpunten/Lijsten.php b/application/libraries/monpas/ijkpunten/Lijsten.php index 0e2542d..3c2c747 100644 --- a/application/libraries/monpas/ijkpunten/Lijsten.php +++ b/application/libraries/monpas/ijkpunten/Lijsten.php @@ -228,8 +228,10 @@ class Lijsten if(intval($this->lijst->aantalorgs) == 1) $scholen = ' school'; $toevoeging = ''; $versie = ', schoolversie'; + $versie2 = 'schoolversie'; if(intval($this->lijst->vorm) == 2) { $versie = ', ind. versie'; + $versie2 = 'individuele versie'; $metingen =' metingen'; if(intval($this->lijst->metingen) == 1) $metingen = ' meting'; $toevoeging = ', '. $this->lijst->metingen. $metingen; @@ -239,6 +241,9 @@ class Lijsten $this->lijst->vantm = "p. " . $this->lijst->orgversie->periodenummer . " van " . mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm) . $versie . $toevoeging; + $this->lijst->vantmresult = " periode ". $this->lijst->orgversie->periodenummer ."
". + mysql2date($this->lijst->orgversie->geldigvanaf)." t/m " . mysql2date($this->lijst->orgversie->geldigtm) . + "
".$versie2 . $toevoeging.""; } private function setLijsten(){ diff --git a/application/models/monpas/Modules_model.php b/application/models/monpas/Modules_model.php index 0541478..54d58bc 100644 --- a/application/models/monpas/Modules_model.php +++ b/application/models/monpas/Modules_model.php @@ -125,6 +125,14 @@ class Modules_model extends MY_Model{ return $this->get_query_row("pad"); } + function get_module_bij_versie($versieID){ + $this->sql = "SELECT M.naam + FROM tb_modules M + JOIN tb_versies V ON M.sysnr = V.modulenr + WHERE V.id = {$versieID}"; + return $this->get_query_row("naam"); + } + diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php index bed9766..c13cfc5 100644 --- a/application/views/monpas/pages/ijkpunten.php +++ b/application/views/monpas/pages/ijkpunten.php @@ -212,18 +212,19 @@ -
-
+
+
+
- +
- + @@ -255,34 +256,34 @@
+ style="border-right: 1px solid white; padding-left: 10px;vertical-align: top; border-bottom: none"> nr
-
-
+ + - +
- + - + - + - @@ -302,31 +303,31 @@
- +
- + - + - + @@ -348,19 +349,19 @@
- +
- - - + - + @@ -377,21 +378,21 @@
+
- +
- - - + - - @@ -405,14 +406,18 @@
+
+
-
+ +
+ +
- +
+
@@ -435,16 +440,16 @@
+
-
-
-
-

Ambities

- -
+
+
+
+

Ambities

+
-
+

@@ -457,33 +462,38 @@
- -
+
+
-
-

Resultaten

-
-
-

-

+

+

Resultaten

+
+ +
+
+ + +
+ -

-

-

-

-
-
+

+ +
-
-
+
+
+ diff --git a/application/views/monpas/reports/ijkpuntenbar.php b/application/views/monpas/reports/ijkpuntenbar.php index f1cfe89..9429145 100644 --- a/application/views/monpas/reports/ijkpuntenbar.php +++ b/application/views/monpas/reports/ijkpuntenbar.php @@ -257,14 +257,15 @@ }; ?>
-
+

Resultaten

-
-

Periode: vantm?> +

+
+

Periode: vantmresult?>

Betreft: metingen?>metingen ==1 ) {echo " meting"; } else {echo "metingen";}; ?>

@@ -280,7 +281,8 @@ met een score van laagstescore?>.

-
+
+
diff --git a/application/views/monpas/reports/ijkpuntenchart.php b/application/views/monpas/reports/ijkpuntenchart.php new file mode 100644 index 0000000..b1acd0d --- /dev/null +++ b/application/views/monpas/reports/ijkpuntenchart.php @@ -0,0 +1,131 @@ + + + + + + + +config->item('vendor_url');?> + + +config->item('vendor_url_secure');?> + + + + + + + + + + +
+ +
+
+ +
+ + +
+ +
+ +
+
+
+

legenda

+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+ + + diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 53db3aa..b38a48d 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1296,3 +1296,34 @@ z-index: 50; box-shadow: none; } +.blokjescontainer{ + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-gap: 4px; +} +.blokjesitempdf{ + background-color:#f5f0f2 !important; + padding: 5px; + padding-left: 10px; + border-radius: 2px; +} +.blokjesitem{ + background-color:#f5f0f2 !important; + padding: 5px; + padding-left: 10px; + border-radius: 2px; +} +.tabelcontainer{ + display: grid; + grid-template-columns: 300px 150px 150px 150px 150px; + grid-gap: 0; + margin-left: 20px; + + +} +.tabelitem{ + +} +.h4koppdf{ + +} diff --git a/public/js/monpas/models/ijkpuntenmodel.js b/public/js/monpas/models/ijkpuntenmodel.js index 8ba16ce..eb56246 100644 --- a/public/js/monpas/models/ijkpuntenmodel.js +++ b/public/js/monpas/models/ijkpuntenmodel.js @@ -125,10 +125,12 @@ ls.initIJkpuntenModel = function(){ this.metingen = l.metingen; this.metingenV = l.metingenV; this.vantm = l.vantm; + this.vantmresult = l.vantmresult; this.periodenummer = l.orgversie.periodenummer this.jaartal = l.jaartal; this.label = l.label; + this.label2 = l.label2; this.gemscore = l.ambities.gemscore; this.ijkpunten = l.ambities.xijkpunten; this.zprocent = l.ambities.zprocent; @@ -396,7 +398,6 @@ ls.initIJkpuntenModel = function(){ var orgversie = {'orgversieid': p.orgversieid, 'vorm' : p.vorm }; - self.selectie.push(orgversie); } @@ -848,8 +849,30 @@ ls.initIJkpuntenModel = function(){ }, + fPrint: function () { + var self = ls.IJkpuntenModel; + var chart = document.getElementById("hc-chart1").outerHTML; + var tabellen = document.getElementById("alleIJktabellen").outerHTML; + var legenda = document.getElementById("ijktabellegenda").outerHTML; + var ambities = document.getElementById("ijkambities").outerHTML + var resultaten = document.getElementById("ijkresultaten").outerHTML; - fPrint: function(){ + var sd = { + chart: chart, + tabellen: tabellen, + legenda: legenda, + ambities: ambities, + resultaten: resultaten, + versie: self.selectedSerie().versieid + }; + data = JSON.stringify(sd); + var $form = $("
").append($('').val(data)); + $form.appendTo("body").submit(); + }, + + + + fPrintEvenNiet: function(){ var self = ls.IJkpuntenModel; // var element = document.querySelector('#hc-chart1') // var svgAsXML = (new XMLSerializer).serializeToString(element); From da6744835f891dd21f3ba862365715918d183032 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 25 Jan 2024 11:04:52 +0100 Subject: [PATCH 3/7] version --- application/core/MY_Controller.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index d431b06..a2c83d8 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -91,7 +91,9 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.14';// spelfout in ijkpunten (kleur ipv kleurV) // public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor // public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen - public $version = '1.20.17';// verversen bestemmingen ging niet goed +// public $version = '1.20.17';// verversen bestemmingen ging niet goed + public $version = '1.20.18';// tussenstand vormgeving ijkpunten + public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in From eacf820fc9740077201dfa2954588de053e3e54e Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 25 Jan 2024 11:41:41 +0100 Subject: [PATCH 4/7] tussenstand --- application/core/MY_Controller.php | 2 +- application/views/monpas/pages/ijkpunten.php | 64 ++++++++++---------- public/css/monpas/main.css | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index a2c83d8..05eb7b0 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -92,7 +92,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor // public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen // public $version = '1.20.17';// verversen bestemmingen ging niet goed - public $version = '1.20.18';// tussenstand vormgeving ijkpunten + public $version = '1.20.19';// tussenstand vormgeving ijkpunten public $partituurid; public $globProfielVersieID = 1; diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php index c13cfc5..a5abb03 100644 --- a/application/views/monpas/pages/ijkpunten.php +++ b/application/views/monpas/pages/ijkpunten.php @@ -218,13 +218,13 @@ - + @@ -237,7 +237,7 @@ - @@ -262,25 +262,25 @@
+ style="border-right: 1px solid white; padding: 3px; padding-left: 10px;vertical-align: text-top; border-bottom: none"> nr +
- + - + - - - + - + - + @@ -351,24 +351,24 @@
+
- - - - - - - +
+
+
+
@@ -380,19 +380,19 @@ - - - + - - diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index b38a48d..278443b 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1315,7 +1315,7 @@ z-index: 50; } .tabelcontainer{ display: grid; - grid-template-columns: 300px 150px 150px 150px 150px; + grid-template-columns: 400px 150px 150px 150px 150px; grid-gap: 0; margin-left: 20px; From 9f086fedd5bccbb8f704d713fc3be76a529e9b20 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 25 Jan 2024 13:49:39 +0100 Subject: [PATCH 5/7] tussenstand --- application/core/MY_Controller.php | 2 +- application/views/monpas/pages/ijkpunten.php | 156 +++++++++++-------- public/css/monpas/main.css | 9 ++ 3 files changed, 99 insertions(+), 68 deletions(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 05eb7b0..c8eb24c 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -92,7 +92,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor // public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen // public $version = '1.20.17';// verversen bestemmingen ging niet goed - public $version = '1.20.19';// tussenstand vormgeving ijkpunten + public $version = '1.20.21';// tussenstand vormgeving ijkpunten public $partituurid; public $globProfielVersieID = 1; diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php index a5abb03..8b7141f 100644 --- a/application/views/monpas/pages/ijkpunten.php +++ b/application/views/monpas/pages/ijkpunten.php @@ -218,14 +218,14 @@
+
+
- - + - @@ -233,11 +233,13 @@ - + + + - @@ -262,29 +264,39 @@
- nr +
+
nr
+ 		+
- + +
- - + - - + - - - + + - @@ -305,37 +317,41 @@
+
+
+
+
+
+
+ +
+
+
+
+
+ 		+
+
- - + - - + - - - + - - @@ -351,24 +367,27 @@
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
- - + - - + - - + - +
+
+
+
+
+
+
+
+
+
@@ -378,22 +397,25 @@
- +
- - + - - + - - + diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 278443b..994b0f3 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1327,3 +1327,12 @@ z-index: 50; .h4koppdf{ } +.ijkpuntthdiv{ + height: 50px; + overflow:hidden; + font-size: 10px; +} +.ijkpuntth { + vertical-align:top; + padding: 2px; +} \ No newline at end of file From d2cac0cac1fa7010a56b87d29e9f2660a75a41ae Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 25 Jan 2024 17:47:59 +0100 Subject: [PATCH 6/7] pdf --- application/views/monpas/pages/ijkpunten.php | 53 +++++++++------ .../views/monpas/reports/ijkpuntenchart.php | 67 +++++++++++++------ public/css/monpas/main.css | 10 +++ public/js/monpas/models/ijkpuntenmodel.js | 2 +- 4 files changed, 90 insertions(+), 42 deletions(-) diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php index 8b7141f..40e4e5f 100644 --- a/application/views/monpas/pages/ijkpunten.php +++ b/application/views/monpas/pages/ijkpunten.php @@ -199,17 +199,6 @@ - - - - - - - - - - -
@@ -218,14 +207,19 @@
+
+
+
+
+
+
+ + + + - @@ -264,6 +258,10 @@
-
nr
+ 		+
nr
+ style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;padding-left: 4px;">
+ + + +
@@ -317,6 +315,10 @@ + + + +
@@ -367,6 +369,10 @@ + + + +
@@ -399,6 +405,10 @@ + + + +
@@ -437,9 +447,9 @@
-
-
- +
+
+
@@ -467,13 +477,14 @@
-
+

Ambities

- + +

@@ -496,7 +507,7 @@
-
+

diff --git a/application/views/monpas/reports/ijkpuntenchart.php b/application/views/monpas/reports/ijkpuntenchart.php index b1acd0d..9ba43e4 100644 --- a/application/views/monpas/reports/ijkpuntenchart.php +++ b/application/views/monpas/reports/ijkpuntenchart.php @@ -27,15 +27,7 @@ - .blokjesitempdf{ - margin 2px; - padding: 10px 5px 5px 10px; - height: 125px !important; - width: 22%; - font-size:0.8em; - background-color:#f5f0f2 !important; - border-radius: 2px; - } + .h4koppdf{ font-size: 1.5em !important; @@ -45,6 +37,9 @@ margin-left: 0; padding-left: 0; } + .blokjescontainer{ + width: 100%; + } .blokjesitem{ background-color:#f5f0f2 !important; @@ -59,6 +54,24 @@ font-family: Verdana, Geneva, sans-serif !important; } + .blokjesitempdf{ + background-color:#f5f0f2 !important; + float:left; + width:22%; + margin 2px; + margin-right:15px; + padding: 10px 5px 5px 10px; + border-radius: 2px; + height: 215px; + font-size:0.8em; + font-weight: normal; + font-family: Verdana, Geneva, sans-serif !important; + } + + .tabelcontainer{ + width: 100%; + } + .tabelitem{ float: left; font-size:0.8em; @@ -77,13 +90,27 @@ } .pdflegenda{ - font-size:0.8em; + font-size:0.7em; font-family: Verdana, Geneva, sans-serif !important; width:35%; height: 150px!important; + margin-top: 30px; - margin-top: 5px; + } + .ijkpuntthdiv{ + height: 50px; + overflow:hidden; + font-weight: normal; + font-size:0.8em; + } + .ijkpuntth { + vertical-align:top; + padding: 2px; + } + .ijkpuntkopje{ + font-weight: 500; + margin-bottom: 10px; } @@ -93,10 +120,10 @@ -
+
-
+
-
+


-

legenda

-
+ +
-
-
+ +
- -
+ +
diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 994b0f3..8bb8f60 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1313,6 +1313,12 @@ z-index: 50; padding-left: 10px; border-radius: 2px; } +.blokjesitempdf{ + background-color:#f5f0f2 !important; + padding: 5px; + padding-left: 10px; + border-radius: 2px; +} .tabelcontainer{ display: grid; grid-template-columns: 400px 150px 150px 150px 150px; @@ -1335,4 +1341,8 @@ z-index: 50; .ijkpuntth { vertical-align:top; padding: 2px; +} +.ijkpuntkopje{ + font-weight: bold!important; + margin-bottom: 10px; } \ No newline at end of file diff --git a/public/js/monpas/models/ijkpuntenmodel.js b/public/js/monpas/models/ijkpuntenmodel.js index eb56246..a22089e 100644 --- a/public/js/monpas/models/ijkpuntenmodel.js +++ b/public/js/monpas/models/ijkpuntenmodel.js @@ -858,7 +858,7 @@ ls.initIJkpuntenModel = function(){ var resultaten = document.getElementById("ijkresultaten").outerHTML; var sd = { - chart: chart, + chart: GrafiekInfo, tabellen: tabellen, legenda: legenda, ambities: ambities, From f4203f187e90fa4c35d9ae639730f6d3c11813f0 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Tue, 13 Feb 2024 23:07:35 +0100 Subject: [PATCH 7/7] uitgavetype in som gewijzigd --- application/models/monfin2/Finbestemmingen_model.php | 4 ++-- public/js/monpas/models/monfin/monfinoverzicht.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/models/monfin2/Finbestemmingen_model.php b/application/models/monfin2/Finbestemmingen_model.php index dd7f56c..27bd0cb 100644 --- a/application/models/monfin2/Finbestemmingen_model.php +++ b/application/models/monfin2/Finbestemmingen_model.php @@ -263,7 +263,7 @@ class Finbestemmingen_model extends MY_Model{ JOIN finsoorten FS on FS.id = FSS.finsoort_id WHERE FB.organisatie_id in ({$orgids}) AND FB.kalenderjaar = {$jaarnr} - AND FB.uitgavetype = 'TOTAAL' + AND FB.uitgavetype <> 'TOTAAL' GROUP BY categorie, organisatie_id"; return $this->get_query_result(); } @@ -274,7 +274,7 @@ class Finbestemmingen_model extends MY_Model{ JOIN finsoorten FS on FS.id = FSS.finsoort_id WHERE FB.organisatie_id in ({$orgids}) AND FB.kalenderjaar = {$jaarnr} - AND FB.uitgavetype = 'TOTAAL' + AND FB.uitgavetype <> 'TOTAAL' AND FS.categorie = '{$cat}' GROUP BY categorie"; return $this->get_query_row('bedrag'); diff --git a/public/js/monpas/models/monfin/monfinoverzicht.js b/public/js/monpas/models/monfin/monfinoverzicht.js index a7d2277..f3ace91 100644 --- a/public/js/monpas/models/monfin/monfinoverzicht.js +++ b/public/js/monpas/models/monfin/monfinoverzicht.js @@ -69,6 +69,7 @@ ls.initMonfinOverzichtModel = function(){ else{ var sd={orgid : self.selectedOrg().id, jaarnr : self.selectedKalenderjaar().jaarnr} + $.post("index.php/monpas/monfinoverzicht/getbestuursbedragen", sd, function(result){ self.basisextra(result.basisextra); self.borganisaties.removeAll();