Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3d-grafieken

Browse Source
This commit is contained in:
Monique
2022-03-01 14:43:16 +01:00
parent 19e5ed3e04
commit 0aecc25074
39 changed files with 1944 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Diversiteit.php
+4 -6
View File
@@ -79,17 +79,15 @@ class Diversiteit extends MY_Controller{
function pdfdiversiteitbar(){ function pdfdiversiteitbar(){
$inputstring = $this->input->post('data'); $inputstring = $this->input->post('data');
$input = json_decode($inputstring); $input = json_decode($inputstring);
$inputimage = $input->image; $inputimage = $input->graph;
$orgid = $input->orgid; $orgid = $input->orgid;
$organisatie = $this->Organisaties_model->getOrganisatie($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"); $today = date("d-m-Y");
$data= array("organisatie" => $organisatie, $data= array("organisatie" => $organisatie,
"inputimage" => $inputimage, "img" => $inputimage,
"schooljaarnaam" => $schooljaarnaam, "schooljaar" => $schooljaar,
"vandaag" => $today); "vandaag" => $today);
$html = $this->load->view("monpas/reports/diversiteitbar", $data, true); $html = $this->load->view("monpas/reports/diversiteitbar", $data, true);
$filenaam="diversiteit"; $filenaam="diversiteit";
application/controllers/monpas/Diversiteitmonitor.php
+7 -5
View File
@@ -85,6 +85,7 @@ class Diversiteitmonitor extends MY_Controller{
if (!$this->userid) die; if (!$this->userid) die;
$inputstring = $this->input->post('data'); $inputstring = $this->input->post('data');
$input = json_decode($inputstring); $input = json_decode($inputstring);
$img = $input->graph;
$bgs = $input->bgs; $bgs = $input->bgs;
$obgs =[]; $obgs =[];
foreach($bgs as $bg){ foreach($bgs as $bg){
@@ -97,11 +98,11 @@ class Diversiteitmonitor extends MY_Controller{
"schooljaar" =>$schooljaar, "schooljaar" =>$schooljaar,
"vandaag" =>$today, "vandaag" =>$today,
"bgs" =>$obgs, "bgs" =>$obgs,
"maxdq" =>json_decode($input->maxdq), "maxdq" => json_decode($input->maxdq),
"mindq" =>json_decode($input->mindq), "mindq" => json_decode($input->mindq),
"maxoov" => json_decode($input->maxoov), "maxoov" => json_decode($input->maxoov),
"grandtotals" =>json_decode($input->grandtotals), "grandtotals" => json_decode($input->grandtotals),
'gr0164' =>$input->gr0164); 'img' => $img);
$html = $this->load->view("monpas/reports/divmonitorpdf", $data, true); $html = $this->load->view("monpas/reports/divmonitorpdf", $data, true);
$filenaam="Monitordiversiteit".$organisatie->id; $filenaam="Monitordiversiteit".$organisatie->id;
$this->Phantom_model->create_pdf($html, $filenaam, FALSE,FALSE,FALSE, 'portrait'); $this->Phantom_model->create_pdf($html, $filenaam, FALSE,FALSE,FALSE, 'portrait');
@@ -111,6 +112,7 @@ class Diversiteitmonitor extends MY_Controller{
if (!$this->userid) die; if (!$this->userid) die;
$inputstring = $this->input->post('data'); $inputstring = $this->input->post('data');
$input = json_decode($inputstring); $input = json_decode($inputstring);
$img = $input->graph;
$bgs = $input->bgs; $bgs = $input->bgs;
$obgs =[]; $obgs =[];
foreach($bgs as $bg){ foreach($bgs as $bg){
@@ -126,7 +128,7 @@ class Diversiteitmonitor extends MY_Controller{
"maxdq" =>json_decode($input->maxdq), "maxdq" =>json_decode($input->maxdq),
"mindq" =>json_decode($input->mindq), "mindq" =>json_decode($input->mindq),
"grandtotals" =>json_decode($input->grandtotals), "grandtotals" =>json_decode($input->grandtotals),
"gr0164" =>$input->gr0164); "img" =>$img);
$html = $this->load->view("monpas/reports/divmonitorsopdf", $data, true); $html = $this->load->view("monpas/reports/divmonitorsopdf", $data, true);
$filenaam="MonitordiversiteitSbo&So".$organisatie->id; $filenaam="MonitordiversiteitSbo&So".$organisatie->id;
$this->Phantom_model->create_pdf($html, $filenaam, FALSE,FALSE,FALSE, 'portrait'); $this->Phantom_model->create_pdf($html, $filenaam, FALSE,FALSE,FALSE, 'portrait');
application/libraries/monpas/Schooljaarversies.php
+1 -1
View File
@@ -90,7 +90,7 @@ Schooljaarversies
private function setGevuldeVersies(){ private function setGevuldeVersies(){
if(!$this->modulenr) return; 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); $this->CI->globorgid, $this->versie->schooljaarnr, $this->schooltype, $this->modulenr);
if(isset($this->aantallln)){ if(isset($this->aantallln)){
application/libraries/monpas/compactsop/Compactepaginas.php
-1
View File
@@ -72,7 +72,6 @@ class Compactepaginas
foreach($this->onderdelen as $index => $this->onderdeel ) { foreach($this->onderdelen as $index => $this->onderdeel ) {
$this->setDivBreedte(); $this->setDivBreedte();
$this->setMiddelenBreedte(); $this->setMiddelenBreedte();
//
$this->setOnderdelenDef(); $this->setOnderdelenDef();
} }
} }
application/models/Phantom_model.php
+3 -3
View File
@@ -25,7 +25,7 @@ class Phantom_model extends CI_Model{
curl_setopt_array($curl, array( curl_setopt_array($curl, array(
CURLOPT_RETURNTRANSFER => 1, CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => $_ENV['printserver'], CURLOPT_URL => $_ENV['printserver'] . 'print',
// CURLOPT_URL => 'https://print.pensare-services.nl/print', // CURLOPT_URL => 'https://print.pensare-services.nl/print',
CURLOPT_POST => 1, CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $data CURLOPT_POSTFIELDS => $data
@@ -58,7 +58,7 @@ class Phantom_model extends CI_Model{
curl_setopt_array($curl, array( curl_setopt_array($curl, array(
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0), curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0),
CURLOPT_RETURNTRANSFER => 1, CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => 'https://print.pensare-services.nl/test/1', CURLOPT_URL => $_ENV['printserver']. 'test/1',
CURLOPT_POST => 1, CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $data CURLOPT_POSTFIELDS => $data
)); ));
@@ -116,7 +116,7 @@ class Phantom_model extends CI_Model{
curl_setopt_array( $curl, array( curl_setopt_array( $curl, array(
CURLOPT_RETURNTRANSFER => 1, CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => $_ENV['printserver'], CURLOPT_URL => $_ENV['printserver'] . 'print',
// CURLOPT_URL => 'http://pdf.pensare-services.nl/index.php/pdfcreate', // CURLOPT_URL => 'http://pdf.pensare-services.nl/index.php/pdfcreate',
CURLOPT_POST => 1, CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $data CURLOPT_POSTFIELDS => $data
application/models/monpas/Groepen_model.php
+11
View File
@@ -69,6 +69,17 @@ class Groepen_model extends MY_Model{
AND module = {$module} "; AND module = {$module} ";
return $this->get_query_result(); 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');
} }
application/models/monpas/Sopinhouden_model.php
+7 -7
View File
@@ -81,7 +81,7 @@ class Sopinhouden_model extends MY_Model{
$mbgrafiek = $result['grafiek1']; $mbgrafiek = $result['grafiek1'];
// print_r($mbgrafiek); // print_r($mbgrafiek);
// exit; // 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 = "<img src='data:image/png;base64,".$imagemb."' id='mod1image1'/>"; $imagedata = "<img src='data:image/png;base64,".$imagemb."' id='mod1image1'/>";
$pos = strpos($content,'mbgrafiek1'); $pos = strpos($content,'mbgrafiek1');
$content = substr_replace($content, $imagedata, $pos, 10); $content = substr_replace($content, $imagedata, $pos, 10);
@@ -99,7 +99,7 @@ class Sopinhouden_model extends MY_Model{
$versie = $result['targetversie']; $versie = $result['targetversie'];
$smgrafiek = $result['grafiek1']; $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 = "<img src='data:image/png;base64,".$imagesm."' id='mod4image1'/>"; $imagedata = "<img src='data:image/png;base64,".$imagesm."' id='mod4image1'/>";
$pos = strpos($content,'imagesm'); $pos = strpos($content,'imagesm');
$content = substr_replace($content, $imagedata, $pos, 7); $content = substr_replace($content, $imagedata, $pos, 7);
@@ -116,7 +116,7 @@ class Sopinhouden_model extends MY_Model{
$versie = $result['targetversie']; $versie = $result['targetversie'];
$esgrafiek = $result['grafiek1']; $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 = "<img src='data:image/png;base64,".$imagesm."' id='mod5image1'/>"; $imagedata = "<img src='data:image/png;base64,".$imagesm."' id='mod5image1'/>";
$pos = strpos($content,'esgrafiek1'); $pos = strpos($content,'esgrafiek1');
$content = substr_replace($content, $imagedata, $pos, 10); $content = substr_replace($content, $imagedata, $pos, 10);
@@ -133,7 +133,7 @@ class Sopinhouden_model extends MY_Model{
$result = $this->getenquetetabellen($profielid,3,9,$targetversieid); $result = $this->getenquetetabellen($profielid,3,9,$targetversieid);
$versie = $result['targetversie']; $versie = $result['targetversie'];
$tvgrafiek = $result['grafiek1']; $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 = "<img src='data:image/png;base64,".$imagetv."' id='mod3image1'/>"; $imagedata = "<img src='data:image/png;base64,".$imagetv."' id='mod3image1'/>";
$pos = strpos($content,'tvgrafiek1'); $pos = strpos($content,'tvgrafiek1');
$content = substr_replace($content, $imagedata, $pos, 10); $content = substr_replace($content, $imagedata, $pos, 10);
@@ -152,7 +152,7 @@ class Sopinhouden_model extends MY_Model{
if($result) { if($result) {
$versie = $result['targetversie']; $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 = "<img src='data:image/png;base64,".$imageoa."' id='oa1image1'/>"; $imagedata = "<img src='data:image/png;base64,".$imageoa."' id='oa1image1'/>";
$pos = strpos($content, 'oatabel1'); $pos = strpos($content, 'oatabel1');
$content = substr_replace($content, $imagedata, $pos,8); $content = substr_replace($content, $imagedata, $pos,8);
@@ -169,7 +169,7 @@ class Sopinhouden_model extends MY_Model{
if($result) { if($result) {
$versie = $result['targetversie']; $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 = "<img src='data:image/png;base64,".$imageoa."' id='oa2image1'/>"; $imagedata = "<img src='data:image/png;base64,".$imageoa."' id='oa2image1'/>";
$pos = strpos($content, 'oatabel3'); $pos = strpos($content, 'oatabel3');
$content = substr_replace($content, $imagedata, $pos,8); $content = substr_replace($content, $imagedata, $pos,8);
@@ -579,7 +579,7 @@ class Sopinhouden_model extends MY_Model{
// $gem=$score->somscore / $score->num; // $gem=$score->somscore / $score->num;
// }; // };
//LS ACTIEF GEMAAKT //LS ACTIEF GEMAAKT
$score->kleurcode = $this->kleurcodes->getkleur($score->gem); // $score->kleurcode = $this->kleurcodes->getkleur($score->gem);
if ($score->disabled == 'F' && $score->disablenvt == 'F') { if ($score->disabled == 'F' && $score->disablenvt == 'F') {
$totgem = $totgem + $score->gem; $totgem = $totgem + $score->gem;
application/views/monpas/compactsop/expertisecompact.php
+34 -23
View File
@@ -50,40 +50,41 @@
?> ?>
labels.push(<?php $score->nummer ?>); labels.push('<?php echo $score->nummer ?>');
<?php if (floatval($score->gem) > 0){ ?>
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?php echo floatval($score->gem ) ?>,
color: '<?=$kleur ?>', color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>'
soort: 'score', })
versie: <?= $lijst->periodenummer ?>, <?php } ?> //end if
vantm: '<?= $lijst->vantm ?>', <?php if (floatval($score->gem) == 0){ ?>
omschrijving: '<?php echo isset( $score->omschrijving) ? $score->omschrijving : ''; ?>' <?php // hier van $omschrijving $score->omschrijving gemaakt ?> scores.push({
y: null,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>'
}) })
<?php } // foreach lijstscores ?> <?php } ?> //end if
<?php } // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>); verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>; var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push( ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>, { y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000', color: '#000000',
name: '', name: ''
soort: 'ambitie', }
versie: <?=$lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?='test'; //$omschrijving is geen veld?>'
}
); );
labels.unshift(' '); labels.unshift(' ');
var legescore ={ var legescore ={
y : 0, y : null,
color : 'transparent', color : 'transparent',
name : '0', name : '0'
soort : 'extra',
versie : '',
vantm : '<?= $lijst->vantm ?>',
omschrijving: ''
}; };
scores.unshift(legescore); scores.unshift(legescore);
@@ -138,8 +139,16 @@
var ijkgrafiek; var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartCompactExpert', { ijkgrafiek = Highcharts.chart('chartCompactExpert', {
chart:{ chart:{
width:350,
animation: false, animation: false,
backgroundColor: '#e6e6e6' backgroundColor: '#e6e6e6',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
viewDistance: 25,
depth: 40
},
}, },
title:{ title:{
text:'' text:''
@@ -151,6 +160,7 @@
type: 'category', type: 'category',
categories: xas, categories: xas,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -163,7 +173,8 @@
title: false, title: false,
labels:{ labels:{
style:{ style:{
fontSize: '8px' fontSize: '8px',
skew3d : true
} }
} }
@@ -183,7 +194,7 @@
enabled: true, enabled: true,
inside: true, inside: true,
align: 'center', align: 'center',
verticalAlign: 'bottom', verticalAlign: 'top',
color: '#404040', color: '#404040',
style: { style: {
textOutline: false textOutline: false
application/views/monpas/compactsop/extracompact.php
+11 -2
View File
@@ -134,7 +134,14 @@
ijkgrafiek = Highcharts.chart('chartCompactExtra', { ijkgrafiek = Highcharts.chart('chartCompactExtra', {
chart:{ chart:{
animation: false, animation: false,
backgroundColor: '#e6e6e6' backgroundColor: '#e6e6e6',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
viewDistance: 25,
depth: 40
},
}, },
title:{ title:{
text:'' text:''
@@ -146,6 +153,7 @@
type: 'category', type: 'category',
categories: xas, categories: xas,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -157,6 +165,7 @@
max: 100, max: 100,
title: false, title: false,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -178,7 +187,7 @@
enabled: true, enabled: true,
inside: true, inside: true,
align: 'center', align: 'center',
verticalAlign: 'bottom', verticalAlign: 'top',
color: '#404040', color: '#404040',
style: { style: {
textOutline: false textOutline: false
application/views/monpas/compactsop/ijktabelcompact.php
+26 -18
View File
@@ -49,17 +49,22 @@
if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur; if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur;
}; };
?> ?>
labels.push(<?php $score->nummer ?>); labels.push(<?php $score->nummer ?>);
<?php if(floatval($score->gem) > 0 ){ ?>
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?= floatval($score->gem) ?>,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php if($score->gem == 0 ){ ?>
scores.push({
y: null,
color: '<?=$kleur ?>', color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
soort: 'score',
versie: <?= $lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?php echo isset( $score->omschrijving) ? $score->omschrijving : ''; ?>' <?php // hier van $omschrijving $score->omschrijving gemaakt ?>
}); });
<?php } ?>
<?php } // foreach lijstscores ?> <?php } // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>); verkorteVersies.push(<?= $lijst->periodenummer ?>);
@@ -67,23 +72,16 @@
ambities.push( ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>, { y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000', color: '#000000',
name: '', name: ''
soort: 'ambitie',
versie: <?=$lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?='test'; //$omschrijving is geen veld?>'
} }
); );
labels.unshift(' '); labels.unshift(' ');
var legescore ={ var legescore ={
y : 0, y : null,
color : 'transparent', color : 'transparent',
name : '0', name : '0'
soort : 'extra',
versie : '',
vantm : '<?= $lijst->vantm ?>',
omschrijving: ''
}; };
scores.unshift(legescore); scores.unshift(legescore);
@@ -138,8 +136,16 @@
var ijkgrafiek; var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartCompactIJk', { ijkgrafiek = Highcharts.chart('chartCompactIJk', {
chart:{ chart:{
width:350,
animation: false, animation: false,
backgroundColor: '#e6e6e6' backgroundColor: '#e6e6e6',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
viewDistance: 25,
depth: 40
},
}, },
title:{ title:{
text:'' text:''
@@ -151,6 +157,7 @@
type: 'category', type: 'category',
categories: xas, categories: xas,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
} }
@@ -161,6 +168,7 @@
max: 100, max: 100,
title: false, title: false,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
application/views/monpas/compactsop/middelencompact.php
+23 -5
View File
@@ -62,7 +62,7 @@
<div class="col-xs-3"> <div class="col-xs-3">
<p class="subTitel1" style="text-align:center">Extra ondersteuning</p> <p class="subTitel1" style="text-align:center">Extra ondersteuning</p>
<?php if($data['somE'] != 0){ ?>
<!-- eerst de grafiek, daaronder de tabel --> <!-- eerst de grafiek, daaronder de tabel -->
<div class="highcharts-background" <div class="highcharts-background"
style="height: 200px; width: 160px;" style="height: 200px; width: 160px;"
@@ -101,8 +101,12 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> <?php } ?>
<?php if($data['somE'] == 0){ ?>
<p class="subTitel1" style="text-align:center; font-size: 8px" >Geen extra ondersteuning</p>
<?php } ?>
</div>
<div class="col-xs-4"> <div class="col-xs-4">
<p class="subTitel1" style="text-align:center">Uitgavetypen</p> <p class="subTitel1" style="text-align:center">Uitgavetypen</p>
@@ -216,7 +220,7 @@
// }() // }()
}); });
<?php } ?> <?php } ?>
<?php if ($data['subsoorten']){ ?> <?php if ($data['somE']> 0){ ?>
$(function(){ $(function(){
Highcharts.setOptions({ Highcharts.setOptions({
lang: { lang: {
@@ -240,7 +244,14 @@
chart: { chart: {
type: 'column', type: 'column',
backgroundColor: '#ffffff', backgroundColor: '#ffffff',
animation: false animation: false,
options3d: {
enabled: true,
alpha: 20,
beta: 20,
viewDistance: 40,
depth: 75,
}
}, },
title: { title: {
text: '' text: ''
@@ -251,6 +262,7 @@
xAxis: { xAxis: {
categories: xas, categories: xas,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -261,6 +273,7 @@
min: 0, min: 0,
title: false, title: false,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -331,7 +344,11 @@
plotShadow: false, plotShadow: false,
animation: false, animation: false,
type: 'pie', type: 'pie',
backgroundColor: '#ffffff' backgroundColor: '#ffffff',
options3d: {
enabled: true,
alpha: 45,
},
}, },
title: { title: {
text: '' text: ''
@@ -353,6 +370,7 @@
plotOptions: { plotOptions: {
pie: { pie: {
allowPointSelect: false, allowPointSelect: false,
depth: 25,
dataLabels: { dataLabels: {
enabled: false, enabled: false,
showInLegend: true showInLegend: true
application/views/monpas/compactsop/passendcompact.php
+26 -18
View File
@@ -51,16 +51,22 @@
?> ?>
labels.push(<?php $score->nummer ?>); labels.push(<?php $score->nummer ?>);
<?php if(floatval($score->gem) > 0 ){ ?>
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?= floatval($score->gem) ?>,
color: '<?=$kleur ?>', color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
soort: 'score',
versie: <?= $lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?php echo isset( $score->omschrijving) ? $score->omschrijving : ''; ?>' <?php // hier van $omschrijving $score->omschrijving gemaakt ?>
}); });
<?php } // foreach lijstscores ?> <?php } ?>
<?php if($score->gem == 0 ){ ?>
scores.push({
y: null,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php } // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>); verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>; var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
@@ -68,22 +74,15 @@
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>, { y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000', color: '#000000',
name: '', name: '',
soort: 'ambitie', }
versie: <?=$lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?='test'; //$omschrijving is geen veld?>'
}
); );
labels.unshift(' '); labels.unshift(' ');
var legescore ={ var legescore ={
y : 0, y : null,
color : 'transparent', color : 'transparent',
name : '0', name : '0',
soort : 'extra',
versie : '',
vantm : '<?= $lijst->vantm ?>',
omschrijving: ''
}; };
scores.unshift(legescore); scores.unshift(legescore);
@@ -139,7 +138,14 @@
ijkgrafiek = Highcharts.chart('chartCompactPassend', { ijkgrafiek = Highcharts.chart('chartCompactPassend', {
chart:{ chart:{
animation: false, animation: false,
backgroundColor: '#e6e6e6' backgroundColor: '#e6e6e6',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
viewDistance: 25,
depth: 40
},
}, },
title:{ title:{
text:'' text:''
@@ -151,6 +157,7 @@
type: 'category', type: 'category',
categories: xas, categories: xas,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
} }
@@ -161,6 +168,7 @@
max: 100, max: 100,
title: false, title: false,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -182,7 +190,7 @@
enabled: true, enabled: true,
inside: true, inside: true,
align: 'center', align: 'center',
verticalAlign: 'bottom', verticalAlign: 'top',
color: '#404040', color: '#404040',
style: { style: {
textOutline: false textOutline: false
application/views/monpas/compactsop/tevredencompact.php
+26 -23
View File
@@ -40,22 +40,24 @@
<?php } ?> <?php } ?>
<?php foreach($lijst->scores as $index2 => $score){ <?php foreach($lijst->scores as $index2 => $score){
$omschrijving = "gemiddelde";
if(isset($score->omschrijving)){
$omschrijving = $score->omschrijving;
};
?> ?>
labels.push(<?php $score->nummer ?>); labels.push(<?php $score->nummer ?>);
<?php if(floatval($score->gem) > 0 ){ ?>
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?= floatval($score->gem) ?>,
color: '<?=$score->kleur ?>', color: '<?=$score->kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
soort: 'score', });
versie: <?= $lijst->periodenummer ?>, <?php } ?>
vantm: '<?= $lijst->vantm ?>', <?php if($score->gem == 0 ){ ?>
omschrijving: '<?php echo isset( $score->omschrijving) ? $score->omschrijving : ''; ?>' <?php // hier van $omschrijving $score->omschrijving gemaakt ?> scores.push({
}) y: null,
color: '<?=$score->kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php } // foreach lijstscores ?> <?php } // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>); verkorteVersies.push(<?= $lijst->periodenummer ?>);
@@ -64,22 +66,15 @@
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>, { y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000', color: '#000000',
name: '', name: '',
soort: 'ambitie',
versie: <?=$lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?='test'; //$omschrijving is geen veld?>'
} }
); );
labels.unshift(' '); labels.unshift(' ');
var legescore ={ var legescore ={
y : 0, y : null,
color : 'transparent', color : 'transparent',
name : '0', name : '0',
soort : 'extra',
versie : '',
vantm : '<?= $lijst->vantm ?>',
omschrijving: ''
}; };
scores.unshift(legescore); scores.unshift(legescore);
@@ -104,7 +99,6 @@
var extralijn = { var extralijn = {
y: ambitiewaarde, y: ambitiewaarde,
name: '', name: '',
soort: 'extra'
}; };
ambities.unshift(extralijn); ambities.unshift(extralijn);
ambities.push(extralijn); ambities.push(extralijn);
@@ -135,7 +129,14 @@
ijkgrafiek = Highcharts.chart('chartCompactTevreden', { ijkgrafiek = Highcharts.chart('chartCompactTevreden', {
chart:{ chart:{
animation: false, animation: false,
backgroundColor: '#e6e6e6' backgroundColor: '#e6e6e6',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
viewDistance: 25,
depth: 40
},
}, },
title:{ title:{
text:'' text:''
@@ -147,6 +148,7 @@
type: 'category', type: 'category',
categories: xas, categories: xas,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -158,6 +160,7 @@
max: 100, max: 100,
title: false, title: false,
labels:{ labels:{
skew3d: true,
style:{ style:{
fontSize: '8px' fontSize: '8px'
@@ -179,7 +182,7 @@
enabled: true, enabled: true,
inside: true, inside: true,
align: 'center', align: 'center',
verticalAlign: 'bottom', verticalAlign: 'top',
color: '#404040', color: '#404040',
style: { style: {
textOutline: false textOutline: false
application/views/monpas/pages/ijkpunten.php
+1 -1
View File
@@ -194,7 +194,7 @@
</button> </button>
<div id="hc-chart1" style="min-width: 310px; height: 400px; margin: 0 auto" > <div id="hc-chart1" style="min-width: 310px; height: 475px; margin: 0 auto" >
</div> </div>
<canvas style="display: none" id="ijkpuntencanvas"> <canvas style="display: none" id="ijkpuntencanvas">
application/views/monpas/pages/mondiv/diversiteit.php
+1 -1
View File
@@ -144,7 +144,7 @@
</div> </div>
<div class="col-sm-12 col-md-6"> <div class="col-sm-12 col-md-6">
<div id="dqpergroep" style="width: 100%"></div> <div id="dqpergroepX" style="width: 100%"></div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
application/views/monpas/pages/mondiv/diversiteitso.php
+11 -8
View File
@@ -144,15 +144,18 @@
<!-- <p> Groep 1-2: <span data-bind="text: normaantallensbo()[0]"></span></p>--> <!-- <p> Groep 1-2: <span data-bind="text: normaantallensbo()[0]"></span></p>-->
<!-- <p> Groep 3-8: <span data-bind="text:normaantallensbo()[1]"></span></p>--> <!-- <p> Groep 3-8: <span data-bind="text:normaantallensbo()[1]"></span></p>-->
<!-- <hr/>--> <!-- <hr/>-->
<h4 style="margin-top :40px"> Diversiteitsquoti&#235;nt per groep
<button class="printer" style="margin-left: 30px" data-bind="click: fPrintDiversiteitBar"></button> <div class="row" style="border: none">
</h4> <div class="col-xs-6" style="border: none">
<div style="position:relative; width: 590px; height: 410px;" id="diversiteitsocanvasholderso"> <button class="printer" data-bind="click: fPrintDiversiteitBar" ></button>
<div id="cdiversiteitsoXXX" style="margin-top:5px; ">
<canvas data-bind="attr:{'id': 'cdiversiteitso'}" height= "400" width="580" style="margin-top:5px; "> </canvas> </div>
<!-- data-bind="attr:{'id': 'cdiversiteitsoXXX'}"-->
</div>
</div>
<hr/> <hr/>
</div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-6"> <div class="col-sm-12 col-md-6">
<h4> Leerlingaantallen <h4> Leerlingaantallen
application/views/monpas/pages/mondiv/monitordiversiteit.php
+3 -5
View File
@@ -61,13 +61,11 @@
</p> </p>
</div> </div>
<hr/> <hr/>
<h4>Totaal percentages en richtlijnen</h4> <!-- <h4>Totaal percentages en richtlijnen</h4>-->
<div data-bind="visible : grandtotals().llng > 0"> <div data-bind="visible : grandtotals().llng > 0">
<div style="float:left; position:relative; width: 400px; height: 290px;" id="holdermondiv01"> <div id="mondiv01X" style="margin-top:5px;"></div>
<canvas data-bind="attr:{'id': 'mondiv01'}" height= "185" width="500" style="margin-top:5px; "> </canvas>
</div>
<div style='float:left;margin-left: 40px; '> <div style='float:left;margin-left: 40px; '>
<table class-="lstable"> <table class="lstable">
<thead> <thead>
<tr style="border-bottom:1px solid #dbdbdb"> <tr style="border-bottom:1px solid #dbdbdb">
<td>Ondersteuningsvormen</td> <td>Ondersteuningsvormen</td>
application/views/monpas/pages/mondiv/monitordiversiteitso.php
+7 -6
View File
@@ -52,13 +52,13 @@
</p> </p>
</div> </div>
<hr/> <hr/>
<h4>Percentages</h4> <!-- <h4>Percentages</h4>-->
<div class="row">
<div data-bind="visible : grandtotals().llng > 0"> <div data-bind="visible : grandtotals().llng > 0">
<div style="float:left; position:relative; width: 400px; height: 290px;" id="holdermondivSO">
<canvas data-bind="attr:{'id': 'mondivSO'}" height= "185" width="500" style="margin-top:5px; "> </canvas> <div id="mondivSOXXX" class="col-xs-6"></div>
</div> <div class="col-xs-6" >
<div style='float:left;margin-left: 40px; '> <table class="lstable">
<table class-="lstable">
<thead> <thead>
<tr style="border-bottom:1px solid #dbdbdb"> <tr style="border-bottom:1px solid #dbdbdb">
<td>Ondersteuningsvormen</td> <td>Ondersteuningsvormen</td>
@@ -91,6 +91,7 @@
</div> </div>
</div> <!-- linkerblok --> </div> <!-- linkerblok -->
</div>
<div class="col-sm-12 col-md-3" > <div class="col-sm-12 col-md-3" >
<div style="font-size: 0.8em; border:1px solid #ebebeb"> <div style="font-size: 0.8em; border:1px solid #ebebeb">
application/views/monpas/pages/omvangextra.php
+2 -2
View File
@@ -195,12 +195,12 @@
</div> </div>
<div style="margin-top: 20px;" data-bind="visible: toonresult() == true " > <div class="col-xs-12" style="margin-top: 20px; " data-bind="visible: toonresult() == true " >
<button class="printer" style=" float: right; display: inline; margin-right: 10px;" <button class="printer" style=" float: right; display: inline; margin-right: 10px;"
data-bind="click: fPrint"> data-bind="click: fPrint">
</button> </button>
<div id="omvangchart" style="min-width: 350px; height: 400px; margin: 0 auto" > <div id="omvangchart" class="col-xs-12" style=" clear: both; display: block; min-width: 350px; height: 450px; margin: 0 auto" >
</div> </div>
application/views/monpas/reports/diversiteitbar.php
+3 -6
View File
@@ -1,6 +1,4 @@
<div style="font-family: Opensans, Arial,Verdana,sans; font-size: 10px"> <div style="font-family: Opensans, Arial,Verdana,sans; font-size: 10px">
<h4> Diversiteitsquoti&#235;nt per groep</h4>
<hr/>
<table style=" font-family: inherit; font-size:inherit" > <table style=" font-family: inherit; font-size:inherit" >
<tr> <tr>
<td>School:</td> <td>School:</td>
@@ -8,14 +6,13 @@
</tr> </tr>
<tr> <tr>
<td>Schooljaar: </td> <td>Schooljaar: </td>
<td><?=$schooljaarnaam?></td> <td><?=$schooljaar?></td>
</tr> </tr>
<tr> <tr>
<td>Per: </td> <td>Per: </td>
<td><?=$vandaag?></td> <td><?=$vandaag?></td>
</tr> </tr>
</table> </table>
<hr/> <?=$img?>
<img src="<?=$inputimage?>" width=420/>
</div> </div>
application/views/monpas/reports/divmonitorpdf.php
+1 -1
View File
@@ -149,7 +149,7 @@
<?php if ($grandtotals->llng >0) { ?> <?php if ($grandtotals->llng >0) { ?>
<h4 style="margin-top: 30px;">Totaal percentages en richtlijnen</h4> <h4 style="margin-top: 30px;">Totaal percentages en richtlijnen</h4>
<div style="float: left"> <div style="float: left">
<img src=' <?=$gr0164?>'style="width:200px" /> <?=$img?>
</div> </div>
<div style="float:left; margin-left:30px"> <div style="float:left; margin-left:30px">
<table class="lstable" > <table class="lstable" >
application/views/monpas/reports/divmonitorsopdf.php
+11 -25
View File
@@ -25,26 +25,17 @@
} }
.pdfblok{ .pdfblok{
border: 1px solid #dbdbdb; border: 1px solid #dbdbdb;
float : left; width : 350px;
width : 800px;
min-height: 250px;
padding: 5px; padding: 5px;
position: relative;
margin-top: 40px; margin-top: 40px;
} }
.onderin{ .onderin{
position : absolute;
bottom : 0;
width : 325px; width : 325px;
left : 0;
} }
.onderin2{ .onderin2{
position : absolute; width : 325px;
bottom : 30px; float : left;
width : 350px;
left : 350px;
} }
@@ -156,43 +147,38 @@
</div> </div>
<hr/> <hr/>
<div class="pdfblok"> <div>
<?php if ($grandtotals->llng >0) { ?> <?php if ($grandtotals->llng >0) { ?>
<h4 >Totaal percentages en richtlijnen</h4> <div style="float: left">
<div class="onderin" style="left: 0;"> <table class="lstable" >
<img src=' <?=$gr0164?>'style="width:300px" />
</div>
<div class="onderin2" ">
<table class="lstable" >
<thead> <thead>
<tr style="border-bottom:1px solid #dbdbdb"> <tr style="border-bottom:1px solid #dbdbdb">
<td>Ondersteuningsvormen</td> <td>Ondersteuningsvormen</td>
<td>% leerlingen</td> <td>% leerlingen</td>
<td>richtlijn</td>
</tr> </tr>
</thead> </thead>
<tr> <tr>
<td>SBO</td> <td>SBO</td>
<td class="tar"><?php echo round(($grandtotals->cat5 / $grandtotals->llng) * 100); ?>%</td> <td class="tar"><?php echo round(($grandtotals->cat5 / $grandtotals->llng) * 100); ?>%</td>
<td class="tar" >85%</td>
</tr> </tr>
<tr> <tr>
<td>SO-1</td> <td>SO-1</td>
<td class="tar"><?php echo round(($grandtotals->cat6 / $grandtotals->llng) * 100); ?>%</td> <td class="tar"><?php echo round(($grandtotals->cat6 / $grandtotals->llng) * 100); ?>%</td>
<td class="tar" >10%</td>
</tr> </tr>
<tr> <tr>
<td>SO-2</td> <td>SO-2</td>
<td class="tar"><?php echo round(($grandtotals->cat7 / $grandtotals->llng) * 100); ?>%</td> <td class="tar"><?php echo round(($grandtotals->cat7 / $grandtotals->llng) * 100); ?>%</td>
<td class="tar" >3%</td>
</tr> </tr>
<tr> <tr>
<td> SO-3Extra ondersteuning plus</td> <td> SO-3Extra ondersteuning plus</td>
<td class="tar"><?php echo round(($grandtotals->cat8 / $grandtotals->llng) * 100); ?>%</td> <td class="tar"><?php echo round(($grandtotals->cat8 / $grandtotals->llng) * 100); ?>%</td>
<td class="tar" >2%</td>
</tr> </tr>
</table> </table>
</div> </div>
<div style="float: left; margin-left: 0">
<?=$img ?>
</div>
<div style="clear:both"></div> <div style="clear:both"></div>
<?php ;}; ?> <?php ;}; ?>
</div> </div>
application/views/monpas/sop/diversiteitgrafiek1.php
+98 -60
View File
@@ -1,72 +1,110 @@
<!doctype html>
<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('vendor_url'); ?>/css/chart.css" /> <html>
<head>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script> <script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/chart.min.js"></script> <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<canvas id="cdiversiteit99" height= "260" width="600" style="margin-top:5px;"> </canvas> <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
<style>
body {
font-family: 'Verdana', 'sans-serif';
font-size: 12px;
}
</style>
</head>
<body>
<div id="graphdivstandaard" style="margin-top:5px; height: 260px; width: 600px;"> </div>
<script> <script>
fFillGraph= function(){ <?php if ($groepen){ ?>
var scores =[]; $(function(){
var slabels =[]; fFillGraph= function(){
var counter = 0; var scores =[];
bartussenruimte = 5; var labels =[];
var groepen = <?php echo json_encode($groepen); ?> <?php foreach($groepen as $index => $groep) { ?>
labels.push('<?= $groep->naam ?>');
$.each(groepen, function(i,p){ <?php if(floatval($groep->dq) > 0){?>
scores[i] = p.dq; scores.push({
slabels[i] = p.naam; y: <?=(floatval($groep->dq))?>,
counter = counter + 1; name: '<?= $groep->naam ?>',
}); color: '#6F0B3D'
slabels[counter]='school'; })
scores[counter]=<?=$totdq?>; <?php }
if(floatval($groep->dq) == 0){?>
scores.push({
y: null,
name: '<?= $groep->naam ?>',
color: '#6F0B3D'
})
<?php }
}
?>
labels.push('school');
scores.push({
y: <?= $totdq ?>,
name: 'school',
color:'#6F0B3D'
})
Highcharts.chart('graphdivstandaard', {
chart: {
type: 'column',
animation: false,
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
depth: 50,
viewDistance: 25
}
},
title: {
text: ' ',
var ctxDiversiteit=$("#cdiversiteit99").get(0).getContext("2d"); },
credits: {
enabled: false
},
xAxis: {
categories: labels,
},
yAxis: {
min: 0,
tickInterval: 0.2,
title: {
text: 'DQ'
},
labels:{
style:{
fontSize: '8px'
var data6 = {labels :slabels, }
datasets: [{fillColor: "rgba(147,15,80,0.9)", }
strokeColor: "rgba(111,11,61,1)", },
highlightStroke: "rgba(222,22,123,1)", plotOptions: {
data: scores} column: {
]}; pointWidth: null,
groepPadding: 0,
borderWidth: 0,
color: '#7f036C'
}
},
series: [{
showInLegend: false,
animation: false,
name: 'groepen',
data: scores
} ]
});
Chart.types.Bar.extend({
name: "LineAlt",
initialize: function () {
Chart.types.Bar.prototype.initialize.apply(this, arguments); }()
}, });
draw: function () <?php } ?>
{
Chart.types.Bar.prototype.draw.apply(this, arguments);
this.chart.ctx.beginPath();
// this.chart.ctx.moveTo(30,95);
// this.chart.ctx.lineTo(580, 95);
this.chart.ctx.stroke();
this.chart.ctx.closePath();
}
});
BC6 = new Chart(ctxDiversiteit).LineAlt(data6,{
animation:false,
scaleFontFamily: "'lato','Arial'",
scaleColor:"rgba(0,0,0,1)",
scaleShowGridLines:true,
scaleLineColor:"rgba(0,0,0,1)",
scaleOverride: true,
scaleBeginAtZero :true,
scaleSteps: 20,
scaleStepWidth: 0.1,
scaleStartValue: 0 ,
barValueSpacing: bartussenruimte,
barStrokeWidth:1,
barDatasetSpacing:2,
toottipFontFamily:"'lato','Arial'",
showTooltips : false
});
}();
</script> </script>
</body>
</html>
application/views/monpas/sop/monbasgrafiek1.php
+146 -68
View File
@@ -1,87 +1,165 @@
<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('vendor_url'); ?>/css/chart.css" /> <!doctype html>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script> <html>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/chart.min.js"></script> <head>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
<style>
body {
font-family: 'Verdana', 'sans-serif';
font-size: 12px;
}
</style>
<canvas id='schoolijkpunt2' height= "285" width="580" style="margin-top:5px; "> </canvas> </head>
<body>
<div id='schoolijkpunt2' style="margin-top:5px; height:285px; width:580px; "> </div>
<p style="font-size:0.8em"><?=$vantm?></p> <p style="font-size:0.8em"><?=$vantm?></p>
<script> <script>
<?php if ($scores){ ?>
$(function(){
fFillGraph=function(){ fFillGraph=function(){
var scores =[]; var scores =[];
var slabels =[]; var labels =[];
var tekstlabels =[]; var gemiddelde = [];
var results = <?php echo json_encode($scores); ?>
var ambitiescore= <?php echo $ambitie->gemscore; ?>;
var lijnAt = (((100 - parseFloat(ambitiescore)) / 10 ) * 25 ) +12;
var j=0;
var colors=[]
<?php foreach($scores as $index => $score){ ?> <?php foreach($scores as $index => $score){ ?>
labels.push('<?= $score->nummer ?>');
<?php if($totgem){ ?>
gemiddelde.push({ y: <?= intval($totgem) ?>,
name: '<?= $score->nummer ?>'
})
<?php } ?>
slabels.push('<?= $score->nummer ?>'); <?php if(intval($score->gem) > 0){ ?>
tekstlabels.push('<?= $score->omschrijving ?>'); scores.push({
// scores.push({ y: <?= intval($score->gem) ?>,
// y: <?= $score->gem ?>, color: '<?= isset($score->kleurcode)? $score->kleurcode : "#808080" ?>',
// color: '<?= isset($score->kleur)? $score->kleur : "#808080" ?>', name: '<?= $score->nummer ?>'
// name: '<?= $score->nummer ?>',
// });
scores.push(<?=$score->gem ?>)
colors.push('<?= isset($score->kleurcode) ? $score->kleurcode : "#808080" ?>')
<?php } ?> });// object
slabels.push('gem') <?php } //if
scores.push(<?= $totgem ?>) if(intval($score->gem) == 0){ ?>
colors.push('<?= isset($totgemkleur) ? $totgemkleur : "#808080" ?>') scores.push({
y: null,
var ctxSchoolijkpunt2=$("#schoolijkpunt2").get(0).getContext("2d"); color: '<?= isset($score->kleurcode)? $score->kleurcode : "#808080" ?>',
name: '<?= $score->nummer ?>'
var data5 = {labels :slabels,
datasets: [{ label: tekstlabels,
fillColor: "rgba(147,15,80,0.9)",
strokeColor: "rgba(111,11,61,1)",
highlightStroke: "rgba(222,22,123,1)",
data: scores
},
]}
Chart.types.Bar.extend({
name: "LineAlt",
initialize: function () {
Chart.types.Bar.prototype.initialize.apply(this, arguments);
},
draw: function () {
Chart.types.Bar.prototype.draw.apply(this, arguments); });//object
this.chart.ctx.beginPath(); <?php } //if
this.chart.ctx.moveTo(30,lijnAt ); }//foreach ?>
this.chart.ctx.lineTo(565, lijnAt);
this.chart.ctx.stroke();
this.chart.ctx.closePath();
}
});
BC51 = new Chart(ctxSchoolijkpunt2).LineAlt(data5,{
animation: false,
scaleShowGridLines:true,
scaleLineColor:"rgba(0,0,0,1)",
scaleOverride: true,
scaleBeginAtZero :true,
scaleSteps: 10,
scaleStepWidth: 10,
scaleStartValue: 0 ,
barValueSpacing: 10,
barStrokeWidth:1,
barDatasetSpacing:2
}); labels.push('gem')
labels.unshift(' ');
labels.push(' ');
scores.push({
y : <?= intval($totgem) ?>,
color : '<?= isset($score->kleurcode)? $score->kleurcode : "#808080" ?>',
name : 'gem'
});// object
scores.unshift({
y: null,
color: 'transparent',
name: ' '
})
scores.push({
y: null,
color: 'transparent',
name: ' '
})
gemiddelde.push({
y: <?= intval($totgem) ?>,
name: 'gemiddelde'
})
gemiddelde.unshift({
y: null,
name: ' '
})
gemiddelde.push({
y: <?= intval($totgem) ?>,
name: ' '
})
Highcharts.chart('schoolijkpunt2', {
chart: {
type: 'spline',
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
depth: 50,
viewDistance: 25
}
},
title: {
text: ' ',
},
credits: {
enabled: false
},
xAxis: {
categories: labels,
},
yAxis: {
min: 0,
max: 100,
tickInterval: 10,
title: {
text: 'procenten'
},
labels:{
style:{
fontSize: '8px'
}
}
},
plotOptions: {
column: {
pointWidth: null,
groepPadding: 0,
borderWidth: 0,
},
spline: {
color: '#4d4d4d'
},
},
series: [{
showInLegend: false,
animation: false,
type: 'column',
name: 'scores',
data: scores
},
{showInLegend: false,
animation: false,
marker: {
enabled: false
},
type: 'spline',
name: 'gemiddelde',
data: gemiddelde
}]
});
}(); }();
});
<?php } ?>
</script> </script>
</body>
</html>
application/views/monpas/sop/sopvoorpagina.php
+16 -7
View File
@@ -3,13 +3,22 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<style> <style>
body {font-size:12px;}
h1 {font-size: 1.6em;}
h2 {font-size: 1.4em;} body {font-size:12px;
h3 {font-size: 1.3em;} font-family: 'Verdana', 'sans-serif';}
h4 {font-size:1.2em;} h1 {font-size: 1.6em;
h5 {font-size: 1.1em;} font-family: 'Verdana', 'sans-serif';}
td {font-size:10px;} h2 {font-size: 1.4em;
font-family: 'Verdana', 'sans-serif';}
h3 {font-size: 1.3em;
font-family: 'Verdana', 'sans-serif';}
h4 {font-size:1.2em;
font-family: 'Verdana', 'sans-serif';}
h5 {font-size: 1.1em;
font-family: 'Verdana', 'sans-serif';}
td {font-size:10px;
font-family: 'Verdana', 'sans-serif';}
</style> </style>
</head> </head>
application/views/monpas/sopkeuze/divquotientgraf.php
+84 -59
View File
@@ -2,9 +2,9 @@
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('vendor_url'); ?>/css/chart.css" />
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script> <script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/chart.min.js"></script> <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
<style> <style>
body { body {
@@ -15,71 +15,96 @@
</style> </style>
</head> </head>
<body> <body>
<div>
<canvas id="grafquotient" height= "260" width="600" style="margin-top:5px;"> </canvas> <div id="graphXXX" style="margin-top:5px; height: 260px; width: 600px"> </div>
</div>
<script> <script>
<?php if ($data['groepen']){ ?>
$(function(){
fFillGraph= function(){ fFillGraph= function(){
var scores =[]; var scores =[];
var slabels =[]; var labels =[];
var counter = 0; <?php foreach($data['groepen'] as $index => $groep) { ?>
bartussenruimte = 5; labels.push('<?= $groep->naam ?>');
var groepen = <?php echo json_encode($data['groepen']); ?>
$.each(groepen, function(i,p){ <?php if(floatval($groep->dq) > 0){?>
scores[i] = p.dq; scores.push({
slabels[i] = p.naam; y: <?=(floatval($groep->dq))?>,
counter = counter + 1; name: '<?= $groep->naam ?>',
}); color: '#6F0B3D'
slabels[counter]='school'; })
scores[counter]=<?=$data['totdq']?>; <?php }
if(floatval($groep->dq) == 0){?>
var ctxDiversiteit=$("#grafquotient").get(0).getContext("2d"); scores.push({
y: null,
var data6 = {labels :slabels, name: '<?= $groep->naam ?>',
datasets: [{fillColor: "rgba(147,15,80,0.9)", color: '#6F0B3D'
strokeColor: "rgba(111,11,61,1)", })
highlightStroke: "rgba(222,22,123,1)", <?php }
data: scores}, }
]} ?>
labels.push('school');
Chart.types.Bar.extend({ scores.push({
name: "LineAlt", y: <?= $data['totdq'] ?>,
initialize: function () { name: 'school',
color:'#6F0B3D'
Chart.types.Bar.prototype.initialize.apply(this, arguments); })
}, Highcharts.chart('graphXXX', {
draw: function () { chart: {
type: 'column',
Chart.types.Bar.prototype.draw.apply(this, arguments); animation: false,
this.chart.ctx.beginPath(); backgroundColor: 'transparent',
// this.chart.ctx.moveTo(30,114); options3d: {
// this.chart.ctx.lineTo(580, 114); enabled: true,
this.chart.ctx.stroke(); alpha: 15,
this.chart.ctx.closePath(); beta: 15,
depth: 50,
viewDistance: 25
} }
}); },
title: {
text: ' ',
BC6 = new Chart(ctxDiversiteit).LineAlt(data6,{ },
animation:false, credits: {
scaleFontFamily: "'lato','Arial'", enabled: false
scaleColor:"rgba(0,0,0,1)", },
scaleShowGridLines:true, xAxis: {
scaleLineColor:"rgba(0,0,0,1)", categories: labels,
scaleOverride: true, },
scaleBeginAtZero :true, yAxis: {
scaleSteps: 25, min: 0,
scaleStepWidth: 0.2, tickInterval: 0.2,
scaleStartValue: 0 , title: {
barValueSpacing: bartussenruimte, text: 'DQ'
barStrokeWidth:1, },
barDatasetSpacing:2, labels:{
toottipFontFamily:"'lato','Arial'", style:{
showTooltips : false fontSize: '8px'
});
}
}
},
plotOptions: {
column: {
pointWidth: null,
groepPadding: 0,
borderWidth: 0,
color: '#7f036C'
}
},
series: [{
showInLegend: false,
animation: false,
name: 'groepen',
data: scores
} ]
});
}()
});
<?php } ?>
}();
</script> </script>
<p style="font-size: 10px;"><span>Versie: </span><?php if(isset($data['versie'])){echo $data['versie']->naam; }?></p> <p style="font-size: 10px;"><span>Versie: </span><?php if(isset($data['versie'])){echo $data['versie']->naam; }?></p>
</body> </body>
application/views/monpas/sopkeuze/divquotientgrafso.php
+151 -61
View File
@@ -1,10 +1,9 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('vendor_url'); ?>/css/chart.css" />
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script> <script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/chart.min.js"></script> <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
<style> <style>
body { body {
@@ -18,70 +17,161 @@
<body> <body>
<div> <div>
<canvas id="grafquotientso" height= "260" width="600" style="margin-top:5px;"> </canvas> <div id="graphSOXXX" style="margin-top:5px;height: 260px; width: 600px"> </div>
</div> </div>
<script> <script>
fFillGraph= function(){ <?php if ($data['groepen']){ ?>
var scores =[]; $(function(){
var slabels =[]; fFillGraph= function(){
var counter = 0; var scores =[];
bartussenruimte = 5; var labels =[];
var groepen = <?php echo json_encode($data['groepen']); ?> <?php foreach($data['groepen'] as $index => $groep) { ?>
labels.push('<?= $groep->naam ?>');
$.each(groepen, function(i,p){
scores[i] = p.dq;
slabels[i] = p.naam;
counter = counter + 1;
});
slabels[counter]='school';
scores[counter]=<?=$data['totdq']?>;
var ctxDiversiteit=$("#grafquotientso").get(0).getContext("2d");
var data6 = {labels :slabels,
datasets: [{fillColor: "rgba(147,15,80,0.9)",
strokeColor: "rgba(111,11,61,1)",
highlightStroke: "rgba(222,22,123,1)",
data: scores},
]}
Chart.types.Bar.extend({ <?php if(floatval($groep->dq) > 0){?>
name: "LineAlt", scores.push({
initialize: function () { y: <?=(floatval($groep->dq))?>,
name: '<?= $groep->naam ?>',
color: '#6F0B3D'
})
<?php }
if(floatval($groep->dq) == 0){?>
scores.push({
y: null,
name: '<?= $groep->naam ?>',
color: '#6F0B3D'
})
<?php }
}
?>
labels.push('school');
scores.push({
y: <?= $data['totdq'] ?>,
name: 'school',
color:'#6F0B3D'
})
Highcharts.chart('graphSOXXX', {
chart: {
type: 'column',
animation: false,
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
depth: 50,
viewDistance: 25
}
},
title: {
text: ' ',
Chart.types.Bar.prototype.initialize.apply(this, arguments); },
}, credits: {
draw: function () { enabled: false
},
xAxis: {
categories: labels,
},
yAxis: {
min: 0,
tickInterval: 0.2,
title: {
text: 'DQ'
},
labels:{
style:{
fontSize: '8px'
Chart.types.Bar.prototype.draw.apply(this, arguments); }
this.chart.ctx.beginPath(); }
// this.chart.ctx.moveTo(30,114); },
// this.chart.ctx.lineTo(580, 114); plotOptions: {
this.chart.ctx.stroke(); column: {
this.chart.ctx.closePath(); pointWidth: null,
} groepPadding: 0,
}); borderWidth: 0,
color: '#7f036C'
BC6 = new Chart(ctxDiversiteit).LineAlt(data6,{ }
animation:false, },
scaleFontFamily: "'lato','Arial'", series: [{
scaleColor:"rgba(0,0,0,1)", showInLegend: false,
scaleShowGridLines:true, animation: false,
scaleLineColor:"rgba(0,0,0,1)", name: 'groepen',
scaleOverride: true, data: scores
scaleBeginAtZero :true, } ]
scaleSteps: 6, });
scaleStepWidth: 0.5,
scaleStartValue: 0 ,
barValueSpacing: bartussenruimte,
barStrokeWidth:1,
barDatasetSpacing:2,
toottipFontFamily:"'lato','Arial'",
showTooltips : false
});
}(); // Highcharts.chart('graphSOXXX', {
// chart: {
// type: 'column'
// },
// title: {
// text: 'Monthly Average Rainfall'
// },
// subtitle: {
// text: 'Source: WorldClimate.com'
// },
// xAxis: {
// categories: [
// 'Jan',
// 'Feb',
// 'Mar',
// 'Apr',
// 'May',
// 'Jun',
// 'Jul',
// 'Aug',
// 'Sep',
// 'Oct',
// 'Nov',
// 'Dec'
// ],
// crosshair: true
// },
// yAxis: {
// min: 0,
// title: {
// text: 'Rainfall (mm)'
// }
// },
// tooltip: {
// headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
// pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
// '<td style="padding:0"><b>{point.y:.1f} mm</b></td></tr>',
// footerFormat: '</table>',
// shared: true,
// useHTML: true
// },
// plotOptions: {
// column: {
// pointPadding: 0.2,
// borderWidth: 0
// }
// },
// series: [{
// name: 'Tokyo',
// data: [49.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4]
//
// }, {
// name: 'New York',
// data: [83.6, 78.8, 98.5, 93.4, 106.0, 84.5, 105.0, 104.3, 91.2, 83.5, 106.6, 92.3]
//
// }, {
// name: 'London',
// data: [48.9, 38.8, 39.3, 41.4, 47.0, 48.3, 59.0, 59.6, 52.4, 65.2, 59.3, 51.2]
//
// }, {
// name: 'Berlin',
// data: [42.4, 33.2, 34.5, 39.7, 52.6, 75.5, 57.4, 60.4, 47.6, 39.1, 46.8, 51.1]
//
// }]
// });
}()
});
<?php } ?>
</script> </script>
</body> </body>
</html> </html>
application/views/monpas/sopkeuze/ijkgrafiekgemiddeld.php
+28 -22
View File
@@ -3,6 +3,8 @@
<head> <head>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script> <script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script> <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
<style> <style>
body { body {
font-family: 'Verdana', 'sans-serif'; font-family: 'Verdana', 'sans-serif';
@@ -50,20 +52,23 @@
<?php foreach($lijst->scores as $index2 => $score){ <?php foreach($lijst->scores as $index2 => $score){
$kleur = '#808080'; $kleur = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F' && isset($score->kleur)) $kleur = $score->kleur; if($score->disabled == 'F' && $score->disablenvt == 'F' && isset($score->kleur)) $kleur = $score->kleur;?>
labels.push('<?php $score->nummer ?>');
<?php if(intval($score->gem)> 0){ ?>
?>
labels.push(<?php $score->nummer ?>);
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?= $score->gem ?>,
color: '<?=$kleur ?>', color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
soort: 'score',
versie: <?= $lijst->periodenummer ?>
}) })
<?php } // foreach lijstscores ?> <?php }//if
if(intval($score->gem) == 0){ ?>
scores.push({
y: null,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
})
<?php }//if
} // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>); verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>; var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
@@ -71,8 +76,6 @@
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>, { y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000', color: '#000000',
name: '', name: '',
soort: 'ambitie',
versie: <?=$lijst->periodenummer ?>
} }
); );
@@ -81,8 +84,6 @@
y : 0, y : 0,
color : 'transparent', color : 'transparent',
name : '0', name : '0',
soort : 'extra',
versie : <?= $lijst->periodenummer ?>,
}; };
scores.unshift(legescore); scores.unshift(legescore);
@@ -135,6 +136,18 @@
var ijkgrafiek; var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartSopIJkGem', { ijkgrafiek = Highcharts.chart('chartSopIJkGem', {
chart:{
animation: false,
type: 'column',
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
depth: 50,
viewDistance: 25
}
},
title:{ title:{
text:'' text:''
}, },
@@ -144,23 +157,16 @@
xAxis: { xAxis: {
type: 'category', type: 'category',
categories: xas, categories: xas,
title:{
text: xastitel
}
}, },
yAxis: { yAxis: {
min:0, min:0,
max: 100, max: 100,
title: { title: false,
text: 'Scores'
}
}, },
legend: { legend: {
enabled: false enabled: false
}, },
plotOptions: { plotOptions: {
column:{ column:{
pointPadding: 0.05, pointPadding: 0.05,
borderWidth:0 borderWidth:0
@@ -171,7 +177,7 @@
enabled: true, enabled: true,
inside: true, inside: true,
align: 'center', align: 'center',
verticalAlign: 'bottom', verticalAlign: 'top',
color: '#404040', color: '#404040',
style: { style: {
textOutline: false textOutline: false
application/views/monpas/sopkeuze/ijkpuntengrafiek.php
+28 -17
View File
@@ -6,6 +6,8 @@
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js?v=1.17.26"></script> <script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js?v=1.17.26"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script> <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
<style> <style>
body { body {
font-family: 'Verdana', 'sans-serif'; font-family: 'Verdana', 'sans-serif';
@@ -57,25 +59,30 @@
<?php foreach($lijst->scores as $index2 => $score){ <?php foreach($lijst->scores as $index2 => $score){
?> ?>
labels.push(<?php $score->nummer ?>); labels.push('<?= $score->nummer ?>');
<?php if(intval($score->gem) > 0){ ?>
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?= intval($score->gem) ?>,
color: '<?=$score->kleur ?>', color: '<?=$score->kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
soort: 'score',
versie: <?= $lijst->periodenummer ?>
<?php ?>
}); });
<?php } // foreach lijstscores ?> <?php }
if (intval($score->gem) == 0){ ?>
scores.push({
y: null,
color: '<?=$score->kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } //if
} // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>); verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>; var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push( ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>, { y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000', color: '#000000',
name: '', name: ''
soort: 'ambitie',
versie: <?=$lijst->periodenummer ?>
} }
); );
@@ -83,11 +90,7 @@
var legescore ={ var legescore ={
y : 0, y : 0,
color : 'transparent', color : 'transparent',
name : '0', name : '0'
soort : 'extra',
versie : '',
vantm : '<?= $lijst->vantm ?>',
omschrijving: ''
}; };
scores.unshift(legescore); scores.unshift(legescore);
@@ -112,7 +115,6 @@
var extralijn = { var extralijn = {
y: ambitiewaarde, y: ambitiewaarde,
name: '', name: '',
soort: 'extra'
}; };
ambities.unshift(extralijn); ambities.unshift(extralijn);
ambities.push(extralijn); ambities.push(extralijn);
@@ -142,7 +144,16 @@
var ijkgrafiek; var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartSopIJk', { ijkgrafiek = Highcharts.chart('chartSopIJk', {
chart:{ chart:{
animation: false animation: false,
type: 'column',
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
depth: 50,
viewDistance: 25
}
}, },
title:{ title:{
text:'' text:''
@@ -185,7 +196,7 @@
enabled: true, enabled: true,
inside: true, inside: true,
align: 'center', align: 'center',
verticalAlign: 'bottom', verticalAlign: 'top',
color: '#404040', color: '#404040',
style: { style: {
textOutline: false textOutline: false
public/css/monpas/main.css
-3
View File
@@ -930,7 +930,6 @@ tr.selected, td.selected{
background-color: #c7b87e; background-color: #c7b87e;
color: #ffffff; color: #ffffff;
}*/ }*/
.cirkelgradient{ .cirkelgradient{
background-color: #930f50; background-color: #930f50;
@@ -1279,5 +1278,3 @@ z-index: 50;
box-shadow: none; box-shadow: none;
} }
public/js/monpas/models/compactsopmodel.js
+6 -3
View File
@@ -576,9 +576,10 @@ mh.initCompactSopModel = function(){
var self = mh.CompactSopModel; var self = mh.CompactSopModel;
var onderdeel = data; var onderdeel = data;
var dit = this; var dit = this;
if (dit.naam) { if (dit.kalenderjaar()) {
self.selectedBudgetVersie(this); self.selectedBudgetVersie(dit.kalenderjaar());
} }
return true; return true;
}, },
@@ -645,8 +646,9 @@ mh.initCompactSopModel = function(){
} }
if(self.selectedBudgetVersie()){ if(self.selectedBudgetVersie()){
self.selectedOnderdeel().gekozenVersie(self.selectedBudgetVersie().kalenderjaar()); self.selectedOnderdeel().gekozenVersie(self.selectedBudgetVersie());
} }
self.fOnderdelenInArray(); self.fOnderdelenInArray();
return true; return true;
}, },
@@ -881,6 +883,7 @@ mh.initCompactSopModel = function(){
}; };
$.post("index.php/monpas/compactsop/maakPDF/", submitData, function(result){ $.post("index.php/monpas/compactsop/maakPDF/", submitData, function(result){
window.open('tmp/temp' + result + '.html'); window.open('tmp/temp' + result + '.html');
public/js/monpas/models/ijkpuntenmodel.js
+26 -10
View File
@@ -671,7 +671,7 @@ ls.initIJkpuntenModel = function(){
} }
labels.push(g.nummer); labels.push(g.nummer);
scores.push({ y : parseFloat(g.gem), scores.push({ y : Number(g.gem) == 0 ? null: Number(g.gem) ,
color : g.kleur, color : g.kleur,
name : g.nummer }); name : g.nummer });
@@ -683,10 +683,6 @@ ls.initIJkpuntenModel = function(){
y: ambitiewaarde, y: ambitiewaarde,
color: '#000000', color: '#000000',
name: '', name: '',
soort: 'ambitie',
versie: l.periodenummer,
vantm: l.vantm,
omschrijving: g.omschrijving
} }
); );
}); });
@@ -695,10 +691,6 @@ ls.initIJkpuntenModel = function(){
y : null, y : null,
color : 'transparent', color : 'transparent',
name : '0', name : '0',
soort : 'extra',
versie : l.periodenummer,
vantm : l.vantm,
omschrijving: ''
}; };
@@ -721,7 +713,6 @@ ls.initIJkpuntenModel = function(){
var extralijn = { var extralijn = {
y: ambitiewaarde, y: ambitiewaarde,
name: '', name: '',
soort: 'extra'
}; };
ambities.unshift(extralijn); ambities.unshift(extralijn);
ambities.push(extralijn); ambities.push(extralijn);
@@ -741,6 +732,29 @@ ls.initIJkpuntenModel = function(){
self.ijkgrafiek = Highcharts.chart('hc-chart1', { self.ijkgrafiek = Highcharts.chart('hc-chart1', {
chart: {
type: 'column',
options3d: {
enabled: true,
alpha: 20,
beta: 20,
viewDistance: 40,
depth: 75,
frame: {
left: {
color:'#f8f8f8'
},
bottom: {
color:'#d9d9d9',
visible: 'auto'
},
back: {
color:'#f8f8f8'
},
}
}
},
title: { title: {
text: '' text: ''
}, },
@@ -765,6 +779,7 @@ ls.initIJkpuntenModel = function(){
xAxis: { xAxis: {
type: 'category', type: 'category',
categories: xas, categories: xas,
skew3d: true,
title:{ title:{
text: xastitel text: xastitel
} }
@@ -772,6 +787,7 @@ ls.initIJkpuntenModel = function(){
yAxis: { yAxis: {
min:0, min:0,
max: 100, max: 100,
skew3d: true,
title: { title: {
text: 'Scores' text: 'Scores'
} }
public/js/monpas/models/inspectiematrixmodel.js
+403 -407
View File
@@ -1,422 +1,418 @@
$(function(){ $(function(){
//instrument verwijderd feb '22
function fAddSWV(p) { // function fAddSWV(p) {
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.plaats = p.plaats
this.geopend = ko.observable(false); // this.geopend = ko.observable(false);
dit.kamers = ko.observableArray([]); // dit.kamers = ko.observableArray([]);
if (p.kamers) { // if (p.kamers) {
$.each(p.kamers, function (j, k) { // $.each(p.kamers, function (j, k) {
dit.kamers.push(new fAddKamer(k)); // dit.kamers.push(new fAddKamer(k));
}) // })
} // }
} // }
function fAddKamer(p) { // function fAddKamer(p) {
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.plaats = p.plaats
this.geopend = ko.observable(false); // this.geopend = ko.observable(false);
this.bgs = ko.observableArray([]); // this.bgs = ko.observableArray([]);
//
// if (p.bgs) {
// $.each(p.bgs, function (x, z) {
// dit.bgs.push(new fAddBG(z));
// })
// }
// }
if (p.bgs) { // function fAddBG(p) {
$.each(p.bgs, function (x, z) { // var dit = this;
dit.bgs.push(new fAddBG(z)); // this.id = p.id;
}) // this.soort = p.soort
} // this.naam = p.naam
} // this.plaats = p.plaats
// this.geopend = ko.observable(false);
// this.scholen = ko.observableArray([]);
// if (p.scholen) {
// $.each(p.scholen, function (a, b) {
// dit.scholen.push(new fAddSchool(b));
// })
// }
// }
function fAddBG(p) { // function fAddSchool(p) {
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.brin = p.brin
this.geopend = ko.observable(false); // this.plaats = p.plaats
this.scholen = ko.observableArray([]); // }
if (p.scholen) {
$.each(p.scholen, function (a, b) {
dit.scholen.push(new fAddSchool(b));
})
}
}
function fAddSchool(p) { // function fAddOrgversion(p) {
var dit = this; // this.id = p.id; //orgversion id
this.id = p.id; // this.periodenummer = p.periodenummer
this.soort = p.soort // this.versie_id = p.versie_id
this.naam = p.naam // this.naam = p.naam
this.brin = p.brin // this.geldigvanaf = p.geldigvanaf;
this.plaats = p.plaats // this.geldigtm = p.geldigtm;
} // this.invullentm = p.invullentm;
// this.info = ko.computed(function(){
// var versieInfostr=this.naam;
// versieInfostr += "- periode " + this.periodenummer +
// ", " + this.geldigvanaf + " t/m " + this.geldigtm;
// return versieInfostr;
// }
// ,this)
// }
function fAddOrgversion(p) { // function fAddIndeling(p) {
this.id = p.id; //orgversion id // var dit = this;
this.periodenummer = p.periodenummer // this.id = p.waardeid;
this.versie_id = p.versie_id // this.naam = p.naam
this.naam = p.naam // this.volgorde = p.volgorde;
this.geldigvanaf = p.geldigvanaf; // this.organisaties = ko.observableArray([]);
this.geldigtm = p.geldigtm; // if (p.users) {
this.invullentm = p.invullentm; // $.each(p.users, function (j, k) {
this.info = ko.computed(function(){ // dit.organisaties.push(new fAddOrgIndeling(k));
var versieInfostr=this.naam; // })
versieInfostr += "- periode " + this.periodenummer + // }
", " + this.geldigvanaf + " t/m " + this.geldigtm; // }
return versieInfostr;
}
,this)
}
function fAddIndeling(p) { // function fAddOrgIndeling(k) {
var dit = this; // var dit = this;
this.id = p.waardeid; // this.subject = k.fullname;
this.naam = p.naam // this.naamkort = k.naamkort;
this.volgorde = p.volgorde; // this.brin = '';
this.organisaties = ko.observableArray([]); // if (k.brin) this.brin = k.brin;
if (p.users) { // this.fvid = k.filledversionid;
$.each(p.users, function (j, k) { //
dit.organisaties.push(new fAddOrgIndeling(k)); // this.results = ko.observableArray([]);
}) // if (k.oordelen) {
} // $.each(k.oordelen, function (j, k) {
} // dit.results.push(new fAddResult(k));
// })
// }
// }
function fAddOrgIndeling(k) { // function fAddIJkpunt(p) {
var dit = this; // this.nummer = p.nummer;
this.subject = k.fullname; // this.omschrijving = p.omschrijving;
this.naamkort = k.naamkort; // this.toelichting = p.toelichting;
this.brin = ''; // }
if (k.brin) this.brin = k.brin;
this.fvid = k.filledversionid;
this.results = ko.observableArray([]); // function fAddResult(k) {
if (k.oordelen) { //
$.each(k.oordelen, function (j, k) { // var dit = this;
dit.results.push(new fAddResult(k)); // this.num = k.nummer;
}) // this.normId = k.normID;
} // this.kleur = k.kleur;
} // this.waarde = ko.observable("N");
// switch(dit.normId){
function fAddIJkpunt(p) { // case "1" : dit.waarde("Z"); break;
this.nummer = p.nummer; // case "2" : dit.waarde("O"); break;
this.omschrijving = p.omschrijving; // case "3" : dit.waarde("V"); break;
this.toelichting = p.toelichting; // case "4" : dit.waarde ("G"); break;
} // }
// }
function fAddResult(k) {
var dit = this;
this.num = k.nummer;
this.normId = k.normID;
this.kleur = k.kleur;
this.waarde = ko.observable("N");
switch(dit.normId){
case "1" : dit.waarde("Z"); break;
case "2" : dit.waarde("O"); break;
case "3" : dit.waarde("V"); break;
case "4" : dit.waarde ("G"); break;
}
}
function fAddCriteria(c) {
var dit = this;
this.criteriumid = ko.observable(c.id);
this.naam = ko.observable(c.naam);
}
ls.initInspectiematrixModel = function(){
if (ls.InspectiematrixModel !== undefined){
ls.InspectiematrixModel.initModel();
}
else {
ls.InspectiematrixModel = {
bgs : ko.observableArray([]),
ijkpunten : ko.observableArray([]),
toporg : ko.observableArray([]),
kleuren : ko.observableArray([]),
criteria : ko.observableArray([]),
indelingen : ko.observableArray([]),
selectedOrg : ko.observable(''),
orgsoort : ko.observable(1),
orgversions : ko.observableArray([]),
selectedOrgversion : ko.observable(),
selectedCriterium : ko.observable(0),
versievorm : ko.observable(),
inzage : ko.observable(),
kleurlegenda : ko.observable(''),
invulid : ko.observable(''),
bezig : ko.observable(false),
druk : ko.observable(false),
aantalY : ko.observable(0),
data : ko.observable(false),
kolombreedte : ko.pureComputed(function(){
var row = 708;
var orgbreedte = 250
var aantal = 15;
if(ls.InspectiematrixModel.aantalY()> 1) {
aantal = ls.InspectiematrixModel.aantalY();
}
var breedte = Math.floor((row - orgbreedte)/aantal);
return breedte;
}),
// ls.initInspectiematrixModel = function(){
orgbreedtehead : ko.pureComputed(function(){ // if (ls.InspectiematrixModel !== undefined){
var aantal = 15; // ls.InspectiematrixModel.initModel();
if(ls.InspectiematrixModel.aantalY()> 1) { // }
aantal = ls.InspectiematrixModel.aantalY(); // else {
} // ls.InspectiematrixModel = {
orgpassend = Math.floor(708 - (aantal * ls.InspectiematrixModel.kolombreedte())) // bgs : ko.observableArray([]),
return orgpassend; // ijkpunten : ko.observableArray([]),
}), // toporg : ko.observableArray([]),
// kleuren : ko.observableArray([]),
orgbreedtebody : ko.pureComputed(function(){ // criteria : ko.observableArray([]),
var aantal = 15; // indelingen : ko.observableArray([]),
if(ls.InspectiematrixModel.aantalY()> 1) { // selectedOrg : ko.observable(''),
aantal = ls.InspectiematrixModel.aantalY(); // orgsoort : ko.observable(1),
} // orgversions : ko.observableArray([]),
var orgpassend = Math.floor(708- (aantal * ls.InspectiematrixModel.kolombreedte())) // selectedOrgversion : ko.observable(),
return orgpassend; // selectedCriterium : ko.observable(0),
}), // versievorm : ko.observable(),
// inzage : ko.observable(),
initBindings :function(){ // kleurlegenda : ko.observable(''),
var self = ls.InspectiematrixModel; // invulid : ko.observable(''),
if (!ko.dataFor(document.getElementById('paginspectiematrix')) ) { // bezig : ko.observable(false),
ko.applyBindings(ls.InspectiematrixModel, document.getElementById("paginspectiematrix")); // druk : ko.observable(false),
} // aantalY : ko.observable(0),
self.initModel(); // data : ko.observable(false),
}, // kolombreedte : ko.pureComputed(function(){
initModel: function(){ // var row = 708;
var self = ls.InspectiematrixModel; // var orgbreedte = 250
self.toporg(''); // var aantal = 15;
self.fCheckInzageRecht(); // if(ls.InspectiematrixModel.aantalY()> 1) {
$.post("index.php/monpas/rapijkpunten/getorgs", function (data) { // aantal = ls.InspectiematrixModel.aantalY();
if (data.organisatie) { // }
self.orgsoort(data.soort); // var breedte = Math.floor((row - orgbreedte)/aantal);
switch (self.orgsoort()) { // return breedte;
case 1: // }),
self.toporg(new fAddSWV(data.organisatie)); //
break; //
case 2: // orgbreedtehead : ko.pureComputed(function(){
self.toporg(new fAddKamer(data.organisatie)); // var aantal = 15;
break; // if(ls.InspectiematrixModel.aantalY()> 1) {
case 3: // aantal = ls.InspectiematrixModel.aantalY();
self.toporg(new fAddBG(data.organisatie)); // }
break; // orgpassend = Math.floor(708 - (aantal * ls.InspectiematrixModel.kolombreedte()))
case 4: // return orgpassend;
self.toporg(new fAddSchool(data.organisatie)); // }),
break; //
} // orgbreedtebody : ko.pureComputed(function(){
self.selectedOrg(self.toporg()); // var aantal = 15;
// if(ls.InspectiematrixModel.aantalY()> 1) {
self.fSwitchLevel(); // aantal = ls.InspectiematrixModel.aantalY();
} // }
}, 'json'); // var orgpassend = Math.floor(708- (aantal * ls.InspectiematrixModel.kolombreedte()))
// return orgpassend;
}, // }),
fToggleGeopend: function () { //
this.geopend(!this.geopend()); // initBindings :function(){
}, // var self = ls.InspectiematrixModel;
// if (!ko.dataFor(document.getElementById('paginspectiematrix')) ) {
fCheckInzageRecht: function () { // ko.applyBindings(ls.InspectiematrixModel, document.getElementById("paginspectiematrix"));
var self = ls.InspectiematrixModel; // }
$.post("index.php/monpas/rapmatrix/checkinzage/", function (data) { // self.initModel();
if (data) { // },
self.inzage(data); // initModel: function(){
} // var self = ls.InspectiematrixModel;
}, 'json'); // self.toporg('');
}, // self.fCheckInzageRecht();
// $.post("index.php/monpas/rapijkpunten/getorgs", function (data) {
fCheckOwner: function () { // if (data.organisatie) {
var self = ls.InspectiematrixModel; // self.orgsoort(data.soort);
var submitData = { // switch (self.orgsoort()) {
"orgversieid": self.selectedOrgversion().id, // case 1:
"orgid": self.selectedOrg().id, // self.toporg(new fAddSWV(data.organisatie));
} // break;
// case 2:
$.post("index.php/monpas/rapmatrix/checkowner/", submitData, function (data) { // self.toporg(new fAddKamer(data.organisatie));
if (data) { // break;
self.invulid(parseInt(data)); // case 3:
} // self.toporg(new fAddBG(data.organisatie));
}, 'json'); // break;
}, // case 4:
// self.toporg(new fAddSchool(data.organisatie));
fSwitchOrg: function () { // break;
var self = ls.InspectiematrixModel; // }
if (self.selectedOrg() == undefined) return; // self.selectedOrg(self.toporg());
if (this.id == self.selectedOrg().id) return; //
self.selectedOrg(this); // self.fSwitchLevel();
self.fSwitchLevel(); // }
}, // }, 'json');
fSwitchLevel: function () { //
var self = ls.InspectiematrixModel; // },
if (self.selectedOrg() == undefined) return; // fToggleGeopend: function () {
// this.geopend(!this.geopend());
var versieid = null; // },
if(self.selectedOrgversion() != undefined ) { //
versieid = self.selectedOrgversion().id; // fCheckInzageRecht: function () {
} // var self = ls.InspectiematrixModel;
// $.post("index.php/monpas/rapmatrix/checkinzage/", function (data) {
// if (data) {
$.post("index.php/monpas/rapijkpunten/getperiodes3/" + self.selectedOrg().id, function (data) { // self.inzage(data);
self.bezig(true); // }
self.orgversions.removeAll(); // }, 'json');
if (data) { // },
$.each(data, function (i, p) { //
self.orgversions.push(new fAddOrgversion(p)); // fCheckOwner: function () {
}) // var self = ls.InspectiematrixModel;
if(versieid != null ){ // var submitData = {
$.each(self.orgversions(), function (i, q) { // "orgversieid": self.selectedOrgversion().id,
if (q.id == versieid) { // "orgid": self.selectedOrg().id,
self.selectedOrgversion(q); // }
return false; //
} // $.post("index.php/monpas/rapmatrix/checkowner/", submitData, function (data) {
}); // if (data) {
} // self.invulid(parseInt(data));
if(self.toporg().soort == 4) { // }
self.bezig(false); // }, 'json');
self.fChangeVersion2(); // },
} //
else { // fSwitchOrg: function () {
self.fGetCriteria(); // var self = ls.InspectiematrixModel;
} // if (self.selectedOrg() == undefined) return;
// if (this.id == self.selectedOrg().id) return;
// self.selectedOrg(this);
} // self.fSwitchLevel();
}, 'json') // },
.always(self.bezig(false)); // fSwitchLevel: function () {
}, // var self = ls.InspectiematrixModel;
fChangeVersion2: function () { // if (self.selectedOrg() == undefined) return;
var self = ls.InspectiematrixModel; //
if (self.selectedOrgversion() == undefined) return; // var versieid = null;
if (self.bezig()) return; // if(self.selectedOrgversion() != undefined ) {
// versieid = self.selectedOrgversion().id;
self.fHaalScoresOp(); // }
}, //
//
fHaalScoresOp: function(){ // $.post("index.php/monpas/rapijkpunten/getperiodes3/" + self.selectedOrg().id, function (data) {
var self = ls.InspectiematrixModel; // self.bezig(true);
if(self.druk()) return; // self.orgversions.removeAll();
var sorteerid = 0; // if (data) {
if(self.selectedCriterium()) // $.each(data, function (i, p) {
{ // self.orgversions.push(new fAddOrgversion(p));
sorteerid = self.selectedCriterium().criteriumid(); // })
} // if(versieid != null ){
// $.each(self.orgversions(), function (i, q) {
// if (q.id == versieid) {
// self.selectedOrgversion(q);
var submitData = { // return false;
'orgid' : self.selectedOrg().id, // }
'orgsoort' : self.selectedOrg().soort, // });
'criteriumid' : sorteerid, // }
'orgversieid' : self.selectedOrgversion().id, // if(self.toporg().soort == 4) {
} // self.bezig(false);
// self.fChangeVersion2();
// showAjaxLoader(); // }
// else {
$.post("index.php/monpas/rapmatrix/haalInspectieScoresOp", submitData, function (results) { // self.fGetCriteria();
self.indelingen.removeAll(); // }
self.ijkpunten.removeAll(); //
if (results) { //
self.fCheckOwner(); // }
self.aantalY(results.aantalY); // }, 'json')
self.data(results.uitslagen); // .always(self.bezig(false));
self.kleurlegenda(results.kleurtabel); // },
$.each(results.ijkpunten, function (i, p){ // fChangeVersion2: function () {
self.ijkpunten.push(new fAddIJkpunt(p)); // var self = ls.InspectiematrixModel;
}); // each // if (self.selectedOrgversion() == undefined) return;
// if (self.bezig()) return;
$.each(results.labels, function (i, p) { //
self.indelingen.push(new fAddIndeling(p)); // self.fHaalScoresOp();
}); // each // },
//
// fHaalScoresOp: function(){
}; // var self = ls.InspectiematrixModel;
// if results // if(self.druk()) return;
// var sorteerid = 0;
}, 'json'); // if(self.selectedCriterium())
// hideAjaxLoader(); // {
}, // sorteerid = self.selectedCriterium().criteriumid();
// }
fGetCriteria: function(){ //
var self = ls.InspectiematrixModel; //
var submitData ={ //
'orgid' : self.selectedOrg().id, // var submitData = {
'orgsoort' : self.selectedOrg().soort // 'orgid' : self.selectedOrg().id,
} // 'orgsoort' : self.selectedOrg().soort,
// 'criteriumid' : sorteerid,
$.post("index.php/monpas/rapmatrix/getCriteriaSWV", submitData, function(results) { // 'orgversieid' : self.selectedOrgversion().id,
self.druk(true); // }
self.criteria.removeAll(); //
if (results) { // // showAjaxLoader();
$.each(results, function (i, c) { //
self.criteria.push(new fAddCriteria(c)); // $.post("index.php/monpas/rapmatrix/haalInspectieScoresOp", submitData, function (results) {
if (c.id == 1000) { // self.indelingen.removeAll();
self.selectedCriterium(c.id); // self.ijkpunten.removeAll();
return false; // if (results) {
} // self.fCheckOwner();
}); // each // self.aantalY(results.aantalY);
} // self.data(results.uitslagen);
// self.kleurlegenda(results.kleurtabel);
self.druk(false); // $.each(results.ijkpunten, function (i, p){
self.fChangeCriterium(); // self.ijkpunten.push(new fAddIJkpunt(p));
},'json') // }); // each
.always(self.druk(false), self.bezig(false)); //
}, // $.each(results.labels, function (i, p) {
// self.indelingen.push(new fAddIndeling(p));
fChangeCriterium: function(){ // }); // each
var self = ls.InspectiematrixModel; //
if (self.selectedOrgversion() == undefined) return; //
if (self.druk() ) return; // };
self.fHaalScoresOp(); // // if results
}, //
// }, 'json');
fToonToelichting: function () { // // hideAjaxLoader();
var self = ls.InspectiematrixModel; // },
var dit = this; //
apprise("Toelichting bij ijkpunt " + dit.nummer + ":<br/><i>" + dit.omschrijving + "</i><br/><hr/> " + dit.toelichting); // fGetCriteria: function(){
}, // var self = ls.InspectiematrixModel;
// var submitData ={
fPrint:function(){ // 'orgid' : self.selectedOrg().id,
var self =ls.InspectiematrixModel; // 'orgsoort' : self.selectedOrg().soort
// if (self.bezig()) return; // }
// self.bezig(true); //
// $.post("index.php/monpas/rapmatrix/getCriteriaSWV", submitData, function(results) {
var criterium= null; // self.druk(true);
if(self.selectedCriterium()){ // self.criteria.removeAll();
criterium = self.selectedCriterium().naam(); // if (results) {
} // $.each(results, function (i, c) {
var indelingen = ko.toJSON(self.indelingen()); // self.criteria.push(new fAddCriteria(c));
var ijkpunten = ko.toJSON(self.ijkpunten); // if (c.id == 1000) {
var data ={ // self.selectedCriterium(c.id);
'orgversie' : self.selectedOrgversion(), // return false;
'organisatie' : self.selectedOrg(), // }
'indelingen' : indelingen, // }); // each
'ijkpunten' : ijkpunten, // }
'criterium' : criterium, //
'kopbreedte' : self.orgbreedtehead()+"px", // self.druk(false);
'orgbreedte' : self.orgbreedtebody()+"px", // self.fChangeCriterium();
'kolombreedte' : self.kolombreedte()+"px", // },'json')
'uitslagen' : self.data(), // .always(self.druk(false), self.bezig(false));
'invulid' : self.invulid(), // },
'inzage' : self.inzage(), //
'kleurlegenda' : self.kleurlegenda(), // fChangeCriterium: function(){
} // var self = ls.InspectiematrixModel;
// if (self.selectedOrgversion() == undefined) return;
data=JSON.stringify(data); // if (self.druk() ) return;
var $form = $("<form method='post' action='index.php/monpas/rapmatrix/printinspectie' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) ); // self.fHaalScoresOp();
$form.appendTo("body").submit(); // },
} //
// fToonToelichting: function () {
} ; // definition van model // var self = ls.InspectiematrixModel;
ls.InspectiematrixModel.initBindings(); // var dit = this;
// apprise("Toelichting bij ijkpunt " + dit.nummer + ":<br/><i>" + dit.omschrijving + "</i><br/><hr/> " + dit.toelichting);
}; // else // },
}// function initInspectieInspectiematrixModel //
// fPrint:function(){
// var self =ls.InspectiematrixModel;
// // if (self.bezig()) return;
// // self.bezig(true);
//
// var criterium= null;
// if(self.selectedCriterium()){
// criterium = self.selectedCriterium().naam();
// }
// var indelingen = ko.toJSON(self.indelingen());
// var ijkpunten = ko.toJSON(self.ijkpunten);
// var data ={
// 'orgversie' : self.selectedOrgversion(),
// 'organisatie' : self.selectedOrg(),
// 'indelingen' : indelingen,
// 'ijkpunten' : ijkpunten,
// 'criterium' : criterium,
// 'kopbreedte' : self.orgbreedtehead()+"px",
// 'orgbreedte' : self.orgbreedtebody()+"px",
// 'kolombreedte' : self.kolombreedte()+"px",
// 'uitslagen' : self.data(),
// 'invulid' : self.invulid(),
// 'inzage' : self.inzage(),
// 'kleurlegenda' : self.kleurlegenda(),
// }
//
// data=JSON.stringify(data);
// var $form = $("<form method='post' action='index.php/monpas/rapmatrix/printinspectie' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) );
// $form.appendTo("body").submit();
// }
//
// } ; // definition van model
// ls.InspectiematrixModel.initBindings();
//
// }; // else
// }// function initInspectieInspectiematrixModel
}); });
public/js/monpas/models/mondiv/diversiteitsmodel.js
+8 -5
View File
@@ -281,7 +281,7 @@ ls.initDiversiteitModel = function(module){
labels[counter]='school'; labels[counter]='school';
scores[counter]= self.schoolDQ() === 0? null: Number(self.schoolDQ()); scores[counter]= self.schoolDQ() === 0? null: Number(self.schoolDQ());
Highcharts.chart('dqpergroep', { Highcharts.chart('dqpergroepX', {
chart: { chart: {
type: 'column', type: 'column',
backgroundColor: '#ffffff', backgroundColor: '#ffffff',
@@ -414,11 +414,14 @@ ls.initDiversiteitModel = function(module){
fPrintDiversiteitBar :function(){ fPrintDiversiteitBar :function(){
var self = ls.DiversiteitModel; var self = ls.DiversiteitModel;
var base64 = self.BC6.toBase64Image(); var svgElem = document.querySelector( "#dqpergroepX" );
var svgData = null;
if ( svgElem ) svgData = new XMLSerializer().serializeToString( svgElem );
var data = { 'orgid' : self.schoolid(),
'schooljaarnr': ls.MenuModel.selectedSchooljaar().schooljaarnr, var data = { 'orgid' : self.schoolid(),
'image' : base64}; 'schooljaarnr': ls.MenuModel.selectedSchooljaar().schooljaarnr,
'graph' : svgData};
data=JSON.stringify(data); data=JSON.stringify(data);
var $form = $("<form method='post' action='index.php/monpas/diversiteit/pdfdiversiteitbar' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) ); var $form = $("<form method='post' action='index.php/monpas/diversiteit/pdfdiversiteitbar' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) );
$form.appendTo("body").submit(); $form.appendTo("body").submit();
public/js/monpas/models/mondiv/diversiteitssomodel.js
+165 -65
View File
@@ -279,7 +279,7 @@ mh.initDiversiteitSOModel = function(){
// var aantalgroepen = self.groepen().length + 1; // var aantalgroepen = self.groepen().length + 1;
// var bartussenruimte = (580 - (80 * aantalgroepen))/aantalgroepen ; // var bartussenruimte = (580 - (80 * aantalgroepen))/aantalgroepen ;
// if (bartussenruimte <=0 ) bartussenruimte = 4; // if (bartussenruimte <=0 ) bartussenruimte = 4;
bartussenruimte = 5; // bartussenruimte = 5;
$.each(self.groepen(), function(i,p){ $.each(self.groepen(), function(i,p){
scores[i] = p.DQ; scores[i] = p.DQ;
@@ -289,78 +289,178 @@ mh.initDiversiteitSOModel = function(){
}); });
slabels[counter]='school'; slabels[counter]='school';
scores[counter]=self.schoolDQ(); scores[counter]=self.schoolDQ();
if (self.BC6 ) {self.BC6.destroy(); }
$("#cdiversiteitso").remove(); $("#cdiversiteitso").remove();
var canv = document.createElement('canvas'); Highcharts.chart('cdiversiteitsoXXX', {
canv.id = 'cdiversiteitso'; chart: {
canv.width = 580; width: 580,
canv.height = 400; options3d: {
document.getElementById('diversiteitsocanvasholderso').appendChild(canv); enabled: true,
//var ctxDiversiteit alpha: 15,
var ctxDiversiteit=$("#cdiversiteitso").get(0).getContext("2d"); beta: 15,
viewDistance: 25,
depth: 40
}
},
title: {
text: 'Diversiteitsquotiënt per groep',
},
credits: {
enabled: false
},
xAxis: {
categories: slabels,
labels: {
skew3d: true,
style: {
fontSize : '10px',
},
},
},
yAxis: {
allowDecimals: false,
tickInterval: 0.2,
min: 0,
title: {
text : 'quotiënt',
skew3d : true
},
},
plotOptions: {
column: {
stacking: 'normal',
depth: 40,
formatter:function(){
if(this.y > 0)
return this.y;
}
}
},
tooltip:{
useHTML: true,
formatter:function(){
if(this.y > 0)
return '<span> groep: '+ this.x + '</span><br><span>DQ: '+this.y+'</span></span>'
}
},
legend: {
enabled: false,
},
series: [{ type:'column',
name: 'DQ',
color: '#6F0B3D',
data: scores,
showInLegend: false}
]
},);
// if (self.BC6 ) {self.BC6.destroy(); }
//
// var canv = document.createElement('canvas');
// canv.id = 'cdiversiteitso';
// canv.width = 580;
// canv.height = 400;
// document.getElementById('diversiteitsocanvasholderso').appendChild(canv);
// //var ctxDiversiteit
// var ctxDiversiteit=$("#cdiversiteitso").get(0).getContext("2d");
var data7 = {labels :slabels, // var data7 = {labels :slabels,
datasets: [{fillColor: "rgba(147,15,80,0.9)", // datasets: [{fillColor: "rgba(147,15,80,0.9)",
strokeColor: "rgba(111,11,61,1)", // strokeColor: "rgba(111,11,61,1)",
highlightStroke: "rgba(222,22,123,1)", // highlightStroke: "rgba(222,22,123,1)",
data: scores}, // data: scores},
]} // ]}
Chart.types.Bar.extend({ // Chart.types.Bar.extend({
name: "LineAlt", // name: "LineAlt",
initialize: function () { // initialize: function () {
//
Chart.types.Bar.prototype.initialize.apply(this, arguments); // Chart.types.Bar.prototype.initialize.apply(this, arguments);
}, // },
draw: function () { // draw: function () {
//
Chart.types.Bar.prototype.draw.apply(this, arguments); // Chart.types.Bar.prototype.draw.apply(this, arguments);
this.chart.ctx.beginPath(); // this.chart.ctx.beginPath();
// 137 // // 137
// this.chart.ctx.moveTo(30, 137); // // this.chart.ctx.moveTo(30, 137);
// this.chart.ctx.lineTo(580, 137); // // this.chart.ctx.lineTo(580, 137);
this.chart.ctx.stroke(); // this.chart.ctx.stroke();
this.chart.ctx.closePath(); // this.chart.ctx.closePath();
} // }
}); // });
self.BC6 = new Chart(ctxDiversiteit).LineAlt(data7,{ // self.BC6 = new Chart(ctxDiversiteit).LineAlt(data7,{
animation:false, // animation:false,
scaleFontFamily: "'lato','Arial'", // scaleFontFamily: "'lato','Arial'",
scaleColor:"rgba(0,0,0,1)", // scaleColor:"rgba(0,0,0,1)",
scaleShowGridLines:true, // scaleShowGridLines:true,
scaleLineColor:"rgba(0,0,0,1)", // scaleLineColor:"rgba(0,0,0,1)",
scaleOverride: true, // scaleOverride: true,
scaleBeginAtZero :true, // scaleBeginAtZero :true,
scaleSteps: 6, // scaleSteps: 6,
scaleStepWidth: 0.5, // scaleStepWidth: 0.5,
scaleStartValue: 0, // scaleStartValue: 0,
barValueSpacing: bartussenruimte, // barValueSpacing: bartussenruimte,
barStrokeWidth:1, // barStrokeWidth:1,
barDatasetSpacing:2, // barDatasetSpacing:2,
//
toottipFontFamily:"'lato','Arial'", // toottipFontFamily:"'lato','Arial'",
showTooltips : true, // showTooltips : true,
tooltipTemplate: "<%= label %> : <%= value %>" // tooltipTemplate: "<%= label %> : <%= value %>"
}); // });
//
ctxDiversiteit.stroke(); // ctxDiversiteit.stroke();
}, },
fPrintDiversiteitBar :function(){ fPrintDiversiteitBar: function () {
var self = mh.DiversiteitSOModel; var self = mh.DiversiteitSOModel;
var base64 = self.BC6.toBase64Image();
var data = { 'orgid' : self.schoolid(), var svgElem = document.querySelector( "#cdiversiteitsoXXX" );
'schooljaarnr': ls.MenuModel.selectedSchooljaar().schooljaarnr, var svgData = null;
'image' : base64}; if ( svgElem ) svgData = new XMLSerializer().serializeToString( svgElem );
data=JSON.stringify(data); var bestandsnaam = "Diversiteitsquotient_per_groep";
var $form = $("<form method='post' action='index.php/monpas/diversiteit/pdfdiversiteitbar' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) );
$form.appendTo("body").submit(); var sd = {
}, 'graph' : svgData,
'orgid' : self.schoolid(),
'schooljaar' : ls.MenuModel.selectedSchooljaar().naam,
'filenaam' : bestandsnaam,
};
data = JSON.stringify( sd );
var $form = $( "<form method='post' action='index.php/monpas/diversiteit/pdfdiversiteitbar/' target='_blank'>" ).append( $( '<input type = "hidden" name="data" id ="sodiv">' ).val( data ) );
$form.appendTo( "body" ).submit();
},
// fPrintDiversiteitBar :function(){
// var self = mh.DiversiteitSOModel;
// var base64 = self.BC6.toBase64Image();
//
// var data = { 'orgid' : self.schoolid(),
// 'schooljaarnr': ls.MenuModel.selectedSchooljaar().schooljaarnr,
// 'image' : base64};
// data=JSON.stringify(data);
// var $form = $("<form method='post' action='index.php/monpas/diversiteit/pdfdiversiteitbar' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) );
// $form.appendTo("body").submit();
// },
fPrintLeerlingaantallen: function(){ fPrintLeerlingaantallen: function(){
var self =mh.DiversiteitSOModel; var self =mh.DiversiteitSOModel;
public/js/monpas/models/mondiv/monitordiversiteitmodel.js
+130 -47
View File
@@ -227,44 +227,123 @@ ls.initMonDivModel = function(module){
var slabels =['B','B⁺','E','E⁺','gem']; var slabels =['B','B⁺','E','E⁺','gem'];
if (!self.grandtotals() || self.grandtotals().llng <=0) return; if (!self.grandtotals() || self.grandtotals().llng <=0) return;
scores[0]=Math.round((self.grandtotals().cat1 / self.grandtotals().llng) * 100) var scores1 = Number(Math.round((self.grandtotals().cat1 / self.grandtotals().llng) * 100));
scores[1]=Math.round((self.grandtotals().cat2 / self.grandtotals().llng) * 100) var scores2 = Number(Math.round((self.grandtotals().cat2 / self.grandtotals().llng) * 100));
scores[2]=Math.round((self.grandtotals().cat3 / self.grandtotals().llng) * 100) var scores3 = Number(Math.round((self.grandtotals().cat3 / self.grandtotals().llng) * 100));
scores[3]=Math.round((self.grandtotals().cat4 / self.grandtotals().llng) * 100) var scores4 = Number(Math.round((self.grandtotals().cat4 / self.grandtotals().llng) * 100));
scores[4] = Math.round((self.grandtotals().cat234 / self.grandtotals().llng) * 100); var scores5 = Number(Math.round((self.grandtotals().cat234 / self.grandtotals().llng) * 100));
scores1 === 0 ? scores.push(null): scores.push(scores1);
if (Gr01 ) {Gr01.destroy(); } scores2 === 0 ? scores.push(null): scores.push(scores2)
$("#mondiv01").remove(); scores3 === 0 ? scores.push(null): scores.push(scores3)
scores4 === 0 ? scores.push(null): scores.push(scores4)
var canv = document.createElement('canvas'); scores5 === 0 ? scores.push(null): scores.push(scores5)
canv.id = 'mondiv01'; console.log(scores, "scores")
canv.width = 280; console.log(slabels, "labels")
canv.height = 185; Highcharts.chart('mondiv01X', {
document.getElementById('holdermondiv01').appendChild(canv); chart: {
var ctxMondiv01=$("#mondiv01").get(0).getContext("2d"); height: 250,
var data = {labels : slabels, width: 350,
datasets:[{ label: '', options3d: {
fillColor: "rgba(147,15,80,0.9)", enabled: true,
strokeColor: "rgba(111,11,61,1)", alpha: 15,
highlightStroke: "rgba(222,22,123,1)", beta: 15,
data: scores}] viewDistance: 25,
}; depth: 40
Gr01 = new Chart(ctxMondiv01).Bar(data,{ }
animation: true, },
scaleShowGridLines:true,
scaleLineColor:"rgba(0,0,0,1)", title: {
scaleOverride: true, text: 'totaal percentages en richtlijn',
scaleBeginAtZero :true, },
scaleSteps: 10, credits: {
scaleStepWidth: 10, enabled: false
scaleStartValue: 0 , },
barValueSpacing: 10,
barStrokeWidth:1, xAxis: {
barDatasetSpacing:2, categories: slabels,
toottipFontFamily:"'lato','Arial'", labels: {
skew3d: true,
tooltipTemplate: "<%= label %>: <%= datasetLabel[ (label -1)] %> <%= value %>%", style: {
}); fontSize : '10px',
},
},
},
yAxis: {
allowDecimals: false,
min: 0,
title: {
text : 'percentage',
skew3d : true
},
},
plotOptions: {
column: {
stacking: 'normal',
depth: 40,
formatter:function(){
if(this.y > 0)
return this.y;
}
}
},
legend: {
enabled: false,
},
series: [{ type:'column',
name: 'diversiteit',
color: '#6F0B3D',
data: scores,
showInLegend: false},
{ type: 'spline',
name: 'richtlijn',
color: '#A28A29',
data: [85, 10, 3, 2, 15]},
]
},
);
// if (Gr01 ) {Gr01.destroy(); }
// $("#mondiv01").remove();
//
// var canv = document.createElement('canvas');
// canv.id = 'mondiv01';
// canv.width = 280;
// canv.height = 185;
// document.getElementById('holdermondiv01').appendChild(canv);
// var ctxMondiv01=$("#mondiv01").get(0).getContext("2d");
// var data = {labels : slabels,
// datasets:[{ label: '',
// fillColor: "rgba(147,15,80,0.9)",
// strokeColor: "rgba(111,11,61,1)",
// highlightStroke: "rgba(222,22,123,1)",
// data: scores}]
// };
// Gr01 = new Chart(ctxMondiv01).Bar(data,{
// animation: true,
// scaleShowGridLines:true,
// scaleLineColor:"rgba(0,0,0,1)",
// scaleOverride: true,
// scaleBeginAtZero :true,
// scaleSteps: 10,
// scaleStepWidth: 10,
// scaleStartValue: 0 ,
// barValueSpacing: 10,
// barStrokeWidth:1,
// barDatasetSpacing:2,
// toottipFontFamily:"'lato','Arial'",
//
// tooltipTemplate: "<%= label %>: <%= datasetLabel[ (label -1)] %> <%= value %>%",
// });
}, },
fPrintDiversiteitMonitor :function(){ fPrintDiversiteitMonitor :function(){
@@ -275,15 +354,19 @@ ls.initMonDivModel = function(module){
bg=ko.toJSON(p); bg=ko.toJSON(p);
bgs[i]=bg; bgs[i]=bg;
}) })
var Gr01_64 = '';
if (Gr01 !==undefined) Gr01_64=Gr01.toBase64Image(); var svgElem = document.querySelector( "#mondiv01X" );
submitData = { 'bgs' : bgs, var svgData = null;
'maxdq' : ko.toJSON(self.maxdq()), if ( svgElem ) svgData = new XMLSerializer().serializeToString( svgElem );
'mindq' : ko.toJSON(self.mindq()),
'maxoov' : ko.toJSON(self.maxoov()),
"grandtotals" : ko.toJSON(self.grandtotals()), submitData = { 'bgs' : bgs,
'schooljaarnr' : self.schooljaarnr(), 'maxdq' : ko.toJSON(self.maxdq()),
"gr0164" : Gr01_64 'mindq' : ko.toJSON(self.mindq()),
'maxoov' : ko.toJSON(self.maxoov()),
"grandtotals" : ko.toJSON(self.grandtotals()),
'schooljaarnr': self.schooljaarnr(),
"graph" : svgData
} }
data=JSON.stringify(submitData); data=JSON.stringify(submitData);
public/js/monpas/models/mondiv/monitordiversiteitsomodel.js
+116 -40
View File
@@ -93,41 +93,113 @@ mh.initMonDivSOModel = function(module){
scores[1]=Math.round((self.grandtotals().cat6 / self.grandtotals().llng) * 100) scores[1]=Math.round((self.grandtotals().cat6 / self.grandtotals().llng) * 100)
scores[2]=Math.round((self.grandtotals().cat7 / self.grandtotals().llng) * 100) scores[2]=Math.round((self.grandtotals().cat7 / self.grandtotals().llng) * 100)
scores[3]=Math.round((self.grandtotals().cat8 / self.grandtotals().llng) * 100) scores[3]=Math.round((self.grandtotals().cat8 / self.grandtotals().llng) * 100)
if (Gr01 ) {Gr01.destroy(); }
// if (Gr01 ) {Gr01.destroy(); }
$("#mondivSO").remove(); $("#mondivSO").remove();
var canv = document.createElement('canvas'); // var canv = document.createElement('canvas');
canv.id = 'mondivSO'; // canv.id = 'mondivSO';
canv.width = 280; // canv.width = 280;
canv.height = 185; // canv.height = 185;
document.getElementById('holdermondivSO').appendChild(canv); // document.getElementById('holdermondivSO').appendChild(canv);
var ctxMondiv01=$("#mondivSO").get(0).getContext("2d"); // var ctxMondiv01=$("#mondivSO").get(0).getContext("2d");
var data = {labels : slabels, // var data = {labels : slabels,
datasets:[{ label: '', // datasets:[{ label: '',
fillColor: "rgba(147,15,80,0.9)", // fillColor: "rgba(147,15,80,0.9)",
strokeColor: "rgba(111,11,61,1)", // strokeColor: "rgba(111,11,61,1)",
highlightStroke: "rgba(222,22,123,1)", // highlightStroke: "rgba(222,22,123,1)",
data: scores}] // data: scores}]
}; // };
Gr01 = new Chart(ctxMondiv01).Bar(data,{ // Gr01 = new Chart(ctxMondiv01).Bar(data,{
animation: true, // animation: true,
scaleShowGridLines:true, // scaleShowGridLines:true,
scaleLineColor:"rgba(0,0,0,1)", // scaleLineColor:"rgba(0,0,0,1)",
scaleOverride: true, // scaleOverride: true,
scaleBeginAtZero :true, // scaleBeginAtZero :true,
scaleSteps: 10, // scaleSteps: 10,
scaleStepWidth: 10, // scaleStepWidth: 10,
scaleStartValue: 0 , // scaleStartValue: 0 ,
barValueSpacing: 10, // barValueSpacing: 10,
barStrokeWidth:1, // barStrokeWidth:1,
barDatasetSpacing:2, // barDatasetSpacing:2,
toottipFontFamily:"'lato','Arial'", // toottipFontFamily:"'lato','Arial'",
//
tooltipTemplate: "<%= label %>: <%= datasetLabel[ (label -1)] %> <%= value %>%", // tooltipTemplate: "<%= label %>: <%= datasetLabel[ (label -1)] %> <%= value %>%",
}); // });
Highcharts.chart('mondivSOXXX', {
chart: {
height: 250,
width: 350,
options3d: {
enabled: true,
alpha: 15,
beta: 15,
viewDistance: 25,
depth: 40
}
},
title: {
text: 'Percentages',
},
credits: {
enabled: false
},
xAxis: {
categories: slabels,
labels: {
skew3d: true,
style: {
fontSize : '10px',
},
},
},
yAxis: {
allowDecimals: false,
min: 0,
title: {
text : 'percentage',
skew3d : true
},
},
plotOptions: {
column: {
stacking: 'normal',
depth: 40,
formatter:function(){
if(this.y > 0)
return this.y;
}
}
},
legend: {
enabled: false,
},
series: [{ type:'column',
name: 'diversiteit',
color: '#6F0B3D',
data: scores,
showInLegend: false}
]
},);
}, },
fPrintDiversiteitMonitor :function(){ fPrintDiversiteitMonitor :function(){
var self = mh.MonDivSOModel; var self = mh.MonDivSOModel;
var bgs = {}; var bgs = {};
@@ -136,17 +208,21 @@ mh.initMonDivSOModel = function(module){
bg=ko.toJSON(p); bg=ko.toJSON(p);
bgs[i]=bg; bgs[i]=bg;
}) })
var Gr01_64 = '';
if (Gr01 !==undefined) Gr01_64=Gr01.toBase64Image(); var svgElem = document.querySelector( "#mondivSOXXX" );
submitData = { 'bgs' : bgs, var svgData = null;
'maxdq' : ko.toJSON(self.maxdq()), if ( svgElem ) svgData = new XMLSerializer().serializeToString( svgElem );
'mindq' : ko.toJSON(self.mindq()),
"grandtotals" : ko.toJSON(self.grandtotals()),
'schooljaarnr' : self.schooljaarnr(), submitData = { 'bgs' : bgs,
"gr0164" : Gr01_64 'maxdq' : ko.toJSON(self.maxdq()),
'mindq' : ko.toJSON(self.mindq()),
"grandtotals" : ko.toJSON(self.grandtotals()),
'schooljaarnr': self.schooljaarnr(),
"graph" : svgData
} }
data=JSON.stringify(submitData); data=JSON.stringify(submitData);
var $form = $("<form method='post' action='index.php/monpas/diversiteitmonitor/maakpdfsboso' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) ); var $form = $("<form method='post' action='index.php/monpas/diversiteitmonitor/maakpdfsboso' target='_blank'>").append($('<input type = "hidden" name="data" id ="data">').val(data) );
$form.appendTo("body").submit(); $form.appendTo("body").submit();
} }
public/js/monpas/models/omvangmodel.js
+42 -11
View File
@@ -374,13 +374,13 @@ mh.initOmvangModel = function(){
var aantalso = 0; var aantalso = 0;
if(o.licht) aantalsbo = Number(o.licht); if(o.licht) aantalsbo = Number(o.licht);
if(o.zwaar) aantalsbo = aantalsbo + Number(o.zwaar); if(o.zwaar) aantalsbo = aantalsbo + Number(o.zwaar);
datasbo.push(aantalsbo); datasbo.push(Number(aantalsbo) > 0 ? Number(aantalsbo) : null);
if(o.laag()) aantalso = (Number(o.laag())); if(o.laag()) aantalso = (Number(o.laag()));
if(o.midden()) aantalso = aantalso + Number(o.midden()); if(o.midden()) aantalso = aantalso + Number(o.midden());
if(o.hoog()) aantalso = aantalso + Number(o.hoog()); if(o.hoog()) aantalso = aantalso + Number(o.hoog());
dataso.push(aantalso); dataso.push(Number(aantalso) > 0 ? Number(aantalso): null);
if(o.aantalllnarr) dataarr.push(Number(o.aantalllnarr)); if(Number(o.aantalllnarr) ) dataarr.push(Number(o.aantalllnarr) > 0?Number(o.aantalllnarr): null );
}); });
@@ -390,12 +390,12 @@ mh.initOmvangModel = function(){
aantal.push(aantallln); aantal.push(aantallln);
schooljaren.unshift(' '); schooljaren.unshift(' ');
schooljaren.push(' ' ); schooljaren.push(' ' );
datasbo.unshift(0); datasbo.unshift(null);
datasbo.push(0); datasbo.push(null);
dataso.unshift(0); dataso.unshift(null);
dataso.push(0); dataso.push(null);
dataarr.unshift(0); dataarr.unshift(null);
dataarr.push(0); dataarr.push(null);
} }
@@ -421,7 +421,7 @@ mh.initOmvangModel = function(){
name: 'arrangementen', name: 'arrangementen',
color: '#ffcc80', color: '#ffcc80',
data: dataarr, data: dataarr,
stack: 'arrangementen' stack: 'arrs'
}) })
@@ -436,29 +436,55 @@ mh.initOmvangModel = function(){
}); });
Highcharts.chart('omvangchart', { Highcharts.chart('omvangchart', {
chart: {
type: 'column',
options3d: {
enabled: true,
alpha: 20,
beta: 20,
viewDistance: 40,
depth: 75,
frame: {
left: {
color:'#f8f8f8'
},
bottom: {
color:'#d9d9d9',
visible: 'auto'
},
back: {
color:'#f8f8f8'
},
}
}
},
credits: { credits: {
enabled: false enabled: false
}, },
title: { title: {
text: 'Omvang extra ondersteuning', text: 'Omvang extra ondersteuning',
style: { style: {
fontSize: '24px' fontSize: '24px'
} }
}, },
xAxis: { xAxis: {
skew3d: true,
categories: schooljaren categories: schooljaren
}, },
yAxis: { yAxis: {
allowDecimals: false, allowDecimals: false,
skew3d: true,
min: 0, min: 0,
title: { title: {
text: 'Aantal leerlingen' text: 'Aantal leerlingen'
}, },
stackLabels: { stackLabels: {
enabled: true, enabled: true,
skew3d: true,
style:{ style:{
fontSize: '12px', fontSize: '12px',
fontWeight: '200' fontWeight: '200'
@@ -621,7 +647,11 @@ mh.initOmvangModel = function(){
height: 800, height: 800,
plotShadow: false, plotShadow: false,
type: 'pie', type: 'pie',
margin: [0, 0, 0, 0] margin: [0, 0, 0, 0],
options3d: {
enabled: true,
alpha: 45,
},
}, },
title: { title: {
text: titel text: titel
@@ -638,6 +668,7 @@ mh.initOmvangModel = function(){
plotOptions: { plotOptions: {
pie: { pie: {
allowPointSelect: true, allowPointSelect: true,
depth: 45,
size: 250, size: 250,
cursor: 'pointer', cursor: 'pointer',
dataLabels: { dataLabels: {
public/js/monpas/models/ontwikkelmodel2.js
+278 -277
View File
@@ -1,280 +1,281 @@
$(function(){ $(function(){
// instrument verwijderd feb '22
ls.initOntwikkelModel2 = function(){ // ls.initOntwikkelModel2 = function(){
//
function fAddSWV(p){ // function fAddSWV(p){
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.plaats = p.plaats
this.geopend = ko.observable(false); // this.geopend = ko.observable(false);
dit.kamers = ko.observableArray([]); // dit.kamers = ko.observableArray([]);
if (p.kamers ){ // if (p.kamers ){
$.each(p.kamers, function(j,k){ // $.each(p.kamers, function(j,k){
dit.kamers.push(new fAddKamer(k)); // dit.kamers.push(new fAddKamer(k));
}) // })
} // }
} // }
//
function fAddKamer(p){ // function fAddKamer(p){
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.plaats = p.plaats
this.geopend = ko.observable(false); // this.geopend = ko.observable(false);
this.bgs = ko.observableArray([]); // this.bgs = ko.observableArray([]);
//
if (p.bgs){ // if (p.bgs){
$.each(p.bgs, function(x,z){ // $.each(p.bgs, function(x,z){
dit.bgs.push(new fAddBG(z)); // dit.bgs.push(new fAddBG(z));
}) // })
} // }
} // }
function fAddBG(p){ // function fAddBG(p){
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.plaats = p.plaats
this.geopend = ko.observable(false); // this.geopend = ko.observable(false);
this.scholen = ko.observableArray([]); // this.scholen = ko.observableArray([]);
if (p.scholen){ // if (p.scholen){
$.each(p.scholen, function(a,b){ // $.each(p.scholen, function(a,b){
dit.scholen.push(new fAddSchool(b)); // dit.scholen.push(new fAddSchool(b));
}) // })
} // }
} // }
//
function fAddSchool(p){ // function fAddSchool(p){
var dit = this; // var dit = this;
this.id = p.id; // this.id = p.id;
this.soort = p.soort // this.soort = p.soort
this.naam = p.naam // this.naam = p.naam
this.plaats = p.plaats // this.plaats = p.plaats
} // }
//
function fAddOrgversion(p){ // function fAddOrgversion(p){
this.id = p.id; //orgversion id // this.id = p.id; //orgversion id
this.periodenummer = p.periodenummer // this.periodenummer = p.periodenummer
this.versie_id = p.versie_id // this.versie_id = p.versie_id
this.vorm = p.vorm // this.vorm = p.vorm
this.scoretype = p.scoretype // this.scoretype = p.scoretype
this.naam = p.naam // this.naam = p.naam
this.geldigvanaf = p.geldigvanaf; // this.geldigvanaf = p.geldigvanaf;
this.geldigtm = p.geldigtm; // this.geldigtm = p.geldigtm;
this.invullentm = p.invullentm; // this.invullentm = p.invullentm;
this.info = ko.computed(function(){ // this.info = ko.computed(function(){
var infostr=this.naam + "- periode " + this.periodenummer ; // var infostr=this.naam + "- periode " + this.periodenummer ;
infostr += " van " + this.geldigvanaf + " t/m " + this.geldigtm; // infostr += " van " + this.geldigvanaf + " t/m " + this.geldigtm;
return infostr; // return infostr;
},this) // },this)
} // }
function fAddResult(p){ // function fAddResult(p){
this.oordeelid = p.oordeelid; // this.oordeelid = p.oordeelid;
this.scoretype = p.scoretype; // this.scoretype = p.scoretype;
//
this.huidig = ko.observable( p.normid); // this.huidig = ko.observable( p.normid);
this.gewenst = ko.observable(3); // this.gewenst = ko.observable(3);
if (p.wensid) {this.gewenst(p.wensid)}; // if (p.wensid) {this.gewenst(p.wensid)};
//
this.omschrijving = p.omschrijving; // this.omschrijving = p.omschrijving;
this.fvID = p.fvID, // this.fvID = p.fvID,
this.ijkID = p.ijkpuntID // this.ijkID = p.ijkpuntID
} // }
//
if (ls.OntwikkelModel2 !== undefined){ // if (ls.OntwikkelModel2 !== undefined){
ls.OntwikkelModel2.initModel(); // ls.OntwikkelModel2.initModel();
} // }
else { // else {
ls.OntwikkelModel2 = { // ls.OntwikkelModel2 = {
toporg : ko.observableArray([]), // toporg : ko.observableArray([]),
selectedOrg : ko.observable(''), // selectedOrg : ko.observable(''),
orgsoort : ko.observable(1), // orgsoort : ko.observable(1),
orgversions : ko.observableArray([]), // orgversions : ko.observableArray([]),
selectedOrgversion : ko.observable(''), // selectedOrgversion : ko.observable(''),
standaarden : ko.observableArray([]), // standaarden : ko.observableArray([]),
versieid : ko.observable(), // moet waarschijnlijk orgversie id worden!! // versieid : ko.observable(), // moet waarschijnlijk orgversie id worden!!
writeOK : ko.observable(false), // writeOK : ko.observable(false),
level123 : ko.observable(false), // level123 : ko.observable(false),
bezig : ko.observable(false), // bezig : ko.observable(false),
ingevuld : ko.observable(false), // ingevuld : ko.observable(false),
wijzigRecht : ko.pureComputed(function () { // wijzigRecht : ko.pureComputed(function () {
if(!ls.OntwikkelModel2.ingevuld()) return false; // if(!ls.OntwikkelModel2.ingevuld()) return false;
if(ls.OntwikkelModel2.level123() ) return false; // if(ls.OntwikkelModel2.level123() ) return false;
if(ls.OntwikkelModel2.writeOK()) return true; // if(ls.OntwikkelModel2.writeOK()) return true;
return false; // return false;
//
}), // }),
initBindings :function(){ // initBindings :function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
//
if (!ko.dataFor(document.getElementById('pagontwikkel2')) ) { // if (!ko.dataFor(document.getElementById('pagontwikkel2')) ) {
ko.applyBindings(ls.OntwikkelModel2, document.getElementById("pagontwikkel2")); // ko.applyBindings(ls.OntwikkelModel2, document.getElementById("pagontwikkel2"));
} // }
self.initModel(); // self.initModel();
}, // },
//
initModel: function(){ // initModel: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
self.toporg(''); // self.toporg('');
//
$.post("index.php/monpas/rapijkpunten/getorgs", function(data){ // $.post("index.php/monpas/rapijkpunten/getorgs", function(data){
if (data.organisatie){ // if (data.organisatie){
//
self.orgsoort(data.soort); // self.orgsoort(data.soort);
switch (self.orgsoort()){ // switch (self.orgsoort()){
case 1: self.toporg(new fAddSWV(data.organisatie)); // case 1: self.toporg(new fAddSWV(data.organisatie));
break; // break;
case 2: self.toporg(new fAddKamer(data.organisatie)); // case 2: self.toporg(new fAddKamer(data.organisatie));
break; // break;
case 3: self.toporg(new fAddBG(data.organisatie)); // case 3: self.toporg(new fAddBG(data.organisatie));
break; // break;
case 4: self.toporg(new fAddSchool(data.organisatie)); // case 4: self.toporg(new fAddSchool(data.organisatie));
break; // break;
}; // switch // }; // switch
//
self.selectedOrg(self.toporg()); // self.selectedOrg(self.toporg());
self.fGetWriteAutorisatie(); // self.fGetWriteAutorisatie();
self.fGetLevel(); // self.fGetLevel();
self.fSwitchLevel(); // self.fSwitchLevel();
}; // if // }; // if
},'json'); // },'json');
}, // },
//
fGetLevel: function(){ // fGetLevel: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
$.post("index.php/monpas/rapijkpunten/checkLevelInspectie/", function(result){ // $.post("index.php/monpas/rapijkpunten/checkLevelInspectie/", function(result){
self.level123(result); // self.level123(result);
},'json'); // },'json');
}, // },
//
//
fGetWriteAutorisatie: function(){ // fGetWriteAutorisatie: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
$.post("index.php/shared/autorisatienivos/getwriteautorisatie/" + self.selectedOrg().id, function(result){ // $.post("index.php/shared/autorisatienivos/getwriteautorisatie/" + self.selectedOrg().id, function(result){
self.writeOK(result); // self.writeOK(result);
},'json'); // },'json');
}, // },
fToggleGeopend: function(){ // fToggleGeopend: function(){
this.geopend(!this.geopend()); // this.geopend(!this.geopend());
}, // },
fUpdateGewenst: function(num){ // fUpdateGewenst: function(num){
var self=ls.OntwikkelModel2; // var self=ls.OntwikkelModel2;
this.gewenst(num); // this.gewenst(num);
}, // },
fSwitchOrg: function(){ // fSwitchOrg: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
if (self.selectedOrg() == undefined) return; // if (self.selectedOrg() == undefined) return;
if (this.id == self.selectedOrg().id) return; // if (this.id == self.selectedOrg().id) return;
self.selectedOrg(this); // self.selectedOrg(this);
self.standaarden.removeAll(); // self.standaarden.removeAll();
self.fGetWriteAutorisatie(); // self.fGetWriteAutorisatie();
self.ingevuld(false); // self.ingevuld(false);
if (self.selectedOrg().soort < 4) return; // if (self.selectedOrg().soort < 4) return;
//
self.fSwitchLevel(); // self.fSwitchLevel();
}, // },
fSwitchLevel: function(){ // fSwitchLevel: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
//
if (self.selectedOrg() == undefined) return; // if (self.selectedOrg() == undefined) return;
if (this.id == self.selectedOrg().id) return; // if (this.id == self.selectedOrg().id) return;
var versieid = null; // var versieid = null;
if(self.selectedOrgversion()){ // if(self.selectedOrgversion()){
versieid = self.selectedOrgversion().id; // versieid = self.selectedOrgversion().id;
} // }
//
$.post("index.php/monpas/rapijkpunten/getperiodes3/" + self.selectedOrg().id, function(data){ // $.post("index.php/monpas/rapijkpunten/getperiodes3/" + self.selectedOrg().id, function(data){
self.orgversions.removeAll(); // self.orgversions.removeAll();
if (data){ // if (data){
$.each(data,function(i,p){ // $.each(data,function(i,p){
self.orgversions.push(new fAddOrgversion(p)); // self.orgversions.push(new fAddOrgversion(p));
}) // })
if(versieid != null ){ // if(versieid != null ){
$.each(self.orgversions(), function (i, q) { // $.each(self.orgversions(), function (i, q) {
if (q.id == versieid) { // if (q.id == versieid) {
self.selectedOrgversion(q); // self.selectedOrgversion(q);
return false; // return false;
} // }
}); // });
} // }
} // }
},'json'); // },'json');
}, // },
//
fChangeVersion2: function(){ // fChangeVersion2: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
if (self.selectedOrgversion() == undefined) return; // if (self.selectedOrgversion() == undefined) return;
//
//
var submitData = { orguserid : false, // var submitData = { orguserid : false,
orgversieid : self.selectedOrgversion().id, // orgversieid : self.selectedOrgversion().id,
orgid : self.selectedOrg().id} // orgid : self.selectedOrg().id}
//
self.ingevuld(false); // self.ingevuld(false);
$.post("index.php/monpas/overzichtscores/getscores", submitData, function(results){ // $.post("index.php/monpas/overzichtscores/getscores", submitData, function(results){
self.standaarden.removeAll(); // self.standaarden.removeAll();
if (results){ // if (results){
self.ingevuld(true); // self.ingevuld(true);
$.each(results, function(i,p){ // $.each(results, function(i,p){
self.standaarden.push(new fAddResult(p)); // self.standaarden.push(new fAddResult(p));
}) // })
} // }
},'json'); // },'json');
}, // },
fToonToelichting: function(){ // fToonToelichting: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
var dit = this; // var dit = this;
var toelichting = ''; // var toelichting = '';
if (dit.toelichting != undefined) toelichting = dit.toelichting; // if (dit.toelichting != undefined) toelichting = dit.toelichting;
apprise(dit.nummer + '. ' + dit.omschrijving + '<br/>Toelichting: ' + toelichting); // apprise(dit.nummer + '. ' + dit.omschrijving + '<br/>Toelichting: ' + toelichting);
}, // },
fSaveGewenst: function(){ // fSaveGewenst: function(){
var self=ls.OntwikkelModel2; // var self=ls.OntwikkelModel2;
if (self.bezig()) return; // if (self.bezig()) return;
self.bezig(true); // self.bezig(true);
var wensarray = []; // var wensarray = [];
$.each(self.standaarden() , function(i,p){ // $.each(self.standaarden() , function(i,p){
wensarray[i]={ oordeelid : p.oordeelid, // wensarray[i]={ oordeelid : p.oordeelid,
ijkID : p.ijkID, // ijkID : p.ijkID,
fvID : p.fvID, // fvID : p.fvID,
gewenst : p.gewenst() }; // gewenst : p.gewenst() };
}); // });
var submitData= { wensarray : wensarray} // var submitData= { wensarray : wensarray}
; // ;
$.post("index.php/monpas/overzichtscores/savegewenst", submitData, function(wensids){ // $.post("index.php/monpas/overzichtscores/savegewenst", submitData, function(wensids){
self.fChangeVersion2(); // self.fChangeVersion2();
self.bezig(false); // self.bezig(false);
},'json') ; // },'json') ;
}, // },
fPrintOntwikkelmatrix: function(){ // fPrintOntwikkelmatrix: function(){
var self = ls.OntwikkelModel2; // var self = ls.OntwikkelModel2;
//
if (! self.selectedOrg() ) return; // if (! self.selectedOrg() ) return;
if (! self.selectedOrg().soort == 4) return; // if (! self.selectedOrg().soort == 4) return;
//
var versie = self.selectedOrgversion().naam+' - periode ' + // var versie = self.selectedOrgversion().naam+' - periode ' +
self.selectedOrgversion().periodenummer + ' van ' + // self.selectedOrgversion().periodenummer + ' van ' +
self.selectedOrgversion().geldigvanaf + ' t/m ' + // self.selectedOrgversion().geldigvanaf + ' t/m ' +
self.selectedOrgversion().geldigtm; // self.selectedOrgversion().geldigtm;
var resultaten= []; // var resultaten= [];
//
if (self.standaarden){ // if (self.standaarden){
$.each(self.standaarden(), function(i,p){ // $.each(self.standaarden(), function(i,p){
resultaten.push({'nummer' : (i + 1), 'omschrijving': p.omschrijving, 'huidig': p.huidig(), 'wens' : p.gewenst()}); // resultaten.push({'nummer' : (i + 1), 'omschrijving': p.omschrijving, 'huidig': p.huidig(), 'wens' : p.gewenst()});
}) // })
} // }
//
var data={ 'school' : self.selectedOrg().naam, // var data={ 'school' : self.selectedOrg().naam,
"versie" : versie, // "versie" : versie,
"resultaten" : resultaten } // "resultaten" : resultaten }
var submitUrl = "index.php/monpas/overzichtscores/printontwikkelmatrix/?json=" + JSON.stringify(data); // var submitUrl = "index.php/monpas/overzichtscores/printontwikkelmatrix/?json=" + JSON.stringify(data);
window.open(submitUrl); // window.open(submitUrl);
} // }
} ; // definition van model // } ; // definition van model
ls.OntwikkelModel2.initBindings(); // ls.OntwikkelModel2.initBindings();
}; // else // }; // else
}// function initOntwikkelModel2 // }// function initOntwikkelModel2
}); });