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

Merge branch 'feature/streefcijfersperorg'

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-11-28 23:35:04 +01:00
parent 9a89ce7b5a 18e0f0632b
commit 9e11660f36
42 changed files with 3844 additions and 2453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/compactsop/ijktabelbreed.php
+40 -43
View File
@@ -10,7 +10,7 @@
<p class="subTitel1" ><?php echo $data['versienaam']?>
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
<p class="subTitel2"><?php echo $lijst->vantm ?></p>
<p class="subTitel2"><?php echo $lijst->vantm ?> (ambitie: <?php echo $lijst->ambities->gemscore ?>)</p>
<?php }; ?>
<?php }; ?>
@@ -32,14 +32,15 @@
var xas = [];
var verkorteVersies = [];
var balkGegevens = [];
var lijnGegevens;
var lijnGegevens = [];
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
var indexnummer = <?= $index?>;
var labels = [];
var scores = [];
var ambities = [];
var ambitiewaarde =<?=intval($lijst->ambities->gemscore) ?>;
var ambitienaam = 'p. ' + '<?=$lijst->periodenummer ?>' + ', ' + '<?=$lijst->ambities->ambitievan ?>' + '-ambitie';
var xastitel = '';
<?php if($lijst->label){ ?>
var xastitel = '<?php echo $lijst->label ?>';
@@ -54,32 +55,28 @@
};
?>
labels.push(<?php $score->nummer ?>);
<?php if(floatval($score->gem) > 0 ){ ?>
scores.push({
y: <?= floatval($score->gem) ?>,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php if($score->gem == 0 ){ ?>
ambities.push(ambitiewaarde);
<?php if(! isset($score->gem) || floatval($score->gem) == 0 ){ ?>
scores.push({
y: null,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php }
else{?>
scores.push({
y: <?= floatval($score->gem) ?>,
color: '<?= $kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } // foreach lijstscores ?>
<?php }
verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000',
name: ''
} // foreach lijstscores ?>
}
);
labels.unshift(' ');
var legescore ={
@@ -87,53 +84,54 @@
color : 'transparent',
name : '0'
};
scores.unshift(legescore);
verkorteVersies.unshift(<?= $lijst->periodenummer ?>);
labels.push(' ');
scores.push(legescore);
verkorteVersies.push(<?=$lijst->periodenummer ?>);
balkGegevens[indexnummer] =({
ambities.unshift(ambitiewaarde);
ambities.push(ambitiewaarde);
var xas = [];
balkGegevens.push({
dataLabels: {
format: '<span style="font-size: 5px;">{point.versie}</span>'
enabled : true,
nullFormat: '',
format: '<span style="font-size: 9px; font-weight: normal;">'+ '<?=$lijst->periodenummer ?>'+'</span>',
},
type : 'column',
name : verkorteVersies,
name : '<?=$lijst->vantm ?>',
color : '#f8f7f1',
backgroundColor: '#e6e6e6',
data : scores
});
<?php } // foreach lijsten ?>
var extralijn = {
y: ambitiewaarde,
name: '',
soort: 'extra'
};
ambities.unshift(extralijn);
ambities.push(extralijn);
var splinedata=[];
var xas = [];
if (balkGegevens[0]){
$.each(balkGegevens[0].data,function(i,p){
if (p.name=== '0') xas.push('');
if (p.name=== 'x') xas.push('');
else xas.push(p.name);
splinedata.push(ambitiewaarde)
});
}
lijnGegevens = ({
dataLabels: {
format: ''
},
label: {
format: '<span style="font-size: 9px; font-weight: normal;">'+ '<?=$lijst->ambities->ambitievan ?>'+'</span>'
},
type: 'spline',
name: verkorteVersies,
data: splinedata //ambities
name: ambitienaam,
data: ambities //ambities
});
balkGegevens.push(lijnGegevens);
<?php } // foreach lijsten ?>
// });
@@ -196,7 +194,7 @@
enabled: true,
inside: true,
align: 'center',
verticalAlign: 'bottom',
verticalAlign: 'top',
color: '#404040',
style: {
textOutline: false
@@ -205,7 +203,6 @@
},
spline: {
color: 'grey',
pointStart: 0,
marker: {
enabled: false
application/views/monpas/compactsop/ijktabelcompact.php
+56 -48
View File
@@ -10,7 +10,7 @@
<p class="subTitel1" ><?php echo $data['versienaam']?>
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
<p class="subTitel2"><?php echo $lijst->vantm ?></p>
<p class="subTitel2"><?php echo $lijst->vantm ?> (a.: <?php echo $lijst->ambities->gemscore ?>)</p>
<?php }; ?>
@@ -31,14 +31,16 @@
var xas = [];
var verkorteVersies = [];
var balkGegevens = [];
var lijnGegevens;
var lijnGegevens = [];
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
var indexnummer = <?= $index?>;
var labels = [];
var scores = [];
var ambities = [];
var ambitiewaarde =<?=intval($lijst->ambities->gemscore) ?>;
var ambitienaam = 'p. ' + '<?=$lijst->periodenummer ?>' + ', ' + '<?=$lijst->ambities->ambitievan ?>' + '-ambitie';
var xastitel = '';
<?php if($lijst->label){ ?>
var xastitel = '<?php echo $lijst->label ?>';
@@ -53,86 +55,83 @@
};
?>
labels.push(<?php $score->nummer ?>);
<?php if(floatval($score->gem) > 0 ){ ?>
scores.push({
y: <?= floatval($score->gem) ?>,
color: '<?= $kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php if($score->gem == 0 ){ ?>
ambities.push(ambitiewaarde);
<?php if(! isset($score->gem) || $score->gem == 0 ){ ?>
scores.push({
y: null,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } ?>
<?php }
else{?>
scores.push({
y: <?= floatval($score->gem) ?>,
color: '<?= $kleur ?>',
name: '<?= $score->nummer ?>',
});
<?php } // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000',
name: ''
}
);
<?php }
} // foreach lijstscores ?>
labels.unshift(' ');
var legescore ={
y : null,
color : 'transparent',
name : '0'
name : 'x'
};
scores.unshift(legescore);
verkorteVersies.unshift(<?= $lijst->periodenummer ?>);
labels.push(' ');
scores.push(legescore);
verkorteVersies.push(<?=$lijst->periodenummer ?>);
balkGegevens[indexnummer] =({
ambities.unshift(ambitiewaarde);
ambities.push(ambitiewaarde);
var xas = [];
balkGegevens.push({
dataLabels: {
format: '<span style="font-size: 5px;">{point.versie}</span>'
enabled : true,
nullFormat: '',
format: '<span style="font-size: 9px; font-weight: normal;">'+ '<?=$lijst->periodenummer ?>'+'</span>',
},
type : 'column',
name : verkorteVersies,
name : '<?=$lijst->vantm ?>',
color : '#f8f7f1',
backgroundColor: '#e6e6e6',
data : scores
});
<?php } // foreach lijsten ?>
var extralijn = {
y: ambitiewaarde,
name: '',
soort: 'extra'
};
ambities.unshift(extralijn);
ambities.push(extralijn);
var splinedata=[];
var xas = [];
if (balkGegevens[0]){
$.each(balkGegevens[0].data,function(i,p){
if (p.name=== '0') xas.push('');
if (p.name=== 'x') xas.push('');
else xas.push(p.name);
splinedata.push(ambitiewaarde)
});
}
lijnGegevens = ({
dataLabels: {
format: ''
},
label: {
format: '<span style="font-size: 9px; font-weight: normal;">'+ '<?=$lijst->ambities->ambitievan ?>'+'</span>'
},
type: 'spline',
name: verkorteVersies,
data: splinedata //ambities
name: ambitienaam,
data: ambities //ambities
});
balkGegevens.push(lijnGegevens);
<?php } // foreach lijsten ?>
// });
@@ -171,6 +170,7 @@
yAxis: {
min:0,
max: 100,
y: 20,
title: false,
labels:{
skew3d: true,
@@ -191,11 +191,20 @@
series:{
groupPadding: 0.05,
animation: false,
// label:{
// connectorAllowed: false,
// enabled: true,
// formatter: function(){
// return 'gelukt'
// }
// },
dataLabels: {
enabled: true,
inside: true,
align: 'center',
verticalAlign: 'bottom',
verticalAlign: 'top',
color: '#404040',
style: {
textOutline: false
@@ -204,15 +213,14 @@
},
spline: {
color: 'grey',
pointStart: 0,
marker: {
enabled: false
}
},
}
},
series: balkGegevens,
showInLegend: false
// showInLegend: false
});
}()
application/views/monpas/pages/compactsop.php
+2 -1
View File
@@ -1,7 +1,8 @@
<div class="col-sm-12 mainpagina submenupage" id ="pagcompactsop">
<h2 data-bind="text: 'Compact ' + label()"></h2>
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/knoppenbalk"); ?>
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/knoppenbalk"); ?>
<div class="row" style="margin-left: 10px;" data-bind="visible: toonOnderdelen()">
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/kiesonderdelen"); ?>
application/views/monpas/pages/ijkpunten.php
+29 -23
View File
@@ -194,28 +194,22 @@
</button>
<div id="hc-chart1" style="min-width: 310px; height: 475px; margin: 0 auto" >
<div id="hc-chart1" style="min-width: 310px; height: 525px; margin: 0 auto" >
</div>
<canvas style="display: none" id="ijkpuntencanvas">
</canvas>
<div data-bind="with: selectedSerie()" style="margin-left: 50px;">
<span style="font-weight: bold; "
data-bind="text: 'Versie: ' + naam + ', scoretype: ' + scoreomschrijving ">
</span>
</div>
<table style="margin-top: 5px; margin-left: 50px; " data-bind="foreach: lijsten" >
<tr data-bind="visible: erzijnscores() == true">
<td style="width: 30px; font-weight: bold" data-bind=" text: periodenummer"></td>
<td style="padding-left:10px; "data-bind="text: ': ' + vantm + ', ' + wijik"></td>
</tr>
</table>
<table style="margin-left: 50px; margin-bottom: 20px">
<tr >
<td style=" width: 30px; "><div style="border-bottom: 3px solid #404040; margin-bottom: 1px;"></div></td>
<td style="padding-left:10px;">: ambitie</td>
</tr>
</table>
<!-- <div data-bind="with: selectedSerie()" style="margin-left: 50px;">-->
<!-- <span style="font-weight: bold; "-->
<!-- data-bind="text: 'Versie: ' + naam + ', scoretype: ' + scoreomschrijving ">-->
<!-- </span>-->
<!-- </div>-->
<!-- <table style="margin-top: 5px; margin-left: 50px; " data-bind="foreach: lijsten" >-->
<!-- <tr data-bind="visible: erzijnscores() == true">-->
<!-- <td style="width: 30px; font-weight: bold" data-bind=" text: periodenummer"></td>-->
<!-- <td style="padding-left:10px; "data-bind="text: ': ' + vantm + ', ' + wijik"></td>-->
<!-- </tr>-->
<!-- </table>-->
</div>
<div class="col-xs-12 ">
@@ -446,14 +440,26 @@
<div class="col-xs-12 "data-bind="visible: erzijnlijsten() == true">
<div class="col-xs-5">
<h4 style="margin-top: 30px; margin-left: 10px;">Ambities</h4>
<div data-bind="foreach: lijsten" style="margin: 5px">
<div class="col-xs-11" style="background-color:#f5f0f2; padding: 5px; padding-left: 10px;border-radius: 2px" data-bind="visible: ambities() == true">
<p style="font-weight: bold; margin-bottom: 10px" data-bind="text: vantm + ':'"></p>
<p style="margin-bottom: 10px"data-bind="text: 'gemiddelde score ' + gemscore + '%' "></p>
<p style="margin-bottom: 10px"data-bind="text: 'minimaal ' + ijkpunten + ' ' + label + ' op ' + zprocent + ' % of hoger' ">
</p>
<!--ko if: $parent.eigenambitie() || $index() == 0 -->
<div class="col-xs-11" style="background-color:#f5f0f2; padding: 5px; padding-left: 10px;border-radius: 2px">
<!--ko if: $parent.eigenambitie() -->
<span style="font-weight: bold; margin-bottom: 10px" data-bind="text: vantm + ':'"></span>
<br>
<!--/ko-->
<span data-bind="text: 'gemiddelde score ' + gemscore + '%' "></span>
<br>
<span data-bind="text: 'minimaal ' + ijkpunten + ' ' + label + ' op ' + zprocent + ' % of hoger' ">
</span>
<br>
<span data-bind="text: ambitievan "></span>
<br>
</div>
<!-- /ko-->
</div>
</div>
application/views/monpas/pages/streefcijfers.php
+115 -70
View File
@@ -1,86 +1,131 @@
<div class="col-sm-12 mainpagina" id ="pagstreefcijfers">
<div class="row" >
<div class="col-sm-12 col-md-3">
<h3>Selecteer een organisatieniveau</h3>
<table style="width:100%">
<tbody data-bind="foreach: swv">
<tr class="swv" data-bind=" css: {'selected' : $parent.selectedOrganisatie().id ==id},
click:$parent.fSetSelected ">
<td style="width:100%"
data-bind="text: naam"></td>
</tr>
<tr data-bind="visible: kamers() !== undefined">
<td >
<table style="width: 100%">
<tbody data-bind="foreach: kamers">
<tr class="kamer selectable"
data-bind="css: {'selected' : $root.selectedOrganisatie().id ==id},
click: $root.fSetSelected">
<td style="width:5%"></td>
<td style="width: 95%" data-bind="text: naam"></td>
</tr>
<tr data-bind="visible: bgs() !== undefined ">
<td></td>
<td >
<table style="width: 100%">
<tbody data-bind="foreach: bgs">
<tr class= "selectable"
data-bind="css: {'selected' : $root.selectedOrganisatie().id ==id},
click: $root.fSetSelected">
<td style="width: 100%" data-bind="text: naam"></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<td>
</tr>
</tbody>
</table>
</div>
<div class="col-sm-12 col-md-9" data-bind="visible: selectedOrganisatie().id !=0">
<h4> Criteria voor scholen onder organisatie:
<span data-bind="text: selectedOrganisatie().naam"></span>
</div>
<div class="col-sm-12 " style="margin-bottom: 20px; margin-left: 50px;" >
<h4 data-bind="text: instrument ? 'Streefcijfers voor de actieve lijst van het instrument ' + instrument() : ' ' ">
</h4>
<table style="width: 100%;">
<thead>
<tr>
<th style="width:20px">nr</th>
<th >versie</th>
<th style="width:95px">van</th>
<th style ="width:95px">t/m</th>
<th style="width:100px"> gem.<br/>score</th>
<th style="width:280px">minimum <?=$labels['ijkpunten']?> </th>
<th style="width: 20px">D</th>
<th style="width: 3%; vertical-align: text-top">nr</th>
<th style="width: 15%; vertical-align: text-top">versie</th>
<th style="width: 10%; vertical-align: text-top">van</th>
<th style="width: 10%; vertical-align: text-top">t/m</th>
<th style="width: 9%; vertical-align: text-top"> gem. score</th>
<th style="width: 30%; vertical-align: text-top">minimum</th>
<th style="width: 20%; vertical-align: text-top">criteria van</th>
<th style="width: 3%; vertical-align: text-top"></th>
</tr>
</thead>
<tbody data-bind="foreach: versieambities">
<tbody >
<!-- ko foreach: ambities -->
<tr>
<td data-bind="text: periodenummer"></td>
<td data-bind="text:naam"></td>
<td data-bind="text: geldigvanaf"></td>
<td data-bind="text: geldigtm"></td>
<td><input class="integer"
data-bind="textInput: gemscore, event:{input: $root.fUpdateAmbitie}, enable: wijzigok" />%</td>
<td><input class="integer"
data-bind="textInput: xijkpunten, event:{input: $root.fUpdateAmbitie},enable:wijzigok" /> ijkpunten
op <input class="integer"
data-bind="textInput: zprocent, event:{input: $root.fUpdateAmbitie}, enable:wijzigok" />% of hoger
<td>
<!-- ko if: $index() == 0 -->
<span data-bind="text: $parent.periodenummer() "></span>
<!-- /ko -->
</td>
<td> <!-- ko if: $index() == 0 -->
<span data-bind="text: $parent.naam() "></span>
<!-- /ko -->
</td>
<td> <!-- ko if: $index() == 0 -->
<span data-bind="text: $parent.geldigvanaf() "></span>
<!-- /ko -->
</td>
<td> <!-- ko if: $index() == 0 -->
<span data-bind="text: $parent.geldigtm() "></span>
<!-- /ko -->
</td>
<td><input class="integer" type="number" min="0" max="100" step="5"
data-bind="textInput: gemscore,
event: {input: $parent.fUpdateAmbitie},
enable: $parent.manage() == 'T' && $parent.orgsoort() == soort " />%</td>
<td><input class="integer" type="number" min="0" step="1"
data-bind="textInput: xijkpunten,
event: {input: $parent.fUpdateAmbitie},
attr: {'max': $parent.aantalY},
enable: $parent.manage() =='T' && $parent.orgsoort() == soort " /> ijkpunten
op <input class="integer" type="number" min="0" max="100" step="5"
data-bind="textInput: zprocent,
event: {input: $parent.fUpdateAmbitie},
enable: $parent.manage() =='T' && $parent.orgsoort() == soort " />
<span > % of hoger</span>
</td>
<td class="glyphicon glyphicon-trash" data-bind="click:$root.fDelete"></td>
</tr>
<td data-bind="text: organisatie + ' (' + ambitievan() + ')' " ></td>
<td style="text-align: right">
<span class="glyphicon glyphicon-trash"
data-bind="visible: $parent.manage() =='T' && $parent.orgsoort() == soort ,
click:$root.fDelete ">
</span>
</td>
</tr>
<!--/ko-->
<!-- ko if: insert() == false -->
<tr>
<td colspan="2">
<button style="background-color: #A28A29; color: white; box-shadow: 1px 1px 2px #faf7eb;
font-weight: bold; margin-top; 20px;"
data-bind="click: fNew,
visible: manage() =='T' && eigenAmbitie() == false ">nieuw
</button>
</td>
<td colspan="6"></td>
</tr>
<!--/ko -->
</tbody>
<tbody>
<!-- ko if: insert() -->
<tr>
<td data-bind="text: periodenummer() "></td>
<td data-bind="text: naam() "></td>
<td data-bind="text: geldigvanaf() "></td>
<td data-bind="text: geldigtm()"></td>
<td><input type="number" min="0" max="100" step="5" class="integer"
data-bind="textInput: scoreNieuw "/>%</td>
<td><input type="number" min="0" class="integer"
data-bind="textInput: ijkNieuw,
attr: {'max': aantalY} " /> ijkpunten
op <input type="number" min="0" max="100" step="5" class="integer"
data-bind="textInput: procentNieuw" />% of hoger
</td>
<td data-bind="text: soortNaam() " ></td>
<td >
</td>
</tr>
<tr>
<td colspan="2">
<button style="background-color: #A28A29; color: white; box-shadow: 1px 1px 2px #faf7eb;
font-weight: bold; margin-top; 20px;"
data-bind="click: fOpslaan ">opslaan
</button>
<button style="background-color: #f1f1f1; box-shadow: 1px 1px 2px ghostwhite;
font-weight: bold; margin-top; 20px;"
data-bind="click: fAnnuleer ">annuleer
</button>
</td>
<td colspan="4"></td>
</tr>
<!--/ko -->
</tbody>
</table>
</div> <!-- rechts -->
</div>
application/views/monpas/sop/monbasgrafiek1.php
+25 -36
View File
@@ -23,27 +23,16 @@
var scores =[];
var labels =[];
var gemiddelde = [];
var ambitie = [];
<?php foreach($scores as $index => $score){ ?>
labels.push('<?= $score->nummer ?>');
<?php if($totgem){ ?>
gemiddelde.push({ y: <?= intval($totgem) ?>,
name: '<?= $score->nummer ?>'
})
<?php } ?>
<?php if(intval($score->gem) > 0){ ?>
scores.push({
y: <?= intval($score->gem) ?>,
color: '<?= isset($score->kleurcode)? $score->kleurcode : "#808080" ?>',
name: '<?= $score->nummer ?>'
});// object
<?php } //if
if(intval($score->gem) == 0){ ?>
labels.push('<?= $score->nummer ?>');
<?php if($ambitie){ ?>
ambitie.push(<?= intval($ambitie->gemscore) ?>)
<?php } //if
if(!isset($score->gem) || intval($score->gem) == 0){ ?>
scores.push({
y: null,
color: '<?= isset($score->kleurcode)? $score->kleurcode : "#808080" ?>',
@@ -51,8 +40,18 @@
});//object
<?php } //if
}//foreach ?>
<?php }
else { ?>//if
scores.push({
y: <?= intval($score->gem) ?>,
color: '<?= isset($score->kleurcode)? $score->kleurcode : "#808080" ?>',
name: '<?= $score->nummer ?>'
});// object
<?php }
}//foreach ?>
labels.push('gem')
labels.unshift(' ');
@@ -74,30 +73,20 @@
color: 'transparent',
name: ' '
})
gemiddelde.push({
y: <?= intval($totgem) ?>,
name: 'gemiddelde'
})
gemiddelde.unshift({
y: null,
name: ' '
})
gemiddelde.push({
y: <?= intval($totgem) ?>,
name: ' '
})
ambitie.push(<?= intval($ambitie->gemscore) ?>)
ambitie.unshift(null)
ambitie.push(<?= intval($ambitie->gemscore) ?>)
Highcharts.chart('schoolijkpunt2', {
chart: {
type: 'spline',
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
alpha: 3,
beta: 3,
depth: 50,
viewDistance: 25
}
@@ -115,7 +104,6 @@
yAxis: {
min: 0,
max: 100,
tickInterval: 10,
title: {
text: 'procenten'
},
@@ -145,12 +133,13 @@
},
{showInLegend: false,
animation: false,
pointStart: 0,
marker: {
enabled: false
},
type: 'spline',
name: 'gemiddelde',
data: gemiddelde
data: ambitie
}]
});
application/views/monpas/sop/monbastabel1.php
+2
View File
@@ -4,6 +4,8 @@
minimaal <?=$ambitie->xijkpunten?>
<?=$labels['ijkpunten']?>
op <?=$ambitie->zprocent?>% of hoger.
<br>
<?=$ambitie->ambitievan ?>-ambitie
</p>
<hr/>
application/views/monpas/sopkeuze/ambities.php
+20 -2
View File
@@ -11,14 +11,32 @@
</head>
<body>
<?php if ($data['lijsten']){ ?>
<div class="sopfonts" style="margin-top: 20px;">
<?php if ($data['lijsten'] && $data['eigenambitie'] == 'F'){ ?>
<div class="sopfonts" style="margin-top: 10px;">
<p>gemiddelde score <?php echo $data['lijsten'][0]->ambities->gemscore.'%'?> <br>
minimaal <?php echo $data['lijsten'][0]->ambities->xijkpunten?>
<?=$data['lijsten'][0]->label?>
op <?=$data['lijsten'][0]->ambities->zprocent?>% of hoger.
<br>
<span>(standaardambitie)</span>
</p>
</div>
<?php } ?>
<?php if ($data['lijsten'] && $data['eigenambitie'] == 'T'){ ?>
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
<div class="sopfonts" style="margin-top: 10px;">
<p>gemiddelde score <?php echo $lijst->ambities->gemscore.'%'?> <br>
minimaal <?php echo $lijst->ambities->xijkpunten?>
<?=$lijst->label?>
op <?=$lijst->ambities->zprocent?>% of hoger.
<br>
<span>p. <?=$lijst->periodenummer?>, <?=$lijst->ambities->ambitievan?>-ambitie</span>
</p>
</div>
<?php } // foreach lijsten ?>
<?php } ?>
</body>
</html>
application/views/monpas/sopkeuze/ijkgrafiekgemiddeld.php
+64 -63
View File
@@ -16,34 +16,29 @@
<body>
<div >
<div id="chartSopIJkGem" style="width: 580px; height:285px; margin: 0 auto; "> </div>
<?php if ($data['lijsten']){ ?>
<div><span style="font-weight: bold"><?php echo $data ['versienaam']?></span>
<span style="font-weight: bold"><?php echo $data['lijsten'][0]->vorm == 1 ? ', schoolversie' : ', indivduele versie';?></span>
</div>
<div><?php foreach($data['lijsten'] as $index => $lijst){
if ($index == 1 && $data['aantal']== 2) echo 'Vergelijking:';
if ($index == 1 && $data['aantal'] != 2) echo 'Vergelijkingen:'?>
<p><?php echo $lijst->vantm ?></p>
<?php }; ?>
</div>
<?php } ?>
<div id="chartSopIJkGem" style="width: 580px; height:300px; margin: 0 auto; background-color: #f8f7f1; "> </div>
</div>
<script>
<?php if ($data['lijsten']){ ?>
$(function(){
fFillGraph=function(){
var xas = [];
var verkorteVersies = [];
var balkGegevens = [];
var lijnGegevens;
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
var balkGegevens = [];
var lijnGegevens = [];
var eigenAmbities = '<?=$data['eigenambitie'] ?>';
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
var indexnummer = <?= $index?>;
var labels = [];
var scores = [];
var ambities = [];
var ambitienaam = 'standaardambitie'
var ambitiewaarde =<?=intval($lijst->ambities->gemscore) ?>;
if(eigenAmbities == 'T') {
ambitienaam = 'p. ' + '<?=$lijst->periodenummer ?>' + ', ' + '<?=$lijst->ambities->ambitievan ?>' + '-ambitie';
}
var xastitel = '';
<?php if($lijst->label){ ?>
@@ -53,86 +48,81 @@
<?php foreach($lijst->scores as $index2 => $score){
$kleur = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F' && isset($score->kleur)) $kleur = $score->kleur;?>
labels.push('<?php $score->nummer ?>');
<?php if(intval($score->gem)> 0){ ?>
scores.push({
y: <?= $score->gem ?>,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
})
<?php }//if
if(intval($score->gem) == 0){ ?>
ambities.push(ambitiewaarde);
<?php if(!isset($score->gem) || intval($score->gem) == 0){ ?>
scores.push({
y: null,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
})
<?php }//if
<?php }
else {?>
scores.push({
y: <?= $score->gem ?>,
color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>',
})
<?php }//else
} // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000',
name: '',
}
);
labels.unshift(' ');
var legescore ={
y : 0,
y : null,
color : 'transparent',
name : '0',
name : 'x',
};
scores.unshift(legescore);
verkorteVersies.unshift(<?= $lijst->periodenummer ?>);
labels.push(' ');
scores.push(legescore);
verkorteVersies.push(<?=$lijst->periodenummer ?>);
balkGegevens[indexnummer] =({
ambities.unshift(ambitiewaarde);
ambities.push(ambitiewaarde);
var xas = [];
balkGegevens.push({
dataLabels: {
format: '{point.versie}'
enabled : true,
nullFormat: '',
format: '<span style="font-size: 9px; font-weight: normal;">'+ '<?=$lijst->periodenummer ?>'+'</span>',
},
type : 'column',
name : verkorteVersies,
name : '<?=$lijst->vantm ?>',
color : '#f8f7f1',
backgroundColor: '#e6e6e6',
data : scores
});
<?php } // foreach lijsten ?>
var extralijn = {
y: ambitiewaarde,
name: '',
soort: 'extra'
};
ambities.unshift(extralijn);
ambities.push(extralijn);
var splinedata=[]
var xas = []
if (balkGegevens[0]){
$.each(balkGegevens[0].data,function(i,p){
if (p.name== '0') xas.push('')
if (p.name=== 'x') xas.push('');
else xas.push(p.name);
splinedata.push(ambitiewaarde)
});
}
lijnGegevens = ({
dataLabels: {
format: ''
},
type: 'spline',
name: verkorteVersies,
data: splinedata //ambities
name: ambitienaam,
data: ambities //ambities
});
balkGegevens.push(lijnGegevens);
// });
<?php } // foreach lijsten ?>
var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartSopIJkGem', {
@@ -142,14 +132,17 @@
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
alpha: 5,
beta: 5,
depth: 50,
viewDistance: 25
}
},
title:{
text:''
text:'Versie: '+ '<?=$data['versienaam'] ?>',
style:{
fontSize: '14px'
}
},
credits: {
enabled: false
@@ -157,6 +150,11 @@
xAxis: {
type: 'category',
categories: xas,
labels:{
style:{
fontSize: '10px'
}
}
},
yAxis: {
min:0,
@@ -164,7 +162,12 @@
title: false,
},
legend: {
enabled: false
align: 'left',
verticalAlign: 'bottom',
floating: false,
itemStyle: {
fontWeight: 'normal'
}
},
plotOptions: {
column:{
@@ -186,15 +189,13 @@
},
spline: {
color: '#404040',
pointStart: 0,
marker: {
enabled: false
}
}
},
series: balkGegevens,
showInLegend: false
series: balkGegevens
});
}()
application/views/monpas/sopkeuze/ijkpuntengrafiek.php
+54 -59
View File
@@ -18,49 +18,43 @@
</head>
<body>
<div>
<div id="chartSopIJk" style="width: 580px; height:285px; margin: 0 auto; background-color: #f8f7f1;"> </div>
<?php if ($data['lijsten']){?>
<div><span style="font-weight: bold"><?php echo $data ['versienaam']; ?></span>
<span style="font-weight: bold"><?php echo $data['lijsten'][0]->vorm == 1 ? ', schoolversie' : ', indivduele versie';?></span>
</div>
<div>
<?php foreach($data['lijsten'] as $index => $lijst){
if ($index == 1 && $data['aantal']== 2) echo 'Vergelijking:';
if ($index == 1 && $data['aantal'] != 2) echo 'Vergelijkingen:';
?>
<p><?php echo $lijst->vantm ?></p>
<?php }; ?>
</div>
<?php } // if datalijsten ?>
<div id="chartSopIJk" style="width: 580px; height:300px; margin: 0 auto; background-color: #f8f7f1;"> </div>
</div>
<script>
<?php if ($data['lijsten']){ ?>
$(function(){
fFillGraph20=function(){
var xas = [];
var verkorteVersies = [];
var balkGegevens = [];
var lijnGegevens;
var lijnGegevens = [];
var eigenambities = '<?=$data['eigenambitie'] ?>';
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
var indexnummer = <?= $index?>;
var labels = [];
var scores = [];
var ambities = [];
var ambitienaam = 'standaardambitie'
var ambitiewaarde =<?=intval($lijst->ambities->gemscore) ?>;
if(eigenambities == 'T') {
ambitienaam = 'p. ' + '<?=$lijst->periodenummer ?>' + ', ' + '<?=$lijst->ambities->ambitievan ?>' + '-ambitie';
}
var xastitel = '';
<?php if($lijst->label){ ?>
var xastitel = '<?php echo $lijst->label ?>';
xastitel = '<?php echo $lijst->label ?>';
<?php } ?>
<?php foreach($lijst->scores as $index2 => $score){
?>
labels.push('<?= $score->nummer ?>');
<?php if(intval($score->gem) > 0){ ?>
ambities.push(ambitiewaarde);
<?php if(intval($score->gem) > 0){ ?>
scores.push({
y: <?= intval($score->gem) ?>,
color: '<?=$score->kleur ?>',
@@ -74,89 +68,85 @@
name: '<?= $score->nummer ?>',
});
<?php } //if
} // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000',
name: ''
}
);
labels.unshift(' ');
var legescore ={
y : 0,
y : null,
color : 'transparent',
name : '0'
name : 'x'
};
scores.unshift(legescore);
verkorteVersies.unshift(<?= $lijst->periodenummer ?>);
labels.push(' ');
scores.push(legescore);
verkorteVersies.push(<?=$lijst->periodenummer ?>);
balkGegevens[indexnummer] =({
ambities.unshift(ambitiewaarde);
ambities.push(ambitiewaarde);
var xas = [];
balkGegevens.push({
dataLabels: {
format: '<span style="font-size: 5px;">{point.versie}</span>'
enabled : true,
nullFormat: '',
format: '<span style="font-size: 9px; font-weight: normal;">'+ '<?=$lijst->periodenummer ?>'+'</span>',
},
type : 'column',
name : verkorteVersies,
name : '<?=$lijst->vantm ?>',
color : '#f8f7f1',
backgroundColor: '#e6e6e6',
data : scores
});
<?php } // foreach lijsten ?>
var extralijn = {
y: ambitiewaarde,
name: '',
};
ambities.unshift(extralijn);
ambities.push(extralijn);
var splinedata=[];
var xas = [];
if (balkGegevens[0]){
if (balkGegevens[0]){
$.each(balkGegevens[0].data,function(i,p){
if (p.name=== '0') xas.push('');
if (p.name=== 'x') xas.push('');
else xas.push(p.name);
splinedata.push(ambitiewaarde)
});
}
lijnGegevens = ({
dataLabels: {
format: ''
},
type: 'spline',
name: verkorteVersies,
data: splinedata //ambities
name: ambitienaam,
data: ambities //ambities
});
balkGegevens.push(lijnGegevens);
// });
<?php } // foreach lijsten ?>
var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartSopIJk', {
chart:{
animation: false,
type: 'column',
backgroundColor: 'transparent',
options3d: {
enabled: true,
alpha: 15,
beta: 15,
alpha: 5,
beta: 5,
depth: 50,
viewDistance: 25
}
},
title:{
text:''
text: 'Versie: '+ '<?=$data['versienaam'] ?>',
style:{
fontSize: '14px'
}
},
credits: {
enabled: false
@@ -174,6 +164,7 @@
min:0,
max: 100,
title: false,
tickInterval: 10,
labels:{
style:{
fontSize: '10px'
@@ -182,7 +173,13 @@
}
},
legend: {
enabled: false
align: 'left',
verticalAlign: 'bottom',
floating: false,
itemStyle: {
fontWeight: 'normal'
}
},
plotOptions: {
column:{
@@ -205,15 +202,13 @@
},
spline: {
color: 'grey',
pointStart: 0,
marker: {
enabled: false
}
}
},
series: balkGegevens,
showInLegend: false
series: balkGegevens
});
}()
application/views/monpas/sopkeuze/ijktabelgemiddeld.php
+2 -2
View File
@@ -47,10 +47,10 @@
$kleur = '#808080';
if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt== 'F')
$kleur = $score->kleur;
$gem = $score->gem;
$gem = 0;
if($score->disablenvt == 'T') $gem = 'nvt';
if($score->disabled == 'T') $gem = 'uit';
?>
if($score->disablenvt == 'F' && $score->disabled == 'F') $gem = number_format($score->gem);?>
<tr style="border: 1px solid grey">
application/views/monpas/sopkeuze/matrix.php
+2 -2
View File
@@ -33,10 +33,10 @@
<td style="text-align:left; width: 100px; overflow-x: hidden ">
<?php if (isset($data['lijsten'][0]->brin)){
echo $data['lijsten'][0]->brin.'-'.$data['lijsten'][0]->orgnaam;
echo $data['lijsten'][0]->brin.'-'.$data['lijsten'][0]->naam;
}
else {
echo $data['lijsten'][0]->orgnaam;};
echo $data['lijsten'][0]->naam;};
?>
</td>
application/views/monpas/sopkeuze/matrixgemiddeld.php
+5 -4
View File
@@ -33,10 +33,10 @@
<td style="text-align:left; width: 100px; overflow-x: hidden ">
<?php if (isset($data['lijsten'][0]->brin)){
echo $data['lijsten'][0]->brin.'-'.$data['lijsten'][0]->orgnaam;
echo $data['lijsten'][0]->brin.'-'.$data['lijsten'][0]->naam;
}
else {
echo $data['lijsten'][0]->orgnaam;};
echo $data['lijsten'][0]->naam;};
?>
</td>
@@ -45,9 +45,10 @@
foreach($data['lijsten'][0]->scores as $score){
$kleur = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F' && isset($score->kleur)) $kleur = $score->kleur;
$gem = number_format($score->gem);
$gem = 0;
if($score->disablenvt == 'T') $gem = 'nvt';
if($score->disabled == 'T') $gem = 'uit';?>
if($score->disabled == 'T') $gem = 'uit';
if($score->disablenvt == 'F' && $score->disabled == 'F') $gem = number_format($score->gem);?>
<td style=" color:white; width: 30px; text-align:center; border-left: 1px solid grey; background-color:<?=$kleur?>">
<div >
<?php echo $gem;