diff --git a/application/controllers/monpas/Diversiteit.php b/application/controllers/monpas/Diversiteit.php index 18f7895..f9523d8 100644 --- a/application/controllers/monpas/Diversiteit.php +++ b/application/controllers/monpas/Diversiteit.php @@ -79,17 +79,15 @@ class Diversiteit extends MY_Controller{ function pdfdiversiteitbar(){ $inputstring = $this->input->post('data'); $input = json_decode($inputstring); - $inputimage = $input->image; + $inputimage = $input->graph; $orgid = $input->orgid; $organisatie = $this->Organisaties_model->getOrganisatie($orgid); + $schooljaar = $input->schooljaar; - $schooljaarnr = $input->schooljaarnr; - $schooljaarnaam = $this->Schooljaren_model->get_fieldvalue(array("schooljaarnr"=>$schooljaarnr),"naam"); - $today = date("d-m-Y"); $data= array("organisatie" => $organisatie, - "inputimage" => $inputimage, - "schooljaarnaam" => $schooljaarnaam, + "img" => $inputimage, + "schooljaar" => $schooljaar, "vandaag" => $today); $html = $this->load->view("monpas/reports/diversiteitbar", $data, true); $filenaam="diversiteit"; diff --git a/application/controllers/monpas/Diversiteitmonitor.php b/application/controllers/monpas/Diversiteitmonitor.php index 66cb58d..e9a82a0 100644 --- a/application/controllers/monpas/Diversiteitmonitor.php +++ b/application/controllers/monpas/Diversiteitmonitor.php @@ -85,6 +85,7 @@ class Diversiteitmonitor extends MY_Controller{ if (!$this->userid) die; $inputstring = $this->input->post('data'); $input = json_decode($inputstring); + $img = $input->graph; $bgs = $input->bgs; $obgs =[]; foreach($bgs as $bg){ @@ -97,11 +98,11 @@ class Diversiteitmonitor extends MY_Controller{ "schooljaar" =>$schooljaar, "vandaag" =>$today, "bgs" =>$obgs, - "maxdq" =>json_decode($input->maxdq), - "mindq" =>json_decode($input->mindq), + "maxdq" => json_decode($input->maxdq), + "mindq" => json_decode($input->mindq), "maxoov" => json_decode($input->maxoov), - "grandtotals" =>json_decode($input->grandtotals), - 'gr0164' =>$input->gr0164); + "grandtotals" => json_decode($input->grandtotals), + 'img' => $img); $html = $this->load->view("monpas/reports/divmonitorpdf", $data, true); $filenaam="Monitordiversiteit".$organisatie->id; $this->Phantom_model->create_pdf($html, $filenaam, FALSE,FALSE,FALSE, 'portrait'); @@ -111,6 +112,7 @@ class Diversiteitmonitor extends MY_Controller{ if (!$this->userid) die; $inputstring = $this->input->post('data'); $input = json_decode($inputstring); + $img = $input->graph; $bgs = $input->bgs; $obgs =[]; foreach($bgs as $bg){ @@ -126,7 +128,7 @@ class Diversiteitmonitor extends MY_Controller{ "maxdq" =>json_decode($input->maxdq), "mindq" =>json_decode($input->mindq), "grandtotals" =>json_decode($input->grandtotals), - "gr0164" =>$input->gr0164); + "img" =>$img); $html = $this->load->view("monpas/reports/divmonitorsopdf", $data, true); $filenaam="MonitordiversiteitSbo&So".$organisatie->id; $this->Phantom_model->create_pdf($html, $filenaam, FALSE,FALSE,FALSE, 'portrait'); diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index cea2242..bf17ee8 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -64,7 +64,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.86'; // titels en headers sop // public $version = '1.17.88'; // sopfout // public $version = '1.17.89'; // printformulier - public $version = '1.17.90'; // sops ordenen per eigen criterium +// public $version = '1.17.90'; // sops ordenen per eigen criterium + public $version = '1.17.91'; // grafieken in 3d public $partituurid; public $globProfielVersieID = 1; diff --git a/application/libraries/monpas/Schooljaarversies.php b/application/libraries/monpas/Schooljaarversies.php index a4c11de..43389b1 100644 --- a/application/libraries/monpas/Schooljaarversies.php +++ b/application/libraries/monpas/Schooljaarversies.php @@ -90,7 +90,7 @@ Schooljaarversies private function setGevuldeVersies(){ if(!$this->modulenr) return; - $this->aantallln = $this->CI->Groepen_model->getversiesmetleerlingen( + $this->aantallln = $this->CI->Groepen_model->countleerlingen( $this->CI->globorgid, $this->versie->schooljaarnr, $this->schooltype, $this->modulenr); if(isset($this->aantallln)){ diff --git a/application/libraries/monpas/compactsop/Compactepaginas.php b/application/libraries/monpas/compactsop/Compactepaginas.php index ad6c68a..4e1134a 100644 --- a/application/libraries/monpas/compactsop/Compactepaginas.php +++ b/application/libraries/monpas/compactsop/Compactepaginas.php @@ -72,7 +72,6 @@ class Compactepaginas foreach($this->onderdelen as $index => $this->onderdeel ) { $this->setDivBreedte(); $this->setMiddelenBreedte(); -// $this->setOnderdelenDef(); } } diff --git a/application/models/Phantom_model.php b/application/models/Phantom_model.php index 42b901c..a22882d 100644 --- a/application/models/Phantom_model.php +++ b/application/models/Phantom_model.php @@ -25,7 +25,7 @@ class Phantom_model extends CI_Model{ curl_setopt_array($curl, array( CURLOPT_RETURNTRANSFER => 1, - CURLOPT_URL => $_ENV['printserver'], + CURLOPT_URL => $_ENV['printserver'] . 'print', // CURLOPT_URL => 'https://print.pensare-services.nl/print', CURLOPT_POST => 1, CURLOPT_POSTFIELDS => $data @@ -58,7 +58,7 @@ class Phantom_model extends CI_Model{ curl_setopt_array($curl, array( curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0), CURLOPT_RETURNTRANSFER => 1, - CURLOPT_URL => 'https://print.pensare-services.nl/test/1', + CURLOPT_URL => $_ENV['printserver']. 'test/1', CURLOPT_POST => 1, CURLOPT_POSTFIELDS => $data )); @@ -116,7 +116,7 @@ class Phantom_model extends CI_Model{ curl_setopt_array( $curl, array( CURLOPT_RETURNTRANSFER => 1, - CURLOPT_URL => $_ENV['printserver'], + CURLOPT_URL => $_ENV['printserver'] . 'print', // CURLOPT_URL => 'http://pdf.pensare-services.nl/index.php/pdfcreate', CURLOPT_POST => 1, CURLOPT_POSTFIELDS => $data diff --git a/application/models/monpas/Groepen_model.php b/application/models/monpas/Groepen_model.php index c075e18..6928465 100644 --- a/application/models/monpas/Groepen_model.php +++ b/application/models/monpas/Groepen_model.php @@ -69,6 +69,17 @@ class Groepen_model extends MY_Model{ AND module = {$module} "; return $this->get_query_result(); + } + + function countleerlingen($orgid, $schooljaarnr, $schooltype, $module){ + $this->sql="SELECT SUM(totaantal) AS aantallln + FROM tb_groepen + WHERE organisatie_id ={$orgid} + AND schooljaarnr = {$schooljaarnr} + AND schooltype = '{$schooltype}' + AND module = {$module} "; + return $this->get_query_row('aantallln'); + } diff --git a/application/models/monpas/Sopinhouden_model.php b/application/models/monpas/Sopinhouden_model.php index 6557719..15a4efe 100644 --- a/application/models/monpas/Sopinhouden_model.php +++ b/application/models/monpas/Sopinhouden_model.php @@ -81,7 +81,7 @@ class Sopinhouden_model extends MY_Model{ $mbgrafiek = $result['grafiek1']; // print_r($mbgrafiek); // exit; - $imagemb =$this->Phantom_model->create_img($mbgrafiek, 'test', FALSE, FALSE, array(650, 300)); + $imagemb =$this->Phantom_model->create_img($mbgrafiek, 'test.png', FALSE, FALSE, array(650, 300)); $imagedata = ""; $pos = strpos($content,'mbgrafiek1'); $content = substr_replace($content, $imagedata, $pos, 10); @@ -99,7 +99,7 @@ class Sopinhouden_model extends MY_Model{ $versie = $result['targetversie']; $smgrafiek = $result['grafiek1']; - $imagesm = $this->Phantom_model->create_img($smgrafiek, 'test', FALSE, FALSE, array(650, 300)); + $imagesm = $this->Phantom_model->create_img($smgrafiek, 'test.png', FALSE, FALSE, array(650, 300)); $imagedata = ""; $pos = strpos($content,'imagesm'); $content = substr_replace($content, $imagedata, $pos, 7); @@ -116,7 +116,7 @@ class Sopinhouden_model extends MY_Model{ $versie = $result['targetversie']; $esgrafiek = $result['grafiek1']; - $imagesm = $this->Phantom_model->create_img($esgrafiek, 'test', FALSE, FALSE, array(650, 300)); + $imagesm = $this->Phantom_model->create_img($esgrafiek, 'test.png', FALSE, FALSE, array(650, 300)); $imagedata = ""; $pos = strpos($content,'esgrafiek1'); $content = substr_replace($content, $imagedata, $pos, 10); @@ -133,7 +133,7 @@ class Sopinhouden_model extends MY_Model{ $result = $this->getenquetetabellen($profielid,3,9,$targetversieid); $versie = $result['targetversie']; $tvgrafiek = $result['grafiek1']; - $imagetv = $this->Phantom_model->create_img($tvgrafiek, 'test', FALSE, FALSE, array(650, 300)); + $imagetv = $this->Phantom_model->create_img($tvgrafiek, 'test.png', FALSE, FALSE, array(650, 300)); $imagedata = ""; $pos = strpos($content,'tvgrafiek1'); $content = substr_replace($content, $imagedata, $pos, 10); @@ -152,7 +152,7 @@ class Sopinhouden_model extends MY_Model{ if($result) { $versie = $result['targetversie']; } - $imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test', FALSE, FALSE, array(650, 300)); + $imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test.png', FALSE, FALSE, array(650, 300)); $imagedata = ""; $pos = strpos($content, 'oatabel1'); $content = substr_replace($content, $imagedata, $pos,8); @@ -169,7 +169,7 @@ class Sopinhouden_model extends MY_Model{ if($result) { $versie = $result['targetversie']; } - $imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test', FALSE, FALSE, array(650, 300)); + $imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test.png', FALSE, FALSE, array(650, 300)); $imagedata = ""; $pos = strpos($content, 'oatabel3'); $content = substr_replace($content, $imagedata, $pos,8); @@ -579,7 +579,7 @@ class Sopinhouden_model extends MY_Model{ // $gem=$score->somscore / $score->num; // }; //LS ACTIEF GEMAAKT - $score->kleurcode = $this->kleurcodes->getkleur($score->gem); +// $score->kleurcode = $this->kleurcodes->getkleur($score->gem); if ($score->disabled == 'F' && $score->disablenvt == 'F') { $totgem = $totgem + $score->gem; diff --git a/application/models/shared/Licenties_model.php b/application/models/shared/Licenties_model.php index 5c65d75..a77f4b9 100644 --- a/application/models/shared/Licenties_model.php +++ b/application/models/shared/Licenties_model.php @@ -97,4 +97,16 @@ class Licenties_model extends MY_Model{ } + function getLicentieBijSoponderdeel($orgid, $onderdeelnummer, $orgsoort){ + $this->sql = " SELECT L.modulenr + FROM tb_licenties L + JOIN tb_sop_piv_modules SPM ON L.modulenr = SPM.modulenr + JOIN tb_compactonderdeel_piv_orgsoort CPO ON SPM.onderdeel_nr = CPO.onderdeel_nr + WHERE L.orgid = {$orgid} + AND CPO.onderdeel_nr = {$onderdeelnummer} + AND CPO.org_soort = {$orgsoort} "; + return $this->get_query_row("modulenr"); + } + + } diff --git a/application/views/monpas/compactsop/expertisecompact.php b/application/views/monpas/compactsop/expertisecompact.php index 71d84a1..4db0d74 100644 --- a/application/views/monpas/compactsop/expertisecompact.php +++ b/application/views/monpas/compactsop/expertisecompact.php @@ -50,40 +50,41 @@ ?> - labels.push(nummer ?>); + labels.push('nummer ?>'); + + gem) > 0){ ?> scores.push({ - y: gem ?>, + y: gem ) ?>, color: '', - name: 'nummer ?>', - soort: 'score', - versie: periodenummer ?>, - vantm: 'vantm ?>', - omschrijving: 'omschrijving) ? $score->omschrijving : ''; ?>' omschrijving gemaakt ?> + name: 'nummer ?>' + }) + //end if + gem) == 0){ ?> + scores.push({ + y: null, + color: '', + name: 'nummer ?>' }) - + //end if + + + verkorteVersies.push(periodenummer ?>); var ambitiewaarde =ambities->gemscore; ?>; ambities.push( { y: ambities->gemscore; ?>, color: '#000000', - name: '', - soort: 'ambitie', - versie: periodenummer ?>, - vantm: 'vantm ?>', - omschrijving: '' - } + name: '' + } ); labels.unshift(' '); var legescore ={ - y : 0, + y : null, color : 'transparent', - name : '0', - soort : 'extra', - versie : '', - vantm : 'vantm ?>', - omschrijving: '' + name : '0' + }; scores.unshift(legescore); @@ -138,8 +139,16 @@ var ijkgrafiek; ijkgrafiek = Highcharts.chart('chartCompactExpert', { chart:{ + width:350, animation: false, - backgroundColor: '#e6e6e6' + backgroundColor: '#e6e6e6', + options3d: { + enabled: true, + alpha: 15, + beta: 15, + viewDistance: 25, + depth: 40 + }, }, title:{ text:'' @@ -151,6 +160,7 @@ type: 'category', categories: xas, labels:{ + skew3d: true, style:{ fontSize: '8px' @@ -163,7 +173,8 @@ title: false, labels:{ style:{ - fontSize: '8px' + fontSize: '8px', + skew3d : true } } @@ -183,7 +194,7 @@ enabled: true, inside: true, align: 'center', - verticalAlign: 'bottom', + verticalAlign: 'top', color: '#404040', style: { textOutline: false diff --git a/application/views/monpas/compactsop/extracompact.php b/application/views/monpas/compactsop/extracompact.php index 389af35..3806e80 100644 --- a/application/views/monpas/compactsop/extracompact.php +++ b/application/views/monpas/compactsop/extracompact.php @@ -134,7 +134,14 @@ ijkgrafiek = Highcharts.chart('chartCompactExtra', { chart:{ animation: false, - backgroundColor: '#e6e6e6' + backgroundColor: '#e6e6e6', + options3d: { + enabled: true, + alpha: 15, + beta: 15, + viewDistance: 25, + depth: 40 + }, }, title:{ text:'' @@ -146,6 +153,7 @@ type: 'category', categories: xas, labels:{ + skew3d: true, style:{ fontSize: '8px' @@ -157,6 +165,7 @@ max: 100, title: false, labels:{ + skew3d: true, style:{ fontSize: '8px' @@ -178,7 +187,7 @@ enabled: true, inside: true, align: 'center', - verticalAlign: 'bottom', + verticalAlign: 'top', color: '#404040', style: { textOutline: false diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php index e9bfa13..9e104da 100644 --- a/application/views/monpas/compactsop/ijktabelcompact.php +++ b/application/views/monpas/compactsop/ijktabelcompact.php @@ -49,17 +49,22 @@ if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur; }; ?> - labels.push(nummer ?>); + gem) > 0 ){ ?> scores.push({ - y: gem ?>, + y: gem) ?>, + color: '', + name: 'nummer ?>', + }); + + gem == 0 ){ ?> + scores.push({ + y: null, color: '', name: 'nummer ?>', - soort: 'score', - versie: periodenummer ?>, - vantm: 'vantm ?>', - omschrijving: 'omschrijving) ? $score->omschrijving : ''; ?>' omschrijving gemaakt ?> }); + + verkorteVersies.push(periodenummer ?>); @@ -67,23 +72,16 @@ ambities.push( { y: ambities->gemscore; ?>, color: '#000000', - name: '', - soort: 'ambitie', - versie: periodenummer ?>, - vantm: 'vantm ?>', - omschrijving: '' + name: '' + } ); labels.unshift(' '); var legescore ={ - y : 0, + y : null, color : 'transparent', - name : '0', - soort : 'extra', - versie : '', - vantm : 'vantm ?>', - omschrijving: '' + name : '0' }; scores.unshift(legescore); @@ -138,8 +136,16 @@ var ijkgrafiek; ijkgrafiek = Highcharts.chart('chartCompactIJk', { chart:{ + width:350, animation: false, - backgroundColor: '#e6e6e6' + backgroundColor: '#e6e6e6', + options3d: { + enabled: true, + alpha: 15, + beta: 15, + viewDistance: 25, + depth: 40 + }, }, title:{ text:'' @@ -151,6 +157,7 @@ type: 'category', categories: xas, labels:{ + skew3d: true, style:{ fontSize: '8px' } @@ -161,6 +168,7 @@ max: 100, title: false, labels:{ + skew3d: true, style:{ fontSize: '8px' diff --git a/application/views/monpas/compactsop/middelencompact.php b/application/views/monpas/compactsop/middelencompact.php index aa15fe2..24ba14c 100644 --- a/application/views/monpas/compactsop/middelencompact.php +++ b/application/views/monpas/compactsop/middelencompact.php @@ -62,7 +62,7 @@

Extra ondersteuning

- +
-
+ + +

Geen extra ondersteuning

+ +

Uitgavetypen

@@ -216,7 +220,7 @@ // }() }); - + 0){ ?> $(function(){ Highcharts.setOptions({ lang: { @@ -240,7 +244,14 @@ chart: { type: 'column', backgroundColor: '#ffffff', - animation: false + animation: false, + options3d: { + enabled: true, + alpha: 20, + beta: 20, + viewDistance: 40, + depth: 75, + } }, title: { text: '' @@ -251,6 +262,7 @@ xAxis: { categories: xas, labels:{ + skew3d: true, style:{ fontSize: '8px' @@ -261,6 +273,7 @@ min: 0, title: false, labels:{ + skew3d: true, style:{ fontSize: '8px' @@ -331,7 +344,11 @@ plotShadow: false, animation: false, type: 'pie', - backgroundColor: '#ffffff' + backgroundColor: '#ffffff', + options3d: { + enabled: true, + alpha: 45, + }, }, title: { text: '' @@ -353,6 +370,7 @@ plotOptions: { pie: { allowPointSelect: false, + depth: 25, dataLabels: { enabled: false, showInLegend: true diff --git a/application/views/monpas/compactsop/omvangcompact.php b/application/views/monpas/compactsop/omvangcompact.php index 2129206..c1b8b51 100644 --- a/application/views/monpas/compactsop/omvangcompact.php +++ b/application/views/monpas/compactsop/omvangcompact.php @@ -1,6 +1,8 @@ - + + +
@@ -101,9 +103,6 @@
- - - - - + + + + + +
+ + diff --git a/application/views/monpas/sop/monbasgrafiek1.php b/application/views/monpas/sop/monbasgrafiek1.php index 33dfc59..676243f 100644 --- a/application/views/monpas/sop/monbasgrafiek1.php +++ b/application/views/monpas/sop/monbasgrafiek1.php @@ -1,87 +1,165 @@ - - - + + + + + + + + + + +

+ + diff --git a/application/views/monpas/sop/sopvoorpagina.php b/application/views/monpas/sop/sopvoorpagina.php index 6e83f35..13606b9 100644 --- a/application/views/monpas/sop/sopvoorpagina.php +++ b/application/views/monpas/sop/sopvoorpagina.php @@ -3,13 +3,22 @@ diff --git a/application/views/monpas/sopkeuze/divquotientgraf.php b/application/views/monpas/sopkeuze/divquotientgraf.php index 5b8f871..fe3b5c1 100644 --- a/application/views/monpas/sopkeuze/divquotientgraf.php +++ b/application/views/monpas/sopkeuze/divquotientgraf.php @@ -2,9 +2,9 @@ - - + + -
- -
+ +

Versie: naam; }?>

diff --git a/application/views/monpas/sopkeuze/divquotientgrafso.php b/application/views/monpas/sopkeuze/divquotientgrafso.php index 074a905..a4ede2c 100644 --- a/application/views/monpas/sopkeuze/divquotientgrafso.php +++ b/application/views/monpas/sopkeuze/divquotientgrafso.php @@ -1,10 +1,9 @@ - - - + +