From 0f637c8d12628db7194166564862b90260c631a5 Mon Sep 17 00:00:00 2001 From: Monique Date: Fri, 8 Apr 2022 12:51:26 +0200 Subject: [PATCH] toon grafiek false en fout met aantal --- application/controllers/monpas/Omvang.php | 2 +- application/core/MY_Controller.php | 3 ++- public/js/monpas/models/omvangmodel.js | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/application/controllers/monpas/Omvang.php b/application/controllers/monpas/Omvang.php index 6718c14..66b3272 100644 --- a/application/controllers/monpas/Omvang.php +++ b/application/controllers/monpas/Omvang.php @@ -468,7 +468,7 @@ class Omvang extends MY_Controller{ $schooljaar->naam = $omvang->naam; $schooljaar->aantal = $omvang->aantal; $aantal = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDs); - $schooljaar->aantalllnarr = $aantal->aantal; + $schooljaar->aantalllnarr = $aantal ? $aantal->aantal: 0; $schooljaar->tlvs = $this->Tlvs_model->getAantalLeerlingenMetTLV($nummer, $schoolIDs); if($organisatie->soort == 4){ $schooljaar->arrangementen = $this->Arrangementen_model->getArrangementenMetAantallen($organisatie->id,$nummer ); diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 9bb1c9c..89d8b20 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -69,7 +69,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.92'; // Scan en Verbeteraanpak Pa.O.in Compact Sop // public $version = '1.17.93';// stuur bijlage bij new wachtwoord // public $version = '1.17.95';// verbeteringen invullijst, fout omvang - public $version = '1.17.96';// nieuwe handleidingen +// public $version = '1.17.96';// nieuwe handleidingen + public $version = '1.17.97';// omvang geen grafiek bij 0 resultaten diff --git a/public/js/monpas/models/omvangmodel.js b/public/js/monpas/models/omvangmodel.js index c182a48..f9c3bc0 100644 --- a/public/js/monpas/models/omvangmodel.js +++ b/public/js/monpas/models/omvangmodel.js @@ -301,6 +301,8 @@ mh.initOmvangModel = function(){ fGetOmvang: function() { var self = mh.OmvangModel; + self.toonresult(false); + var schooljaren = this.selectedSchooljaren.sort() var submitData = {'schooljaren' : schooljaren, @@ -629,7 +631,7 @@ mh.initOmvangModel = function(){ - self.fMaakPie(titel, pienaam, pie, naam, breedte, ); + self.fMaakPie(titel, pienaam, pie, naam, breedte ); } }) @@ -640,6 +642,7 @@ mh.initOmvangModel = function(){ var self = mh.OmvangModel; + Highcharts.chart(pienaam, { chart: { plotBackgroundColor: null, @@ -672,7 +675,7 @@ mh.initOmvangModel = function(){ size: 250, cursor: 'pointer', dataLabels: { - enabled: fadleidinglse + enabled: false }, showInLegend: true }