Merge branch 'feature/robbobswop' into develop
This commit is contained in:
Monique
@@ -51,7 +51,8 @@ class MY_Controller extends CI_Controller{
|
||||
// public $version = '1.17.63'; // mogelijkheid tot toevoegen omschrijvingen bij scores
|
||||
// public $version = '1.17.64'; // fout in ophalen scores ++ + - -- in matrix, individuele en schoolgemiddelden,
|
||||
// public $version = '1.17.66'; // instrument diversiteit po 2203
|
||||
public $version = '1.17.67'; // logo en foto koko
|
||||
// public $version = '1.17.67'; // logo en foto koko
|
||||
public $version = '1.17.68'; // bopropswop
|
||||
public $partituurid;
|
||||
public $globProfielVersieID = 1;
|
||||
public $userid; //id of the user that is logged in
|
||||
|
||||
@@ -237,6 +237,12 @@ class Compacteonderdelen
|
||||
$this->jaar = new stdClass();
|
||||
$this->jaar->aantallen =
|
||||
$this->CI->Aantalleerlingen_model->get_omvang($this->omvangjaar, $this->orglist);
|
||||
$totaal = 'Totaal aantal leerlingen: ' . $this->jaar->aantallen->aantal;
|
||||
$scholen = ' scholen';
|
||||
if($this->jaar->aantallen->aantalorgs == 1) $scholen = ' school';
|
||||
if($this->organisatie->soort < 4) $totaal = $totaal. ' van '.$this->jaar->aantallen->aantalorgs. $scholen;
|
||||
$this->jaar->aantallen->totaal = $totaal;
|
||||
|
||||
$this->jaar->tlvs =
|
||||
$this->CI->Tlvs_model->getAantalLeerlingenMetTLV($this->omvangjaar, $this->orglist);
|
||||
|
||||
|
||||
@@ -0,0 +1,395 @@
|
||||
|
||||
<div class="sopPagina">
|
||||
|
||||
<input id="schooljaar1"
|
||||
value='2021-2022'
|
||||
type="hidden"/>
|
||||
<input id="schoolid1"
|
||||
value="2 "
|
||||
type ="hidden" />
|
||||
<input id="schooljaarnummer1"
|
||||
value="10 "
|
||||
type ="hidden" />
|
||||
|
||||
<div class="row" style='padding-top:1px;'>
|
||||
<div style="margin-top:-20px"></div>
|
||||
|
||||
<div class="col-xs-9" >
|
||||
<div class="sopSchoolBlok">
|
||||
<table class="sopSchoolTabel" style="table-layout:fixed">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="sopTabeltd" style="color:#737373 !important ; width:45px">SWV </td>
|
||||
<td class="sopTabeltd" style="overflow-x: hidden; width:200px; white-space:nowrap" >
|
||||
Mijn SWV </td>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;width:45px">Adres
|
||||
</td>
|
||||
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;">
|
||||
</td>
|
||||
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
|
||||
</td>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;">Plaats
|
||||
</td>
|
||||
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;">E-mail
|
||||
</td>
|
||||
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
|
||||
</td>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;">Telefoon
|
||||
</td>
|
||||
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;">Datum
|
||||
</td>
|
||||
<td class="sopTabeltd">
|
||||
16-09-2021 </td>
|
||||
<td class="sopTabeltd" style="color:#737373 !important;">Website
|
||||
</td>
|
||||
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-3" style="padding-left:2px; padding-right: 12px;">
|
||||
|
||||
<div class="sopBlokLegenda ">
|
||||
<p class="legendaTitel">Legenda</p>
|
||||
|
||||
<table class="sopLegendaTabel" style="margin-top: 0; margin-left:auto; margin-right:auto">
|
||||
<tr >
|
||||
<td style="width: 30px; border: 1px solid grey;background-color: #99d6ff !important"></td>
|
||||
<td style="padding-left:10px;border: 1px solid grey;">score >= 90 en <= 100</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width: 30px; border: 1px solid grey;background-color: #9fdf9f !important"></td>
|
||||
<td style="padding-left:10px;border: 1px solid grey;">score >= 80 en < 90</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width: 30px; border: 1px solid grey;background-color: #ffcc80 !important"></td>
|
||||
<td style="padding-left:10px;border: 1px solid grey;">score >= 60 en < 80</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width: 30px; border: 1px solid grey;background-color: #e08885 !important"></td>
|
||||
<td style="padding-left:10px;border: 1px solid grey;">score <= 60</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6" style="padding-right: 5px">
|
||||
<div class="sopKaderOnderdeel" >
|
||||
<link rel="stylesheet" type="text/css" href="http://app.monpas.nl/css/chart.css" />
|
||||
<script type="text/javascript" src="http://app.monpas.nl/js_lib/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="http://app.monpas.nl/js_lib/Highcharts/code/highcharts.js"></script>
|
||||
|
||||
|
||||
<div class="sopOnderdeelBlok">
|
||||
<div class="sopTitelHolder " >
|
||||
<p class="sopTitel">De omvang van de extra ondersteuning</p>
|
||||
<div class="col-xs-12 sopTitel" style="width: 350px;">
|
||||
<p class=" subTitel1" >2020-2021</p>
|
||||
|
||||
<span class="subTitel2">Totaal aantal leerlingen: 223 van 2 scholen</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
|
||||
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
|
||||
<div id="omvangchart" style="width: 350px; height: 175px;">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
|
||||
<span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span>
|
||||
</div>
|
||||
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
|
||||
|
||||
<div id="tlvs" style="width: 300px; height: 150px;">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
// Build the chart
|
||||
|
||||
$(function(){
|
||||
|
||||
var schooljaren = [];
|
||||
var aantallln = [];
|
||||
var aantalarr = [];
|
||||
var so = 0;
|
||||
var sbo = 0;
|
||||
var so2 = 0;
|
||||
var sbo2 = 0;
|
||||
var aantalso = [];
|
||||
var aantalsbo = [];
|
||||
var series = [];
|
||||
schooljaren.push('2020-2021');
|
||||
aantallln.push(223)
|
||||
aantalarr.push(54)
|
||||
sbo = sbo + (5)
|
||||
sbo = sbo + (2)
|
||||
so = so + (5)
|
||||
so = so + (5)
|
||||
so = so + (4)
|
||||
aantalsbo.push(sbo)
|
||||
aantalso.push(so)
|
||||
|
||||
schooljaren.unshift(' ');
|
||||
schooljaren.push(' ');
|
||||
aantallln.unshift(223);
|
||||
aantallln.push(223);
|
||||
aantalarr.unshift(0);
|
||||
aantalarr.push(0);
|
||||
aantalsbo.unshift(0);
|
||||
aantalsbo.push(0);
|
||||
aantalsbo.unshift(0);
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'tlvs sbo ',
|
||||
color: '#005c99',
|
||||
data: aantalsbo,
|
||||
stack: 'tlvs'
|
||||
})
|
||||
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'tlvs so ',
|
||||
color: '#4d9900',
|
||||
data: aantalso,
|
||||
stack: 'tlvs'
|
||||
})
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'arrangementen',
|
||||
color: '#ffcc80',
|
||||
data: aantalarr,
|
||||
stack: 'arrangementen'
|
||||
})
|
||||
|
||||
|
||||
series.push({
|
||||
type: 'spline',
|
||||
name: 'totaal leerlingen',
|
||||
color : '#A28A29',
|
||||
data: aantallln,
|
||||
marker: {
|
||||
lineWidth: 2
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
maakChart(schooljaren, series)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
var pieID = 'tlvs';
|
||||
|
||||
var aantallen = [
|
||||
{
|
||||
name: '(' + 5 + ') sbo licht',
|
||||
y: 5,
|
||||
color: '#99d6ff'
|
||||
},
|
||||
{
|
||||
name: '(' + 2 + ') sbo zwaar',
|
||||
y: 2,
|
||||
color: '#005c99'
|
||||
},
|
||||
{
|
||||
name: '(' + 5 + ') so laag',
|
||||
y: 5,
|
||||
color: '#d9ffb3'
|
||||
},
|
||||
{
|
||||
name: '(' + 5 + ') so midden',
|
||||
y: 5,
|
||||
color: '#66cc00'
|
||||
},
|
||||
{
|
||||
name: '(' + 4 + ') so hoog',
|
||||
y: 4,
|
||||
color: '#4d9900'
|
||||
},
|
||||
]
|
||||
maakPie(pieID, aantallen);
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
function maakChart(schooljaren, series){
|
||||
Highcharts.chart('omvangchart', {
|
||||
// // chart: {
|
||||
// backgroundColor: 'transparent',
|
||||
// plotBorderWidth: null,
|
||||
// plotShadow: false,
|
||||
// margin: [0,-10, 0, -80]
|
||||
// },
|
||||
credits: {
|
||||
enabled: false
|
||||
},
|
||||
title: {
|
||||
text: null
|
||||
|
||||
},
|
||||
|
||||
xAxis: {
|
||||
categories: schooljaren
|
||||
},
|
||||
|
||||
yAxis: {
|
||||
allowDecimals: false,
|
||||
min: 0,
|
||||
title: {
|
||||
text: 'Aantal leerlingen',
|
||||
style:{
|
||||
fontSize: '8px'
|
||||
},
|
||||
},
|
||||
labels:{
|
||||
style: {
|
||||
fontSize: '8px'
|
||||
} ,
|
||||
},
|
||||
|
||||
stackLabels: {
|
||||
enabled: true,
|
||||
style:{
|
||||
fontSize: '8px',
|
||||
fontWeight: '200'
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
plotOptions: {
|
||||
column: {
|
||||
stacking: 'normal'
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
itemStyle: {
|
||||
fontWeight: '200',
|
||||
fontSize: '8px',
|
||||
},
|
||||
// backgroundColor: 'white',
|
||||
borderWidth: 0.5,
|
||||
align: 'right',
|
||||
symbolPadding: 1,
|
||||
padding: 8,
|
||||
verticalAlign: 'top',
|
||||
floating: true,
|
||||
x: 10,
|
||||
y: -2,
|
||||
width: 100,
|
||||
itemWidth: 100,
|
||||
itemDistance: 0,
|
||||
|
||||
},
|
||||
|
||||
series: series
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function maakPie(pieID, punten) {
|
||||
Highcharts.chart(pieID, {
|
||||
chart: {
|
||||
backgroundColor: 'transparent',
|
||||
plotBorderWidth: null,
|
||||
plotShadow: false,
|
||||
type: 'pie',
|
||||
margin: [0,-10, -50, -80]
|
||||
},
|
||||
title: {
|
||||
text: null,
|
||||
margin: 0,
|
||||
},
|
||||
credits: {
|
||||
enabled: false
|
||||
},
|
||||
plotOptions: {
|
||||
pie: {
|
||||
// allowPointSelect: true,
|
||||
size: 95,
|
||||
padding: 0,
|
||||
|
||||
// cursor: 'pointer',
|
||||
dataLabels: {
|
||||
enabled: false,
|
||||
},
|
||||
showInLegend: true,
|
||||
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
itemStyle: {
|
||||
fontWeight: '200',
|
||||
fontSize: '8px',
|
||||
},
|
||||
align: 'right',
|
||||
symbolPadding: 1,
|
||||
padding: 0,
|
||||
verticalAlign: 'top',
|
||||
floating: true,
|
||||
x: 10,
|
||||
y: 0,
|
||||
width: 80,
|
||||
itemWidth: 80,
|
||||
itemDistance: 0,
|
||||
|
||||
},
|
||||
series: [{
|
||||
name: 'tlvs',
|
||||
// colorByPoint: true,
|
||||
data: punten
|
||||
}]
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6" style="padding-left: 5px;padding-right:10px">
|
||||
<div class="sopKaderOnderdeel">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12" style='padding-right: 10px'>
|
||||
<div class="sopKaderOnderdeel">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -6,16 +6,9 @@ class Lijsten
|
||||
private $modulenr;
|
||||
private $ijkpunten;
|
||||
private $clusterid;
|
||||
private $orgversieid;
|
||||
private $orgversie;
|
||||
private $vorm;
|
||||
private $label;
|
||||
private $label2;
|
||||
private $jaartal;
|
||||
private $versienaam;
|
||||
private $soort;
|
||||
private $aantal;
|
||||
private $vNaam;
|
||||
private $schoolScores;
|
||||
private $gemiddeldeScores;
|
||||
private $bestuurScores;
|
||||
@@ -26,19 +19,13 @@ class Lijsten
|
||||
private $bestuurAfbeeldingen;
|
||||
private $kamerAfbeeldingen;
|
||||
private $swvAfbeeldingen;
|
||||
private $scores;
|
||||
private $score;
|
||||
private $onderorgs;
|
||||
private $zprocent;
|
||||
private $vergelijking;
|
||||
private $vergelijkingen;
|
||||
private $aantalscholen;
|
||||
private $ambitiearray = [];
|
||||
private $adviezen;
|
||||
private $lijst;
|
||||
private $lijsten = [];
|
||||
private $nieuwste = 0;
|
||||
private $periodenummer;
|
||||
private $nieuwsteversie;
|
||||
private $kleuren;
|
||||
private $org;
|
||||
@@ -141,6 +128,7 @@ class Lijsten
|
||||
$this->setMetingenVergelijking();
|
||||
$this->setMetingenVergelijkingIndividueel();
|
||||
$this->setResultaten();
|
||||
$this->setrapportInfo();
|
||||
$this->setLijsten();
|
||||
|
||||
}
|
||||
@@ -170,8 +158,6 @@ class Lijsten
|
||||
|
||||
$this->lijst->periodenummer = $this->lijst->orgversie->periodenummer;
|
||||
$this->lijst->jaartal = substr($this->lijst->orgversie->geldigvanaf, 2,2);
|
||||
$this->lijst->vantm = "periode " . $this->lijst->orgversie->periodenummer . " van " .
|
||||
mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm);
|
||||
}
|
||||
|
||||
private function setVersieNaam(){
|
||||
@@ -338,13 +324,13 @@ class Lijsten
|
||||
private function setSchoolMetingen(){
|
||||
|
||||
if($this->lijst->vorm != 1) return;
|
||||
if(!$this->lijst->scores) $this->lijst->metingen = 0;
|
||||
else if ($this->soort == 4) $this->lijst->metingen = 1;
|
||||
if(!$this->lijst->scores) $this->lijst->aantalorgs = 0;
|
||||
else if ($this->soort == 4) $this->lijst->aantalorgs = 1;
|
||||
else {
|
||||
if(! isset($this->lijst->scores[0]->aantalscholen)) $this->lijst->metingen = 0;
|
||||
if(! isset($this->lijst->scores[0]->aantalscholen)) $this->lijst->aantalorgs = 0;
|
||||
|
||||
else {
|
||||
$this->lijst->metingen = $this->lijst->scores[0]->aantalscholen;
|
||||
$this->lijst->aantalorgs = $this->lijst->scores[0]->aantalscholen;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -354,17 +340,19 @@ class Lijsten
|
||||
if (!isset($this->lijst->scores)) return;
|
||||
if ($this->lijst->vorm != 2) return;
|
||||
$this->lijst->metingen = 0;
|
||||
$this->lijst->aantalorgs = 0;
|
||||
|
||||
if ($this->soort == 4) {
|
||||
$gevuld = $this->CI->Scores_model->fCountGevuldeVersies($this->lijst->orgversieid, $this->orgid);
|
||||
if($gevuld){
|
||||
$this->lijst->metingen = count($gevuld);}
|
||||
$this->lijst->metingen = $gevuld->aantal;}
|
||||
};
|
||||
|
||||
if ($this->soort == 3) {
|
||||
$gevuld = $this->CI->Scores_model->fCountGevuldeBestuurVersies($this->lijst->orgversieid, $this->orgid);
|
||||
if($gevuld){
|
||||
$this->lijst->metingen = count($gevuld);}
|
||||
$this->lijst->metingen = $gevuld->aantal;
|
||||
$this->lijst->aantalorgs = $gevuld->aantalorgs;}
|
||||
};
|
||||
|
||||
if ($this->soort == 2) {
|
||||
@@ -373,7 +361,8 @@ class Lijsten
|
||||
$this->setGevuldeVersies12();
|
||||
$metingen = $this->CI->Scores_model->fCountGevuldeKamerEnSWVVersies($this->lijst->orgversieid, $this->orgstring);
|
||||
if($metingen){
|
||||
$this->lijst->metingen = $metingen;
|
||||
$this->lijst->metingen = $metingen->aantal;
|
||||
$this->lijst->aantalorgs = $metingen->aantalorgs;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -382,7 +371,8 @@ class Lijsten
|
||||
$this->setGevuldeVersies12();
|
||||
$metingen = $this->CI->Scores_model->fCountGevuldeKamerEnSwvVersies($this->lijst->orgversieid, $this->orgstring);
|
||||
if($metingen){
|
||||
$this->lijst->metingen = $metingen;
|
||||
$this->lijst->metingen = $metingen->aantal;
|
||||
$this->lijst->aantalorgs = $metingen->aantalorgs;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -445,6 +435,22 @@ class Lijsten
|
||||
}
|
||||
}
|
||||
|
||||
private function setRapportInfo(){
|
||||
$scholen = ' scholen';
|
||||
if(intval($this->lijst->aantalorgs) == 1) $scholen = ' school';
|
||||
$toevoeging = '';
|
||||
if(intval($this->lijst->vorm) == 2) {
|
||||
$metingen = ' metingen';
|
||||
if(intval($this->lijst->metingen) == 1) $metingen = ' meting';
|
||||
$toevoeging = ', '. $this->lijst->metingen. $metingen;
|
||||
|
||||
}
|
||||
if(intval($this->soort < 4)) $toevoeging .= ', '. $this->lijst->aantalorgs. $scholen;
|
||||
$this->lijst->vantm = "periode " . $this->lijst->orgversie->periodenummer . " van " .
|
||||
mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm) .
|
||||
$toevoeging;
|
||||
}
|
||||
|
||||
private function setLijsten(){
|
||||
$this->lijsten [] = $this->lijst;
|
||||
}
|
||||
@@ -487,7 +493,7 @@ class Lijsten
|
||||
'aantal' => $this->aantal,
|
||||
'nieuwsteversie' => $this->nieuwsteversie,
|
||||
'kleuren' => $this->kleuren,
|
||||
'versienaam' => $this->versienaam,
|
||||
'versienaam' => $this->versienaam
|
||||
];
|
||||
|
||||
|
||||
|
||||
@@ -409,9 +409,8 @@ class Scores_model extends MY_Model{
|
||||
AND FV.organisatie_id = {$orgid}
|
||||
AND FV.meetellen = 1
|
||||
AND S.score > 0
|
||||
GROUP BY S.filledversion_id
|
||||
HAVING COUNT(S.id) >= 5";
|
||||
return $this->get_query_result('aantal');
|
||||
return $this->get_query_result();
|
||||
}
|
||||
|
||||
|
||||
@@ -444,13 +443,12 @@ class Scores_model extends MY_Model{
|
||||
AND FV.organisatie_id IN ({$orglist})
|
||||
AND FV.meetellen = 1
|
||||
AND S.score > 0
|
||||
GROUP BY S.filledversion_id
|
||||
HAVING COUNT(S.id) >= 5) AS Q ";
|
||||
return $this->get_query_row();
|
||||
}
|
||||
|
||||
function fCountGevuldeBestuurVersies($orgversieid, $bgid){
|
||||
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal
|
||||
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal, COUNT(DISTINCT(O.id)) AS aantalorgs
|
||||
FROM tb_scores S
|
||||
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
|
||||
JOIN tb_organisaties O ON FV.organisatie_id = O.id
|
||||
@@ -458,9 +456,8 @@ class Scores_model extends MY_Model{
|
||||
AND O.valtonder_id = {$bgid}
|
||||
AND FV.meetellen = 1
|
||||
AND S.score > 0
|
||||
GROUP BY S.filledversion_id
|
||||
HAVING COUNT(S.id) >= 5";
|
||||
return $this->get_query_row('aantal');
|
||||
return $this->get_query_row();
|
||||
}
|
||||
|
||||
|
||||
@@ -507,7 +504,7 @@ class Scores_model extends MY_Model{
|
||||
|
||||
|
||||
function fCountGevuldeKamerEnSWVVersies($orgversieid, $orgs){
|
||||
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal
|
||||
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal, COUNT(DISTINCT(O.id)) AS aantalorgs
|
||||
FROM tb_scores S
|
||||
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
|
||||
JOIN tb_organisaties O ON FV.organisatie_id = O.id
|
||||
@@ -515,11 +512,10 @@ class Scores_model extends MY_Model{
|
||||
AND O.id IN ({$orgs})
|
||||
AND FV.meetellen = 1
|
||||
AND S.score > 0
|
||||
GROUP BY S.filledversion_id
|
||||
HAVING COUNT(S.id) >= 5";
|
||||
HAVING COUNT(S.id) >= 5 ";
|
||||
|
||||
|
||||
return $this->get_query_row('aantal');
|
||||
return $this->get_query_row();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ class aantalleerlingen_model extends MY_Model{
|
||||
|
||||
|
||||
function get_omvang($schooljaarnr, $orgs){
|
||||
$this->sql=" SELECT A.schooljaarnr, S.naam, SUM(A.aantal) as aantal
|
||||
$this->sql=" SELECT A.schooljaarnr, S.naam, SUM(A.aantal) as aantal, COUNT(DISTINCT(A.organisatie_id)) aantalorgs
|
||||
FROM tb_schooljaren S
|
||||
JOIN tb_aantalleerlingen A ON S.schooljaarnr = A.schooljaarnr
|
||||
WHERE A.organisatie_id IN ({$orgs})
|
||||
|
||||
@@ -14,8 +14,7 @@
|
||||
<!-- class ="versievak"-->
|
||||
<div class="panel-body"
|
||||
style="height: 75px;"
|
||||
data-bind =" text: infotekst,
|
||||
visible: infotekst() && ! selected()> '',
|
||||
data-bind =" text: infotekst() && ! selected() ? infotekst: '',
|
||||
style: {color: (geenGegevens() || geenLicentie()) ? '#949494' : '#333333'} ">
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<!-- ko if: onderdelen() && onderdelen().length > 0 -->
|
||||
<div class="col-xs-8" >
|
||||
<h3 style="margin-top: 20px;">Kies onderdelen voor het Compact SOP</h3>
|
||||
<h3 style="margin-top: 20px;"
|
||||
data-bind= "text: label() ? 'Kies onderdelen voor het Compact ' + label() : '' "> </h3>
|
||||
</div>
|
||||
<div class="col-xs-4" >
|
||||
<h3 style="margin-top: 20px;" >Gekozen onderdelen </h3>
|
||||
|
||||
@@ -12,24 +12,23 @@
|
||||
<div class="col-xs-12 sopTitel" style="width: 350px;">
|
||||
<p class=" subTitel1" ><?php echo $data[0]->aantallen->naam?></p>
|
||||
|
||||
<span class="subTitel2">Totaal aantal leerlingen: <?php echo $data[0]->aantallen->aantal ?></span>
|
||||
<span class="subTitel2"><?php echo $data[0]->aantallen->totaal ?></span>
|
||||
</div>
|
||||
<?php else : ?>
|
||||
<div class="col-xs-6 sopTitel" style="width: 175px;">
|
||||
<p class=" subTitel1" ><?php echo $data[0]->aantallen->naam?></p>
|
||||
|
||||
<span class="subTitel2">Totaal aantal leerlingen: <?php echo $data[0]->aantallen->aantal ?></span>
|
||||
<span class="subTitel2"><?php echo $data[0]->aantallen->totaal ?></span>
|
||||
</div>
|
||||
<div class="col-xs-6 sopTitel" style="width: 175px; display: inline-block; ">
|
||||
<p class="subTitel1"><?php echo $data[1]->aantallen->naam?></p>
|
||||
<span class="subTitel2">Totaal aantal leerlingen: <?php echo $data[1]->aantallen->aantal;
|
||||
<span class="subTitel2"><?php echo $data[1]->aantallen->totaal;
|
||||
?></span>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
|
||||
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
|
||||
<div id="omvangchart" style="width: 350px; height: 175px;">
|
||||
@@ -70,132 +69,11 @@
|
||||
<?php endif ?>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
// Build the chart
|
||||
|
||||
$(function(){
|
||||
|
||||
var schooljaren = [];
|
||||
var aantallln = [];
|
||||
var aantalarr = [];
|
||||
var so = 0;
|
||||
var sbo = 0;
|
||||
var so2 = 0;
|
||||
var sbo2 = 0;
|
||||
var aantalso = [];
|
||||
var aantalsbo = [];
|
||||
var series = [];
|
||||
<?php if(isset($data[0])) : ?>
|
||||
schooljaren.push('<?=$data[0]->aantallen->naam ?>');
|
||||
aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>)
|
||||
<?php if($data[0]->arrangementen) : ?>
|
||||
aantalarr.push(<?=intval($data[0]->arrangementen->aantal) ?>)
|
||||
<?php elseif (isset($data[1])) :?>
|
||||
aantalarr.push(0)
|
||||
<?php endif; ?>
|
||||
<?php if($data[0]->tlvs) : ?>
|
||||
<?php foreach($data[0]->tlvs as $tlv) : ?>
|
||||
<?php if($tlv->soort == "SBO") :?>
|
||||
sbo = sbo + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php if($tlv->soort == "SO") :?>
|
||||
so = so + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
aantalsbo.push(sbo)
|
||||
aantalso.push(so)
|
||||
<?php elseif (isset($data[1])) :?>
|
||||
aantalsbo.push(0)
|
||||
aantalso.push(0)
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if(isset($data[1])) : ?>
|
||||
schooljaren.push('<?=$data[1]->aantallen->naam ?>');
|
||||
aantallln.push(<?=intval($data[1]->aantallen->aantal) ?>)
|
||||
<?php if($data[1]->arrangementen) : ?>
|
||||
aantalarr.push(<?=intval($data[1]->arrangementen->aantal) ?>)
|
||||
<?php else :?>
|
||||
aantalarr.push(0)
|
||||
<?php endif; ?>
|
||||
<?php if($data[1]->tlvs) : ?>
|
||||
<?php foreach($data[1]->tlvs as $tlv) : ?>
|
||||
<?php if($tlv->soort == "SBO") :?>
|
||||
sbo2 = sbo2 + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php if($tlv->soort == "SO") :?>
|
||||
so2 = so2 + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
aantalsbo.push(sbo2)
|
||||
aantalso.push(so2)
|
||||
<?php else :?>
|
||||
aantalsbo.push(0)
|
||||
aantalso.push(0)
|
||||
<?php endif; ?>
|
||||
<?php else : ?>
|
||||
schooljaren.unshift(' ');
|
||||
schooljaren.push(' ');
|
||||
aantallln.unshift(<?=intval($data[0]->aantallen->aantal) ?>);
|
||||
aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>);
|
||||
aantalarr.unshift(0);
|
||||
aantalarr.push(0);
|
||||
aantalsbo.unshift(0);
|
||||
aantalsbo.push(0);
|
||||
aantalsbo.unshift(0);
|
||||
<?php endif; ?>
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'tlvs sbo ',
|
||||
color: '#005c99',
|
||||
data: aantalsbo,
|
||||
stack: 'tlvs'
|
||||
})
|
||||
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'tlvs so ',
|
||||
color: '#4d9900',
|
||||
data: aantalso,
|
||||
stack: 'tlvs'
|
||||
})
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'arrangementen',
|
||||
color: '#ffcc80',
|
||||
data: aantalarr,
|
||||
stack: 'arrangementen'
|
||||
})
|
||||
|
||||
|
||||
series.push({
|
||||
type: 'spline',
|
||||
name: 'totaal leerlingen',
|
||||
color : '#A28A29',
|
||||
data: aantallln,
|
||||
marker: {
|
||||
lineWidth: 2
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
maakChart(schooljaren, series)
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<?php if(($data[0]->tlvs)) : ?>
|
||||
<?php if(($data[0]->tlvs)) : ?>
|
||||
var pieID = 'tlvs';
|
||||
|
||||
var aantallen = [
|
||||
@@ -284,84 +162,133 @@
|
||||
maakPie(pieID, aantallen2);
|
||||
<?php endif ?>
|
||||
|
||||
var schooljaren = [];
|
||||
var aantallln = [];
|
||||
var arrangementen = [];
|
||||
var so = 0;
|
||||
var sbo = 0;
|
||||
var so2 = 0;
|
||||
var sbo2 = 0;
|
||||
var aantalso = [];
|
||||
var aantalsbo = [];
|
||||
var series = [];
|
||||
<?php if(isset($data[0])) : ?>
|
||||
schooljaren.push('<?=$data[0]->aantallen->naam ?>');
|
||||
aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>)
|
||||
<?php if($data[0]->arrangementen) : ?>
|
||||
arrangementen.push(<?=intval($data[0]->arrangementen->aantal) ?>)
|
||||
<?php elseif (isset($data[1])) :?>
|
||||
arrangementen.push(0)
|
||||
<?php endif; ?>
|
||||
<?php if($data[0]->tlvs) : ?>
|
||||
<?php foreach($data[0]->tlvs as $tlv) : ?>
|
||||
<?php if($tlv->soort == "SBO") :?>
|
||||
sbo = sbo + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php if($tlv->soort == "SO") :?>
|
||||
so = so + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
aantalsbo.push(sbo)
|
||||
aantalso.push(so)
|
||||
<?php elseif (isset($data[1])) :?>
|
||||
aantalsbo.push(0)
|
||||
aantalso.push(0)
|
||||
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if(isset($data[1])) : ?>
|
||||
schooljaren.push('<?=$data[1]->aantallen->naam ?>');
|
||||
aantallln.push(<?=intval($data[1]->aantallen->aantal) ?>)
|
||||
<?php if($data[1]->arrangementen) : ?>
|
||||
arrangementen.push(<?=intval($data[1]->arrangementen->aantal) ?>)
|
||||
<?php else :?>
|
||||
arrangementen.push(0)
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if($data[1]->tlvs) : ?>
|
||||
<?php foreach($data[1]->tlvs as $tlv) : ?>
|
||||
<?php if($tlv->soort == "SBO") :?>
|
||||
sbo2 = sbo2 + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if($tlv->soort == "SO") :?>
|
||||
so2 = so2 + (<?= intval($tlv->aantal) ?>)
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
aantalsbo.push(sbo2)
|
||||
aantalso.push(so2)
|
||||
<?php else :?>
|
||||
aantalsbo.push(0)
|
||||
aantalso.push(0)
|
||||
<?php endif; ?>
|
||||
<?php else : ?>
|
||||
schooljaren.unshift(' ');
|
||||
schooljaren.push(' ');
|
||||
aantallln.unshift(<?=intval($data[0]->aantallen->aantal) ?>);
|
||||
aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>);
|
||||
arrangementen.unshift(0);
|
||||
arrangementen.push(0);
|
||||
aantalsbo.unshift(0);
|
||||
aantalsbo.push(0);
|
||||
aantalsbo.unshift(0);
|
||||
|
||||
|
||||
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'tlvs sbo ',
|
||||
color: '#005c99',
|
||||
data: aantalsbo,
|
||||
stack: 'tlvs'
|
||||
})
|
||||
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'tlvs so ',
|
||||
color: '#4d9900',
|
||||
data: aantalso,
|
||||
stack: 'tlvs'
|
||||
})
|
||||
|
||||
series.push({
|
||||
type: 'column',
|
||||
name: 'arrangementen',
|
||||
color: '#ffcc80',
|
||||
data: arrangementen,
|
||||
stack: 'arrangementen'
|
||||
})
|
||||
|
||||
|
||||
// series.push({
|
||||
// type: 'spline',
|
||||
// name: 'totaal leerlingen',
|
||||
// color : '#A28A29',
|
||||
// data: aantallln,
|
||||
// marker: {
|
||||
// lineWidth: 2
|
||||
// }
|
||||
// });
|
||||
|
||||
|
||||
maakChart(schooljaren, series)
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
function maakChart(schooljaren, series){
|
||||
Highcharts.chart('omvangchart', {
|
||||
// // chart: {
|
||||
// backgroundColor: 'transparent',
|
||||
// plotBorderWidth: null,
|
||||
// plotShadow: false,
|
||||
// margin: [0,-10, 0, -80]
|
||||
// },
|
||||
credits: {
|
||||
enabled: false
|
||||
},
|
||||
title: {
|
||||
text: null
|
||||
|
||||
},
|
||||
|
||||
xAxis: {
|
||||
categories: schooljaren
|
||||
},
|
||||
|
||||
yAxis: {
|
||||
allowDecimals: false,
|
||||
min: 0,
|
||||
title: {
|
||||
text: 'Aantal leerlingen',
|
||||
style:{
|
||||
fontSize: '8px'
|
||||
},
|
||||
},
|
||||
labels:{
|
||||
style: {
|
||||
fontSize: '8px'
|
||||
} ,
|
||||
},
|
||||
|
||||
stackLabels: {
|
||||
enabled: true,
|
||||
style:{
|
||||
fontSize: '8px',
|
||||
fontWeight: '200'
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
plotOptions: {
|
||||
column: {
|
||||
stacking: 'normal'
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
itemStyle: {
|
||||
fontWeight: '200',
|
||||
fontSize: '8px',
|
||||
},
|
||||
// backgroundColor: 'white',
|
||||
borderWidth: 0.5,
|
||||
align: 'right',
|
||||
symbolPadding: 1,
|
||||
padding: 8,
|
||||
verticalAlign: 'top',
|
||||
floating: true,
|
||||
x: 10,
|
||||
y: -2,
|
||||
width: 100,
|
||||
itemWidth: 100,
|
||||
itemDistance: 0,
|
||||
|
||||
},
|
||||
|
||||
series: series
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function maakPie(pieID, punten) {
|
||||
Highcharts.chart(pieID, {
|
||||
chart: {
|
||||
@@ -369,7 +296,7 @@
|
||||
plotBorderWidth: null,
|
||||
plotShadow: false,
|
||||
type: 'pie',
|
||||
margin: [0,-10, -50, -80]
|
||||
margin: [0,-10, 0, -80]
|
||||
},
|
||||
title: {
|
||||
text: null,
|
||||
@@ -417,5 +344,77 @@
|
||||
});
|
||||
}
|
||||
|
||||
function maakChart(schooljaren, series){
|
||||
Highcharts.chart('omvangchart', {
|
||||
credits: {
|
||||
enabled: false
|
||||
},
|
||||
title: {
|
||||
text: null
|
||||
|
||||
},
|
||||
|
||||
xAxis: {
|
||||
categories: schooljaren
|
||||
},
|
||||
|
||||
yAxis: {
|
||||
allowDecimals: false,
|
||||
min: 0,
|
||||
title: {
|
||||
text: 'Aantal leerlingen',
|
||||
style:{
|
||||
fontSize: '8px'
|
||||
},
|
||||
},
|
||||
labels:{
|
||||
style: {
|
||||
fontSize: '8px'
|
||||
} ,
|
||||
},
|
||||
|
||||
stackLabels: {
|
||||
enabled: true,
|
||||
style:{
|
||||
fontSize: '8px',
|
||||
fontWeight: '200'
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
plotOptions: {
|
||||
column: {
|
||||
stacking: 'normal'
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
itemStyle: {
|
||||
fontWeight: '200',
|
||||
fontSize: '8px',
|
||||
},
|
||||
borderWidth: 0.5,
|
||||
align: 'right',
|
||||
symbolPadding: 1,
|
||||
padding: 8,
|
||||
verticalAlign: 'top',
|
||||
floating: true,
|
||||
x: 10,
|
||||
y: -2,
|
||||
width: 100,
|
||||
itemWidth: 100,
|
||||
itemDistance: 0,
|
||||
|
||||
},
|
||||
|
||||
series: series
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -482,15 +482,15 @@
|
||||
padding : 10px;
|
||||
border-radius : 5px;
|
||||
|
||||
margin-bottom : 10px;
|
||||
margin-bottom : 5px;
|
||||
}
|
||||
|
||||
.sopSchoolTabel{
|
||||
table-layout : fixed;
|
||||
margin-top : 5px;
|
||||
margin-bottom : 5px;
|
||||
margin-bottom : 2px;
|
||||
width : 95%;
|
||||
max-height : 95px;
|
||||
max-height : 90px;
|
||||
font-size : 0.7em;
|
||||
text-overflow : ellipsis;
|
||||
}
|
||||
@@ -500,7 +500,7 @@
|
||||
border-radius : 5px;
|
||||
width : 100%;
|
||||
height : 100px;
|
||||
margin-bottom : 10px;
|
||||
margin-bottom : 5px;
|
||||
text-align : center;
|
||||
}
|
||||
|
||||
@@ -535,16 +535,16 @@
|
||||
.sopKaderOnderdeel{
|
||||
height : 437px; //445px;
|
||||
width : 100%;
|
||||
margin-bottom : 5px;
|
||||
margin-bottom : 2px;
|
||||
}
|
||||
|
||||
.sopOnderdeelBlok{
|
||||
border : 1px solid #3494B5;
|
||||
width : 100%;
|
||||
height : 99%;
|
||||
|
||||
padding : 5px;
|
||||
padding-top : 0;
|
||||
padding-bottom : 0;
|
||||
border-radius : 5px;
|
||||
}
|
||||
|
||||
@@ -708,9 +708,9 @@
|
||||
|
||||
|
||||
|
||||
<div style="display:none">
|
||||
<div>
|
||||
<div class="container" id='compactSopPdf' >
|
||||
<div style="display:none">
|
||||
<div>
|
||||
<div class="container" id='compactSopPdf' >
|
||||
|
||||
<?php if ($schoolgegevens) { ?>
|
||||
<img style="max-width:45px; height:0px; visibility:hidden"
|
||||
@@ -722,7 +722,7 @@
|
||||
<img style="max-width:50%; height: 0px; visibility:hidden"
|
||||
src="http://app.monpas.nl/images/logos/frameworklogo.png"/>
|
||||
##PLACEHOLDER##
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
|
||||
@@ -321,11 +321,8 @@ mh.initCompactSopModel = function(){
|
||||
ko.applyBindings(mh.CompactSopModel, document.getElementById("pagcompactsop"));
|
||||
}
|
||||
$.post("index.php/monpas/compactsop/getorgsoort", function (result){
|
||||
console.log(result)
|
||||
if(result){
|
||||
self.orgsoortnummer(result);
|
||||
console.log(self.orgsoortnummer())
|
||||
console.log(result, "result")
|
||||
switch(result){
|
||||
case '1': self.orgsoort('SWV');
|
||||
self.label('SWOP');
|
||||
@@ -363,6 +360,7 @@ mh.initCompactSopModel = function(){
|
||||
self.paginas.removeAll();
|
||||
|
||||
if(data) {
|
||||
self.druk(true);
|
||||
$.each(data, function (i, s) {
|
||||
self.schooljaren.push(new fAddSchooljaar(s));
|
||||
});//each
|
||||
@@ -378,9 +376,10 @@ mh.initCompactSopModel = function(){
|
||||
var self =mh.CompactSopModel;
|
||||
if (self.druk()) return;
|
||||
if(self.selectedSchooljaar() === undefined){
|
||||
self.druk(true)
|
||||
self.fGetSchooljaren()
|
||||
return
|
||||
return;
|
||||
// self.druk(true)
|
||||
// self.fGetSchooljaren()
|
||||
// return
|
||||
}
|
||||
|
||||
// return;
|
||||
@@ -725,7 +724,6 @@ mh.initCompactSopModel = function(){
|
||||
self.tobemovedOnderdeel(this)
|
||||
}
|
||||
|
||||
console.log(self.tobemovedOnderdeel(),"onderdeel" )
|
||||
},
|
||||
|
||||
fHiernaartoe: function(){
|
||||
@@ -899,7 +897,6 @@ mh.initCompactSopModel = function(){
|
||||
});
|
||||
},
|
||||
filterSelected_NotPlaced: function(onderdelen){
|
||||
console.log(onderdelen(), "onderdelen not placed()")
|
||||
if (! onderdelen()) return false;
|
||||
return onderdelen().filter(function(onderdeel){
|
||||
return ( onderdeel.selected() && ! onderdeel.opA4() );
|
||||
|
||||
Reference in New Issue
Block a user