Merge branch 'feature/streefcijfersperorg'
# Conflicts: # application/core/MY_Controller.php
This commit is contained in:
Monique
@@ -30,7 +30,14 @@ class Rapijkpunten extends MY_Controller{
|
||||
};// if
|
||||
}
|
||||
|
||||
function getorgs(){
|
||||
function getorgsoort(){
|
||||
if (!$this->userid) die;
|
||||
$soort = $this->Organisaties_model->get_fieldvalue(['id' => $this->globorgid], 'soort');
|
||||
echo json_encode($soort);
|
||||
}
|
||||
|
||||
|
||||
function getorgs(){
|
||||
if (!$this->userid) die;
|
||||
$organisatie = $this->Organisaties_model->getorg($this->globorgid);
|
||||
switch ($organisatie->soort){
|
||||
@@ -46,7 +53,7 @@ class Rapijkpunten extends MY_Controller{
|
||||
if ($organisatie->bgs){
|
||||
foreach($organisatie->bgs as $bg){
|
||||
$bg->scholen = $this->Organisaties_model->getorgsvanaf($bg->id);
|
||||
}
|
||||
}
|
||||
}
|
||||
echo json_encode(array("organisatie"=>$organisatie, "soort"=>2));
|
||||
break;
|
||||
@@ -215,6 +222,7 @@ class Rapijkpunten extends MY_Controller{
|
||||
|
||||
$nieuwsteversie = $lijstenObject->getNieuwsteVersie();
|
||||
$kleuren = $lijstenObject->getKleuren();
|
||||
$eigenambitie = $lijstenObject->getEigenAmbitie();
|
||||
|
||||
$data =[
|
||||
'lijsten' => $lijsten,
|
||||
@@ -222,7 +230,8 @@ class Rapijkpunten extends MY_Controller{
|
||||
'nieuwsteversie' => $nieuwsteversie,
|
||||
'users' => $users,
|
||||
'ijkpunten' => $ijkpunten,
|
||||
'kleuren' => $kleuren
|
||||
'kleuren' => $kleuren,
|
||||
'eigenambitie' => $eigenambitie
|
||||
];
|
||||
|
||||
|
||||
@@ -297,7 +306,6 @@ class Rapijkpunten extends MY_Controller{
|
||||
$orgversies = $this->clean_input('selectie');
|
||||
|
||||
if (!$orgid || !$orgversies || !$orguserid) return;
|
||||
|
||||
$aantal = count($orgversies);
|
||||
$userLijsten = new Userlijsten($orguserid, $orgid, $orgversies);
|
||||
$lijsten = $userLijsten->getLijsten();
|
||||
|
||||
@@ -6,7 +6,8 @@ class Streefcijfers extends MY_Controller{
|
||||
$models = array( "shared/Users_model",
|
||||
'shared/Organisaties_model',
|
||||
"monpas/Orgversies_model",
|
||||
"monpas/Ambities_model");
|
||||
"monpas/Ambities_model",
|
||||
"monpas/Modules_model" );
|
||||
$this->load->model($models);
|
||||
$this->load->helper('string');
|
||||
if ( ! $this->check_online_status() ) {
|
||||
@@ -15,12 +16,14 @@ class Streefcijfers extends MY_Controller{
|
||||
};// if
|
||||
}
|
||||
|
||||
|
||||
function gethierarchie($selfid){
|
||||
if (!$this->userid) die;
|
||||
$organisatie= $this->Organisaties_model->get_record_by_id($selfid);
|
||||
$swvid = null;
|
||||
$kamerid = null;
|
||||
$bgid = null;
|
||||
$schoolid = null;
|
||||
switch ($organisatie->soort) {
|
||||
case 1: $swvid = $organisatie->id;
|
||||
break;
|
||||
@@ -32,7 +35,8 @@ class Streefcijfers extends MY_Controller{
|
||||
$org2 = $this->Organisaties_model->get_record_by_id($kamerid);
|
||||
$swvid = $org2->valtonder_id;
|
||||
break;
|
||||
case 4: $bgid = $organisatie->valtonder_id;
|
||||
case 4: $schoolid = $organisatie->id;
|
||||
$bgid = $organisatie->valtonder_id;
|
||||
$org2 = $this->Organisaties_model->get_record_by_id($bgid);
|
||||
$kamerid = $org2->valtonder_id;
|
||||
$org3 = $this->Organisaties_model->get_record_by_id($kamerid);
|
||||
@@ -41,7 +45,8 @@ class Streefcijfers extends MY_Controller{
|
||||
} ; // einde switch
|
||||
return array('swvid'=>$swvid,
|
||||
"kamerid" =>$kamerid,
|
||||
"bgid" =>$bgid);
|
||||
"bgid" =>$bgid,
|
||||
"schoolid" =>$schoolid);
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +66,8 @@ class Streefcijfers extends MY_Controller{
|
||||
// let op dit is een array
|
||||
break;
|
||||
case 2:
|
||||
case 3: $orgversies = $this->Orgversies_model->getallorgversies($hierarchie['kamerid'],$module, true);
|
||||
case 3:
|
||||
case 4:$orgversies = $this->Orgversies_model->getallorgversies($hierarchie['kamerid'],$module, true);
|
||||
if (!$orgversies){
|
||||
$orgversies = $this->Orgversies_model->getallorgversies($hierarchie['swvid'],$module, true);
|
||||
}
|
||||
@@ -113,6 +119,133 @@ class Streefcijfers extends MY_Controller{
|
||||
echo json_encode($ambities);
|
||||
}
|
||||
|
||||
function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
$ambitieorgs .= $orgid . ',';
|
||||
$valtonder = $this->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
if($valtonder != $orgid){
|
||||
return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
}
|
||||
|
||||
return $ambitieorgs;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
function checkrecht(){
|
||||
if (!$this->userid) die;
|
||||
$manage = 'F';
|
||||
if($this->super) $manage = 'T';
|
||||
else {
|
||||
$result = $this->Autorisatienivos_model->checkmanage($this->userid, $this->orgid);
|
||||
if($result) $manage = 'T';
|
||||
}
|
||||
$soort = $this->Organisaties_model->get_fieldvalue(['id'=>$this->globorgid],'soort');
|
||||
$this->json(['manage'=>$manage,
|
||||
'soort' => $soort]);
|
||||
}
|
||||
|
||||
|
||||
function getambities(){
|
||||
if (!$this->userid) die;
|
||||
|
||||
$module = $this->session->userdata('module');
|
||||
$modulenaam = $this->Modules_model->get_fieldvalue(['sysnr'=>$module], 'naam');
|
||||
$org = $this->Organisaties_model->get_record_by_id($this->globorgid);
|
||||
$bovenliggend = '';
|
||||
$bovenliggend = $this->getAmbitieOrgs($this->globorgid, $bovenliggend);
|
||||
$bovenliggend = rtrim($bovenliggend, ',');
|
||||
|
||||
$toporgsarray = explode(',', $bovenliggend);
|
||||
$toporgs = '';
|
||||
$index = 0;
|
||||
for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
if($index < 2) {
|
||||
$toporgs .= $toporgsarray[$i] . ',';
|
||||
$index++;
|
||||
}
|
||||
}
|
||||
$toporgs = rtrim($toporgs, ',' );
|
||||
$onderliggend = '';
|
||||
if($org->soort < 4){
|
||||
$orgs = $this->Organisaties_model->getlistrecursief($this->globorgid, []);
|
||||
$onderliggend = implode(',', $orgs);
|
||||
$ambitieorgs = $onderliggend .','. $bovenliggend;
|
||||
}
|
||||
if($org->soort == 4 ) $ambitieorgs = $bovenliggend;
|
||||
$standaardNodig = true;
|
||||
$ambities = [];
|
||||
$aantalY = $this->Ijkpunten_model->telijkpunten_bij_orgs($toporgs, $module);
|
||||
$ambities = $this->Ambities_model->mh_get_ambities($module, $ambitieorgs, $toporgs);
|
||||
if($ambities){
|
||||
foreach( $ambities AS $ambitie){
|
||||
if($ambitie->soort <= $org->soort){
|
||||
$standaardNodig = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!$ambities || $standaardNodig) {
|
||||
$orgversie = $this->Orgversies_model->getAmbitieVersie($toporgs, $module);
|
||||
if (!$orgversie) {
|
||||
$this->json("geen results");
|
||||
return;
|
||||
}
|
||||
else {
|
||||
|
||||
$ambitie = new stdClass();
|
||||
$ambitie->ambitievan = 'standaard';
|
||||
$ambitie->id = 0;
|
||||
$ambitie->geldigtm = $orgversie->geldigtm;
|
||||
$ambitie->geldigvanaf = $orgversie->geldigvanaf;
|
||||
$ambitie->gemscore = 80;
|
||||
$ambitie->naam = $orgversie->naam;
|
||||
|
||||
$ambitie->orgversie_id = $orgversie->orgversie_id;
|
||||
$ambitie->periodenummer = $orgversie->periodenummer;
|
||||
$ambitie->soort = 0;
|
||||
$ambitie->xijkpunten = ROUND($aantalY * 0.8);
|
||||
$ambitie->zprocent = 60;
|
||||
$ambities[] = $ambitie;
|
||||
}
|
||||
}
|
||||
$this->json(['aantalY' => $aantalY,
|
||||
'ambities' => $ambities,
|
||||
'module' => $modulenaam]);
|
||||
|
||||
}
|
||||
|
||||
function saveAmbitie(){
|
||||
if (!$this->userid) die;
|
||||
|
||||
$orgversieid = $this->clean_input("orgversieid");
|
||||
|
||||
if($this->super == false) {
|
||||
$result = $this->Autorisatienivos_model->checkmanage($this->userid, $this->globorgid);
|
||||
$saveorg = $this->globorgid;
|
||||
if (!$result) return;
|
||||
}
|
||||
else{
|
||||
$saveorg = $this->globorgid;
|
||||
}
|
||||
$bestaand = $this->Ambities_model->get_fieldvalue(['organisatie_id'=>$saveorg,
|
||||
'orgversie_id' =>$orgversieid], 'id');
|
||||
if(!$bestaand) {
|
||||
$id = $this->Ambities_model->insert_record([
|
||||
'organisatie_id' => $saveorg,
|
||||
'orgversie_id' => $orgversieid,
|
||||
'gem_score' => $this->clean_input("gemscore"),
|
||||
'x_ijkpunten' => $this->clean_input("xijkpunten"),
|
||||
'z_procent' => $this->clean_input("zprocent")
|
||||
|
||||
]);
|
||||
}
|
||||
$this->json($id);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
// function getorgversies_ambities_oud(){
|
||||
// $versies = false;
|
||||
// $module = $this->session->userdata('module');
|
||||
@@ -179,10 +312,10 @@ class Streefcijfers extends MY_Controller{
|
||||
if (!$this->userid) die;
|
||||
$id=$this->clean_input("id");
|
||||
// zoek of de ambitie voor een nieuwe organisatie is
|
||||
$alaanwezig = $this->Ambities_model->check_for_record(array("organisatie_id"=>$this->clean_input("organisatie_id"),
|
||||
$alaanwezig = $this->Ambities_model->check_for_record(array("organisatie_id"=>$this->globorgid,
|
||||
"orgversie_id" => $this->clean_input("orgversie_id")) );
|
||||
if ($id ==0 || !$alaanwezig ){
|
||||
$data=array("organisatie_id" => $this->clean_input("organisatie_id"),
|
||||
$data=array("organisatie_id" => $this->globorgid,
|
||||
"orgversie_id" => $this->clean_input("orgversie_id"),
|
||||
"gem_score" => $this->clean_input("gemscore"),
|
||||
"x_ijkpunten" => $this->clean_input("xijkpunten"),
|
||||
|
||||
@@ -78,9 +78,7 @@ class MY_Controller extends CI_Controller{
|
||||
// public $version = '1.18.04';// invul status
|
||||
// public $version = '1.18.05';// fout schoolgegevens compactsop
|
||||
// public $version = '1.18.08';// kleurenfout
|
||||
// public $version = '1.18.09';// zoek gebruikers sneller
|
||||
// public $version = '1.18.12';// compactsops maken van valtonderorgs
|
||||
public $version = '1.18.13';// downloadbutton overzicht sop
|
||||
public $version = '1.18.10';// ambities per org
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@ class Gemiddeldenafbeeldingen {
|
||||
private $wens;
|
||||
private $ambities;
|
||||
private $adviezen = [];
|
||||
private $labels;
|
||||
// private $labels;
|
||||
private $kleuren;
|
||||
private $kleurcodes;
|
||||
// private $kleurcodes;
|
||||
private $orgversie;
|
||||
private $vantm;
|
||||
private $gemiddelde;
|
||||
@@ -50,347 +50,348 @@ class Gemiddeldenafbeeldingen {
|
||||
$this->setAmbities();
|
||||
$this->setIJkpunten();
|
||||
$this->setWensen();
|
||||
$this->handle();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getGemiddeldenAfbeeldingen(){
|
||||
return $this->gemiddeldenafbeeldingen;
|
||||
}
|
||||
|
||||
public function getAantalScores(){
|
||||
return $this->aantalscores;
|
||||
}
|
||||
|
||||
public function getIJkpunten(){
|
||||
return $this->ijkpunten;
|
||||
}
|
||||
|
||||
public function getAdviezen(){
|
||||
return $this->adviezen;
|
||||
}
|
||||
|
||||
public function getResultaten(){
|
||||
$this->resultaten = [
|
||||
'totgem' => $this->gemiddelde->score,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
|
||||
return $this->resultaten;
|
||||
}
|
||||
|
||||
public function getKleuren(){
|
||||
return $this->kleuren;
|
||||
}
|
||||
|
||||
private function setLeerkrachten(){
|
||||
$this->leerkrachten = $this->gemiddeldescores->getLeerkrachten();
|
||||
}
|
||||
|
||||
private function setOrgversie(){
|
||||
$this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
}
|
||||
|
||||
private function setAmbities(){
|
||||
$this->ambities = $this->gemiddeldescores->getAmbities();
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->gemiddeldescores->getIJKpunten();
|
||||
}
|
||||
|
||||
private function setWensen(){
|
||||
$this->wensen = $this->gemiddeldescores->getWensen();
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
$this->setSwvid();
|
||||
$this->setLabels();
|
||||
$this->telIJkpunten();
|
||||
$this->setPeriode();
|
||||
$this->setKleurcodes();
|
||||
$this->setKleuren();
|
||||
$this->loopIJkpunten();
|
||||
$this->loopIJkpunten2(); // verplaatst boven addGemiddelde score omdat je anders een "ijkpunt" te veel hebt
|
||||
|
||||
// moet hier niet eerst setGemiddelde worden gedaan?
|
||||
$this->setGemiddeldeScore();
|
||||
$this->addGemiddeldeScore();
|
||||
$this->setGemiddeldenAfbeeldingen();
|
||||
|
||||
}
|
||||
private function setSwvid(){
|
||||
$this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
}
|
||||
|
||||
private function setLabels(){
|
||||
$this->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
if(! $this->labels){
|
||||
$this->labels = $this->CI->Labels_model->getalllabels(1);
|
||||
}
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
$this->aantalY = count($this->ijkpunten);
|
||||
}
|
||||
}
|
||||
|
||||
private function setPeriode(){
|
||||
$this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
$this->vantm = "Gegevens uit periode ".$this->orgversie->periodenummer." van ".
|
||||
mysql2date($this->orgversie->geldigvanaf)." t/m ".mysql2date($this->orgversie->geldigtm);
|
||||
}
|
||||
|
||||
|
||||
private function setKleurcodes(){
|
||||
$this->kleurcodes = new Kleurcodes();
|
||||
}
|
||||
|
||||
private function setKleuren(){
|
||||
|
||||
// $this->kleuren = $this->kleurcodes->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
// $this->CI->firephp->log($this->kleuren, "kleuren");
|
||||
// if(!$this->kleuren || $this->kleuren == " "){
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->cluster_id = $this->clusterid;
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->orgversie->scoretype == 7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
|
||||
}
|
||||
|
||||
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
// public function getGemiddeldenAfbeeldingen(){
|
||||
// return $this->gemiddeldenafbeeldingen;
|
||||
// }
|
||||
//
|
||||
// public function getAantalScores(){
|
||||
// return $this->aantalscores;
|
||||
// }
|
||||
//
|
||||
// public function getIJkpunten(){
|
||||
// return $this->ijkpunten;
|
||||
// }
|
||||
//
|
||||
// public function getAdviezen(){
|
||||
// return $this->adviezen;
|
||||
// }
|
||||
//
|
||||
// public function getResultaten(){
|
||||
// $this->resultaten = [
|
||||
// 'totgem' => $this->gemiddelde->score,
|
||||
// 'ijkpuntenok' => $this->ijkpuntenok,
|
||||
// 'welkehoogste' => $this->welkehoogste,
|
||||
// 'hoogstescore' => round($this->hoogstescore, 1),
|
||||
// 'welkelaagste' => $this->welkelaagste,
|
||||
// 'laagstescore' => round($this->laagstescore, 1),
|
||||
// ];
|
||||
//
|
||||
// return $this->resultaten;
|
||||
// }
|
||||
//
|
||||
// public function getKleuren(){
|
||||
// return $this->kleuren;
|
||||
// }
|
||||
//
|
||||
// private function setLeerkrachten(){
|
||||
// $this->leerkrachten = $this->gemiddeldescores->getLeerkrachten();
|
||||
// }
|
||||
//
|
||||
// private function setOrgversie(){
|
||||
// $this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
// }
|
||||
//
|
||||
// private function setAmbities(){
|
||||
// $this->ambities = $this->gemiddeldescores->getAmbities();
|
||||
// }
|
||||
//
|
||||
// private function setIJkpunten(){
|
||||
// $this->ijkpunten = $this->gemiddeldescores->getIJKpunten();
|
||||
// }
|
||||
//
|
||||
// private function setWensen(){
|
||||
// $this->wensen = $this->gemiddeldescores->getWensen();
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
//// $this->setSwvid();
|
||||
//// $this->setLabels();
|
||||
//// $this->telIJkpunten();
|
||||
//// $this->setPeriode();
|
||||
////
|
||||
// $this->setKleuren();
|
||||
// $this->loopIJkpunten();
|
||||
// $this->loopIJkpunten2(); // verplaatst boven addGemiddelde score omdat je anders een "ijkpunt" te veel hebt
|
||||
//
|
||||
// // moet hier niet eerst setGemiddelde worden gedaan?
|
||||
// $this->setGemiddeldeScore();
|
||||
// $this->addGemiddeldeScore();
|
||||
// $this->setGemiddeldenAfbeeldingen();
|
||||
//
|
||||
// }
|
||||
//// private function setSwvid(){
|
||||
//// $this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
//// }
|
||||
//
|
||||
//// private function setLabels(){
|
||||
//// $this->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
//// if(! $this->labels){
|
||||
//// $this->labels = $this->CI->Labels_model->getalllabels(1);
|
||||
//// }
|
||||
//// }
|
||||
//
|
||||
//// private function telIJkpunten(){
|
||||
//// if($this->ijkpunten){
|
||||
//// foreach($this->ijkpunten as $ijkpunt){
|
||||
//// if($ijkpunt->disabled == 'F'){
|
||||
//// $this->aantalY++;
|
||||
//// }
|
||||
//// }
|
||||
//// }
|
||||
//// }
|
||||
//
|
||||
//// private function setPeriode(){
|
||||
//// $this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
//// $this->vantm = "Gegevens uit periode ".$this->orgversie->periodenummer." van ".
|
||||
//// mysql2date($this->orgversie->geldigvanaf)." t/m ".mysql2date($this->orgversie->geldigtm);
|
||||
//// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// private function setKleuren(){
|
||||
//
|
||||
//// $this->kleuren = $this->kleurcodes->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
//// $this->CI->firephp->log($this->kleuren, "kleuren");
|
||||
//// if(!$this->kleuren || $this->kleuren == " "){
|
||||
// $this->kleuren = new stdClass();
|
||||
// $this->kleuren->cluster_id = $this->clusterid;
|
||||
// $this->kleuren->grens1 = '60';
|
||||
// $this->kleuren->grens2 = '80';
|
||||
// $this->kleuren->grens3 = '90';
|
||||
// $this->kleuren->grens4 = '100';
|
||||
// if($this->orgversie->scoretype == 7){
|
||||
// $this->kleuren->grens1 = '33';
|
||||
// $this->kleuren->grens2 = '66';
|
||||
// $this->kleuren->grens3 = '100';
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// $this->kleuren->kleur1 = '#e08885';
|
||||
// $this->kleuren->kleur2 = '#ffcc80';
|
||||
// $this->kleuren->kleur3 = '#9fdf9f';
|
||||
// $this->kleuren->kleur4 = '#99d6ff';
|
||||
//
|
||||
// $this->kleuren->organisatie_id = '0';
|
||||
//// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function loopIJkpunten(){
|
||||
// foreach($this->ijkpunten as $index =>$this->ijkpunt){
|
||||
// if(! isset($this->ijkpunt->score) || ! $this->ijkpunt->score || $this->ijkpunt->disabled =='T') {continue;};
|
||||
// $this->telScoresOp();
|
||||
// $this->setAantalScores();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
private function loopIJkpunten(){
|
||||
foreach($this->ijkpunten as $index =>$this->ijkpunt){
|
||||
if(! isset($this->ijkpunt->score) || ! $this->ijkpunt->score || $this->ijkpunt->disabled =='T') {continue;};
|
||||
$this->telScoresOp();
|
||||
$this->setAantalScores();
|
||||
}
|
||||
$this->setGemiddeldeScore(); // gemiddelde ga je niet in de loop berekenen
|
||||
}
|
||||
|
||||
|
||||
private function telScoresOp(){
|
||||
$this->somscore = $this->somscore + $this->ijkpunt->score;
|
||||
}
|
||||
private function setAantalScores(){
|
||||
if(!$this->ijkpunt->score) return;
|
||||
$this->aantalscores++;
|
||||
}
|
||||
|
||||
private function getKleur ($score){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->orgversie->scoretype, $score);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
|
||||
return $kleur;
|
||||
}
|
||||
|
||||
private function setGemiddeldeScore(){
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->score = 0;
|
||||
$deler = $this->aantalY - $this->disablenvt;
|
||||
if($deler > 0) $this->gemiddelde->score = round($this->somscore / $deler);
|
||||
|
||||
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->kleur =$this->getKleur ($this->gemiddelde->score);
|
||||
$this->ijkpunt = $this->gemiddelde;
|
||||
}
|
||||
|
||||
private function addGemiddeldeScore(){
|
||||
if(! $this->gemiddelde) return;
|
||||
array_push($this->ijkpunten, $this->ijkpunt);
|
||||
|
||||
}
|
||||
private function loopIJkpunten2(){
|
||||
if(!$this->ijkpunten) return;
|
||||
|
||||
foreach($this->ijkpunten as $index => $this->ijkpunt){
|
||||
if(!isset($this->ijkpunt->score)){continue;};
|
||||
if(! $this->ijkpunt->score) $this->ijkpuntscore = 0;
|
||||
$this->setScorenummer();
|
||||
$this->rondScoresAf();
|
||||
$this->setScoreKleuren();
|
||||
$this->addGewensteScores($index);
|
||||
$this->setWenskleuren();
|
||||
$this->setAdvies();
|
||||
$this->setResultatenOverzicht();
|
||||
$this->telIJkpuntenok();
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreNummer(){
|
||||
if($this->orgversie->scoretype != 7) {
|
||||
$this->ijkpunt->huidig = 1;
|
||||
if ($this->ijkpunt->score >= $this->kleuren->grens1) $this->ijkpunt->huidig = 2;
|
||||
if ($this->ijkpunt->score >= $this->kleuren->grens2) $this->ijkpunt->huidig = 3;
|
||||
if ($this->ijkpunt->score >= $this->kleuren->grens3) $this->ijkpunt->huidig = 4;
|
||||
}
|
||||
if($this->orgversie->scoretype == 7){
|
||||
if ($this->ijkpunt->score == $this->kleuren->grens3) $this->ijkpunt->huidig = 4;
|
||||
if ($this->ijkpunt->score < $this->kleuren->grens3) $this->ijkpunt->huidig = 3;
|
||||
if ($this->ijkpunt->score <= $this->kleuren->grens2) $this->ijkpunt->huidig = 2;
|
||||
if ($this->ijkpunt->score <= $this->kleuren->grens1) $this->ijkpunt->huidig = 1;
|
||||
}
|
||||
}
|
||||
|
||||
private function rondScoresAf(){
|
||||
$this->ijkpunt->score = round($this->ijkpunt->score);
|
||||
}
|
||||
|
||||
private function setScoreKleuren(){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->orgversie->scoretype, $this->ijkpunt->score);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->ijkpunt->kleur = $kleur;
|
||||
|
||||
|
||||
|
||||
|
||||
// switch ($this->ijkpunt->huidig) {
|
||||
// case 1:
|
||||
// $this->ijkpunt->kleur = $this->kleuren->kleur1;
|
||||
// break;
|
||||
// case 2:
|
||||
// $this->ijkpunt->kleur = $this->kleuren->kleur2;
|
||||
// break;
|
||||
// case 3:
|
||||
// $this->ijkpunt->kleur = $this->kleuren->kleur3;
|
||||
// break;
|
||||
// case 4:
|
||||
// $this->ijkpunt->kleur = $this->kleuren->kleur4;
|
||||
// break;
|
||||
// default:
|
||||
// $this->ijkpunt->kleur = $this->kleuren->kleur1;
|
||||
// $this->setGemiddeldeScore(); // gemiddelde ga je niet in de loop berekenen
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function telScoresOp(){
|
||||
// $this->somscore = $this->somscore + $this->ijkpunt->score;
|
||||
// }
|
||||
// private function setAantalScores(){
|
||||
// if(!$this->ijkpunt->score) return;
|
||||
// $this->aantalscores++;
|
||||
// }
|
||||
//
|
||||
// private function getKleur ($score){
|
||||
// $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->orgversie->scoretype, $score);
|
||||
// $kleur = $kleur->kleurcode;
|
||||
// if(!$kleur) $kleur = '#ffffff';
|
||||
//
|
||||
// return $kleur;
|
||||
// }
|
||||
//
|
||||
// private function setGemiddeldeScore(){
|
||||
// $this->gemiddelde = new stdClass();
|
||||
// $this->gemiddelde->score = 0;
|
||||
// $deler = $this->aantalY - $this->disablenvt;
|
||||
// if($deler > 0) $this->gemiddelde->score = round($this->somscore / $deler);
|
||||
//
|
||||
//
|
||||
// $this->gemiddelde->nummer = 'gem';
|
||||
// $this->gemiddelde->disabled = 'F';
|
||||
// $this->gemiddelde->disablenvt = 'F';
|
||||
// $this->gemiddelde->kleur =$this->getKleur ($this->gemiddelde->score);
|
||||
// $this->ijkpunt = $this->gemiddelde;
|
||||
// }
|
||||
//
|
||||
// private function addGemiddeldeScore(){
|
||||
// if(! $this->gemiddelde) return;
|
||||
// array_push($this->ijkpunten, $this->ijkpunt);
|
||||
//
|
||||
// }
|
||||
// private function loopIJkpunten2(){
|
||||
// if(!$this->ijkpunten) return;
|
||||
//
|
||||
// foreach($this->ijkpunten as $index => $this->ijkpunt){
|
||||
// if(!isset($this->ijkpunt->score)){continue;};
|
||||
// if(! $this->ijkpunt->score) $this->ijkpuntscore = 0;
|
||||
// $this->setScorenummer();
|
||||
// $this->rondScoresAf();
|
||||
// $this->setScoreKleuren();
|
||||
// $this->addGewensteScores($index);
|
||||
// $this->setWenskleuren();
|
||||
// $this->setAdvies();
|
||||
// $this->setResultatenOverzicht();
|
||||
// $this->telIJkpuntenok();
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
private function addGewensteScores($index)
|
||||
{
|
||||
$this->ijkpunt->wens = 3;
|
||||
|
||||
if (isset($this->wensen) && isset($this->wensen[$index]) ) {
|
||||
$this->ijkpunt->wens = $this->wensen[$index]->wens;
|
||||
}
|
||||
}
|
||||
|
||||
private function setWensKleuren(){
|
||||
if(!isset($this->ijkpunt->wens)) return;
|
||||
|
||||
$kleur = $this->CI->Scorekleuren_model->getWensKleur($this->orgversie->scoretype, $this->ijkpunt->wens);
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->ijkpunt->wenskleur = $kleur;
|
||||
|
||||
|
||||
|
||||
// switch ($this->ijkpunt->wens) {
|
||||
// case 1:
|
||||
// $this->ijkpunt->wenskleur = $this->kleuren->kleur1;
|
||||
// break;
|
||||
// case 2:
|
||||
// $this->ijkpunt->wenskleur = $this->kleuren->kleur2;
|
||||
// break;
|
||||
// case 3:
|
||||
// $this->ijkpunt->wenskleur = $this->kleuren->kleur3;
|
||||
// break;
|
||||
// case 4:
|
||||
// $this->ijkpunt->wenskleur = $this->kleuren->kleur4;
|
||||
// break;
|
||||
// default:
|
||||
// $this->ijkpunt->wenskleur = '#ffffff';
|
||||
// }
|
||||
//
|
||||
// private function setScoreNummer(){
|
||||
// if($this->orgversie->scoretype != 7) {
|
||||
// $this->ijkpunt->huidig = 1;
|
||||
// if ($this->ijkpunt->score >= $this->kleuren->grens1) $this->ijkpunt->huidig = 2;
|
||||
// if ($this->ijkpunt->score >= $this->kleuren->grens2) $this->ijkpunt->huidig = 3;
|
||||
// if ($this->ijkpunt->score >= $this->kleuren->grens3) $this->ijkpunt->huidig = 4;
|
||||
// }
|
||||
}
|
||||
|
||||
private function setAdvies(){
|
||||
if(isset($this->ijkpunt->wens) &&
|
||||
$this->ijkpunt->huidig < $this->ijkpunt->wens &&
|
||||
|
||||
$this->ijkpunt->wens!= 0 &&
|
||||
isset($this->ijkpunt->omschrijving ) &&
|
||||
$this->ijkpunt->disabled == 'F' &&
|
||||
$this->ijkpunt->disablenvt == 'F'){
|
||||
array_push($this->adviezen, [
|
||||
"nummer"=> $this->ijkpunt->nummer,
|
||||
"omschrijving" =>$this->ijkpunt->omschrijving
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
private function setResultatenOverzicht()
|
||||
{
|
||||
if ($this->ijkpunt->score > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->ijkpunt->score;
|
||||
$this->welkehoogste = $this->ijkpunt->nummer;
|
||||
}
|
||||
if ($this->ijkpunt->score <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->ijkpunt->score;
|
||||
$this->welkelaagste = $this->ijkpunt->nummer;
|
||||
}
|
||||
}
|
||||
|
||||
private function telIJkpuntenok(){
|
||||
if ($this->ambities && $this->ijkpunt->score >= $this->ambities->zprocent && $this->ijkpunt->nummer!= 'gem') {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
|
||||
private function setKolombreedte(){
|
||||
if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
$kolombreedte = floor(($this->rij - $this->standaardorg)/$this->aantal);
|
||||
$this->kolombreedte = $kolombreedte . 'px';
|
||||
}
|
||||
private function setOrgbreedte(){
|
||||
if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
$orgbreedte = floor($this->rij - ($this->aantal * $this->kolombreedte));
|
||||
$this->orgbreedte = $orgbreedte . 'px';
|
||||
}
|
||||
|
||||
|
||||
private function setGemiddeldenAfbeeldingen(){
|
||||
|
||||
$this->gemiddeldenafbeeldingen = [
|
||||
"module" => $this->modulenr,
|
||||
"leerkrachten" => $this->leerkrachten,
|
||||
"labels" => $this->labels,
|
||||
"kleuren" => $this->kleuren,
|
||||
"vantm" => $this->vantm,
|
||||
"ambitie" => $this->ambities,
|
||||
"adviezen" => $this->adviezen,
|
||||
"ijkpunten" => $this->ijkpunten,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore,1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore,1),
|
||||
"aantalY" => $this->aantalY,
|
||||
"totgem" => $this->gemiddelde->score,
|
||||
"orgbreedte" => $this->orgbreedte,
|
||||
"kolombreedte" => $this->kolombreedte,
|
||||
"aantalscores" => $this->aantalscores
|
||||
];
|
||||
}
|
||||
// if($this->orgversie->scoretype == 7){
|
||||
// if ($this->ijkpunt->score == $this->kleuren->grens3) $this->ijkpunt->huidig = 4;
|
||||
// if ($this->ijkpunt->score < $this->kleuren->grens3) $this->ijkpunt->huidig = 3;
|
||||
// if ($this->ijkpunt->score <= $this->kleuren->grens2) $this->ijkpunt->huidig = 2;
|
||||
// if ($this->ijkpunt->score <= $this->kleuren->grens1) $this->ijkpunt->huidig = 1;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function rondScoresAf(){
|
||||
// $this->ijkpunt->score = round($this->ijkpunt->score);
|
||||
// }
|
||||
//
|
||||
// private function setScoreKleuren(){
|
||||
// $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->orgversie->scoretype, $this->ijkpunt->score);
|
||||
// $kleur = $kleur->kleurcode;
|
||||
// if(!$kleur) $kleur = '#ffffff';
|
||||
// $this->ijkpunt->kleur = $kleur;
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//// switch ($this->ijkpunt->huidig) {
|
||||
//// case 1:
|
||||
//// $this->ijkpunt->kleur = $this->kleuren->kleur1;
|
||||
//// break;
|
||||
//// case 2:
|
||||
//// $this->ijkpunt->kleur = $this->kleuren->kleur2;
|
||||
//// break;
|
||||
//// case 3:
|
||||
//// $this->ijkpunt->kleur = $this->kleuren->kleur3;
|
||||
//// break;
|
||||
//// case 4:
|
||||
//// $this->ijkpunt->kleur = $this->kleuren->kleur4;
|
||||
//// break;
|
||||
//// default:
|
||||
//// $this->ijkpunt->kleur = $this->kleuren->kleur1;
|
||||
//// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function addGewensteScores($index)
|
||||
// {
|
||||
// $this->ijkpunt->wens = 3;
|
||||
//
|
||||
// if (isset($this->wensen) && isset($this->wensen[$index]) ) {
|
||||
// $this->ijkpunt->wens = $this->wensen[$index]->wens;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setWensKleuren(){
|
||||
// if(!isset($this->ijkpunt->wens)) return;
|
||||
//
|
||||
// $kleur = $this->CI->Scorekleuren_model->getWensKleur($this->orgversie->scoretype, $this->ijkpunt->wens);
|
||||
// if(!$kleur) $kleur = '#ffffff';
|
||||
// $this->ijkpunt->wenskleur = $kleur;
|
||||
//
|
||||
//
|
||||
//
|
||||
//// switch ($this->ijkpunt->wens) {
|
||||
//// case 1:
|
||||
//// $this->ijkpunt->wenskleur = $this->kleuren->kleur1;
|
||||
//// break;
|
||||
//// case 2:
|
||||
//// $this->ijkpunt->wenskleur = $this->kleuren->kleur2;
|
||||
//// break;
|
||||
//// case 3:
|
||||
//// $this->ijkpunt->wenskleur = $this->kleuren->kleur3;
|
||||
//// break;
|
||||
//// case 4:
|
||||
//// $this->ijkpunt->wenskleur = $this->kleuren->kleur4;
|
||||
//// break;
|
||||
//// default:
|
||||
//// $this->ijkpunt->wenskleur = '#ffffff';
|
||||
//// }
|
||||
// }
|
||||
//
|
||||
// private function setAdvies(){
|
||||
// if(isset($this->ijkpunt->wens) &&
|
||||
// $this->ijkpunt->huidig < $this->ijkpunt->wens &&
|
||||
//
|
||||
// $this->ijkpunt->wens!= 0 &&
|
||||
// isset($this->ijkpunt->omschrijving ) &&
|
||||
// $this->ijkpunt->disabled == 'F' &&
|
||||
// $this->ijkpunt->disablenvt == 'F'){
|
||||
// array_push($this->adviezen, [
|
||||
// "nummer"=> $this->ijkpunt->nummer,
|
||||
// "omschrijving" =>$this->ijkpunt->omschrijving
|
||||
// ]);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setResultatenOverzicht()
|
||||
// {
|
||||
// if ($this->ijkpunt->score > $this->hoogstescore) {
|
||||
// $this->hoogstescore = $this->ijkpunt->score;
|
||||
// $this->welkehoogste = $this->ijkpunt->nummer;
|
||||
// }
|
||||
// if ($this->ijkpunt->score <= $this->laagstescore) {
|
||||
// $this->laagstescore = $this->ijkpunt->score;
|
||||
// $this->welkelaagste = $this->ijkpunt->nummer;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function telIJkpuntenok(){
|
||||
// if ($this->ambities && $this->ijkpunt->score >= $this->ambities->zprocent && $this->ijkpunt->nummer!= 'gem') {
|
||||
// $this->ijkpuntenok++;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//// private function setKolombreedte(){
|
||||
//// if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
//// $kolombreedte = floor(($this->rij - $this->standaardorg)/$this->aantal);
|
||||
//// $this->kolombreedte = $kolombreedte . 'px';
|
||||
//// }
|
||||
//// private function setOrgbreedte(){
|
||||
//// if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
//// $orgbreedte = floor($this->rij - ($this->aantal * $this->kolombreedte));
|
||||
//// $this->orgbreedte = $orgbreedte . 'px';
|
||||
//// }
|
||||
//
|
||||
//
|
||||
// private function setGemiddeldenAfbeeldingen(){
|
||||
//
|
||||
// $this->gemiddeldenafbeeldingen = [
|
||||
// "module" => $this->modulenr,
|
||||
// "leerkrachten" => $this->leerkrachten,
|
||||
// "labels" => $this->labels,
|
||||
// "kleuren" => $this->kleuren,
|
||||
// "vantm" => $this->vantm,
|
||||
// "ambitie" => $this->ambities,
|
||||
// "adviezen" => $this->adviezen,
|
||||
// "ijkpunten" => $this->ijkpunten,
|
||||
// 'ijkpuntenok' => $this->ijkpuntenok,
|
||||
// 'welkehoogste' => $this->welkehoogste,
|
||||
// 'hoogstescore' => round($this->hoogstescore,1),
|
||||
// 'welkelaagste' => $this->welkelaagste,
|
||||
// 'laagstescore' => round($this->laagstescore,1),
|
||||
// "aantalY" => $this->aantalY,
|
||||
// "totgem" => $this->gemiddelde->score,
|
||||
// "orgbreedte" => $this->orgbreedte,
|
||||
// "kolombreedte" => $this->kolombreedte,
|
||||
// "aantalscores" => $this->aantalscores
|
||||
// ];
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -7,28 +7,42 @@ class Gemiddeldescores
|
||||
private $ijkpunt;
|
||||
private $leerkrachten;
|
||||
private $leerkracht;
|
||||
private $scores = [];
|
||||
private $score;
|
||||
private $wensen;
|
||||
private $aantalY;
|
||||
private $ijkpuntenok = 0;
|
||||
private $scoreteller;
|
||||
private $slaover = false;
|
||||
private $ambities;
|
||||
private $gemiddeldescores;
|
||||
private $adviezen= [] ;
|
||||
private $resultaten;
|
||||
private $metingen = [];
|
||||
private $aantalnvt = 0;
|
||||
private $aantalscores;
|
||||
private $somscore = 0;
|
||||
private $welkelaagste;
|
||||
private $welkehoogste;
|
||||
private $laagstescore = 110;
|
||||
private $hoogstescore = 0;
|
||||
|
||||
public function __construct($orgversieid, $orgid)
|
||||
|
||||
|
||||
public function __construct($orgversieid, $orgid, $scoretype)
|
||||
{
|
||||
$this->CI =& get_instance();
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->scoretype = $scoretype;
|
||||
|
||||
$this->handle();
|
||||
}
|
||||
public function getResults(){
|
||||
return $this->results;
|
||||
}
|
||||
|
||||
public function getGemiddeldeScores()
|
||||
{
|
||||
return $this->gemiddeldescores->leerkrachten ? $this->gemiddeldescores : false;
|
||||
return $this->results->leerkrachten ? $this->results : false;
|
||||
}
|
||||
|
||||
public function getLeerkrachten()
|
||||
@@ -60,34 +74,108 @@ class Gemiddeldescores
|
||||
private function handle()
|
||||
{
|
||||
$this->setIJkpunten();
|
||||
$this->setOrg();
|
||||
$this->setKleuren();
|
||||
$this->setLeerkrachten();
|
||||
$this->setLeerkrachtScores();
|
||||
$this->setMetingen();
|
||||
$this->telIJkpunten();
|
||||
$this->loopIJkpunten();
|
||||
$this->setAmbities();
|
||||
$this->setWensen();
|
||||
$this->setGemiddeldeScores();
|
||||
$this->loopIJkpunten2();
|
||||
$this->setGemiddelde();
|
||||
$this->addGemiddeldeScore();
|
||||
$this->setResults();
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
}
|
||||
|
||||
private function setLeerkrachten()
|
||||
{
|
||||
private function setOrg(){
|
||||
$this->org = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
$this->orgnaam = $this->org->brin? $this->org->brin . ' ' . $this->org->naamkort : $this->org->naamkort;
|
||||
}
|
||||
|
||||
private function setKleuren(){
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->scoretype == 7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
|
||||
}
|
||||
|
||||
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
}
|
||||
|
||||
|
||||
private function setLeerkrachten(){
|
||||
$this->leerkrachten = $this->CI->Filledversions_model->getlks($this->orgid, $this->orgversieid);
|
||||
}
|
||||
|
||||
private function setLeerkrachtScores()
|
||||
{
|
||||
private function setLeerkrachtScores(){
|
||||
if (!$this->leerkrachten) return;
|
||||
foreach ($this->leerkrachten as $index => $this->leerkracht) {
|
||||
$this->leerkracht->scores = $this->CI->Scores_model->calculateindividualscores(
|
||||
$this->orgversieid, $this->orgid, $this->leerkracht->user_id);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
if (!isset($this->leerkrachten)) return;
|
||||
$this->metingen = new stdClass();
|
||||
$this->metingen->aantal = 0;
|
||||
$this->metingen->aantalorgs = 0;
|
||||
|
||||
if ($this->org->soort == 4) {
|
||||
$gevuld = $this->CI->Scores_model->fCountGevuldeVersies($this->orgversieid, $this->orgid);
|
||||
if($gevuld ){
|
||||
$this->metingen->aantal = $gevuld->aantal;
|
||||
$this->metingen->aantalorgs = 1;
|
||||
}
|
||||
};
|
||||
|
||||
if ($this->org->soort == 3) {
|
||||
$gevuld = $this->CI->Scores_model->fCountGevuldeBestuurVersies($this->orgversieid, $this->orgid);
|
||||
if($gevuld){
|
||||
$this->metingen->aantal = $gevuld->aantal;
|
||||
$this->metingen->aantalorgs = $gevuld->aantalorgs;}
|
||||
};
|
||||
|
||||
if ($this->org->soort == 2) {
|
||||
|
||||
$this->onderorgs = $this->CI->Organisaties_model->getscholenonderkamer($this->orgid);
|
||||
$this->setGevuldeVersies12();
|
||||
$metingen = $this->CI->Scores_model->fCountGevuldeKamerEnSWVVersies($this->orgversieid, $this->orgstring);
|
||||
if($metingen){
|
||||
$this->metingen->aantal = $metingen->aantal;
|
||||
$this->metingen->aantalorgs = $metingen->aantalorgs;
|
||||
}
|
||||
};
|
||||
|
||||
if ($this->org->soort == 1) {
|
||||
$this->onderorgs = $this->CI->Organisaties_model->getscholenonderswv($this->orgid);
|
||||
$this->setGevuldeVersies12();
|
||||
$metingen = $this->CI->Scores_model->fCountGevuldeKamerEnSwvVersies($this->orgversieid, $this->orgstring);
|
||||
if($metingen){
|
||||
$this->metingen->aantal = $metingen->aantal;
|
||||
$this->metingen->aantalorgs = $metingen->aantalorgs;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
foreach($this->ijkpunten as $ijkpunt){
|
||||
@@ -109,6 +197,8 @@ class Gemiddeldescores
|
||||
$this->loopLeerkrachten();
|
||||
$this->setNietvanToepassing();
|
||||
$this->setIJkpuntGemiddeldeScores();
|
||||
$this->telScoresOp();
|
||||
$this->setAantalIJkpuntScores();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -134,6 +224,7 @@ class Gemiddeldescores
|
||||
$this->scoreteller = 0;
|
||||
foreach ($this->leerkracht->scores as $index => $this->score) {
|
||||
$this->setAantalScores();
|
||||
|
||||
if ($this->slaover == false) {
|
||||
$this->setIJkpuntTotaal();
|
||||
$this->telNietVanToepassing();
|
||||
@@ -147,6 +238,7 @@ class Gemiddeldescores
|
||||
$this->scoreteller++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private function setIJkpuntTotaal()
|
||||
@@ -183,32 +275,222 @@ class Gemiddeldescores
|
||||
}
|
||||
}
|
||||
|
||||
private function setIJkpuntGemiddeldeScores()
|
||||
{
|
||||
private function setIJkpuntGemiddeldeScores(){
|
||||
if ($this->ijkpunt->aantallkrtn > 0) {
|
||||
$this->ijkpunt->score = $this->ijkpunt->totaal / $this->ijkpunt->aantallkrtn;
|
||||
$this->ijkpunt->score = round($this->ijkpunt->totaal / $this->ijkpunt->aantallkrtn);
|
||||
$this->ijkpunt->gem = round($this->ijkpunt->totaal / $this->ijkpunt->aantallkrtn);
|
||||
}
|
||||
else{
|
||||
$this->ijkpunt->score = 0;
|
||||
$this->ijkpunt->gem = 0;
|
||||
}
|
||||
}
|
||||
|
||||
private function setAmbities()
|
||||
{
|
||||
$this->ambities = $this->CI->Ambities_model->getOrgAmbities($this->orgversieid, $this->orgid);
|
||||
private function telScoresOp(){
|
||||
if(! isset($this->ijkpunt->score) || ! $this->ijkpunt->score || $this->ijkpunt->disabled =='T') return;
|
||||
|
||||
$this->somscore = $this->somscore + $this->ijkpunt->score;
|
||||
}
|
||||
private function setAantalIJkpuntScores(){
|
||||
if(! isset($this->ijkpunt->score) || ! $this->ijkpunt->score || $this->ijkpunt->disabled =='T') return;
|
||||
if(!$this->ijkpunt->score) return;
|
||||
$this->aantalscores++;
|
||||
}
|
||||
|
||||
private function setWensen()
|
||||
{
|
||||
|
||||
|
||||
private function getKleur ($score){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $score);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
|
||||
return $kleur;
|
||||
}
|
||||
|
||||
|
||||
private function setAmbities(){
|
||||
$ambitieorgs = '';
|
||||
|
||||
$ambitieorgs = $this->getAmbitieOrgs($this->orgid, $ambitieorgs);
|
||||
$ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
|
||||
$toporgsarray = explode(',', $ambitieorgs);
|
||||
$toporgs = '';
|
||||
$index = 0;
|
||||
for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
if($index < 2) {
|
||||
$toporgs .= $toporgsarray[$i] . ',';
|
||||
$index++;
|
||||
}
|
||||
}
|
||||
$toporgs = rtrim($toporgs, ',' );
|
||||
|
||||
$this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
|
||||
}
|
||||
|
||||
private function setWensen(){
|
||||
$this->wensen = $this->CI->Wenssituaties_model->getgewenst($this->orgversieid, $this->orgid);
|
||||
}
|
||||
|
||||
private function setGemiddeldeScores()
|
||||
{
|
||||
private function loopIJkpunten2(){
|
||||
if(!$this->ijkpunten) return;
|
||||
|
||||
$this->gemiddeldescores = [
|
||||
"ijkpunten" => $this->ijkpunten,
|
||||
"leerkrachten" => $this->leerkrachten,
|
||||
"ambities" => $this->ambities,
|
||||
"wensen" => $this->wensen
|
||||
foreach($this->ijkpunten as $index => $this->ijkpunt){
|
||||
if(!isset($this->ijkpunt->score)){continue;};
|
||||
if(! $this->ijkpunt->score) $this->ijkpuntscore = 0;
|
||||
$this->setScorenummer();
|
||||
$this->rondScoresAf();
|
||||
$this->setScoreKleuren();
|
||||
$this->addGewensteScores($index);
|
||||
$this->setWenskleuren();
|
||||
$this->setAdviezen();
|
||||
$this->setResultatenOverzicht();
|
||||
$this->telIJkpuntenok();
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreNummer(){
|
||||
if($this->scoretype != 7) {
|
||||
$this->ijkpunt->huidig = 1;
|
||||
if ($this->ijkpunt->score >= $this->kleuren->grens1) $this->ijkpunt->huidig = 2;
|
||||
if ($this->ijkpunt->score >= $this->kleuren->grens2) $this->ijkpunt->huidig = 3;
|
||||
if ($this->ijkpunt->score >= $this->kleuren->grens3) $this->ijkpunt->huidig = 4;
|
||||
}
|
||||
if($this->scoretype == 7){
|
||||
if ($this->ijkpunt->score == $this->kleuren->grens3) $this->ijkpunt->huidig = 4;
|
||||
if ($this->ijkpunt->score < $this->kleuren->grens3) $this->ijkpunt->huidig = 3;
|
||||
if ($this->ijkpunt->score <= $this->kleuren->grens2) $this->ijkpunt->huidig = 2;
|
||||
if ($this->ijkpunt->score <= $this->kleuren->grens1) $this->ijkpunt->huidig = 1;
|
||||
}
|
||||
}
|
||||
|
||||
private function rondScoresAf(){
|
||||
$this->ijkpunt->score = round($this->ijkpunt->score);
|
||||
}
|
||||
|
||||
private function setScoreKleuren(){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->ijkpunt->score);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->ijkpunt->kleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function addGewensteScores($index){
|
||||
$this->ijkpunt->wens = 3;
|
||||
|
||||
if (isset($this->wensen) && isset($this->wensen[$index]) ) {
|
||||
$this->ijkpunt->wens = $this->wensen[$index]->wens;
|
||||
}
|
||||
}
|
||||
|
||||
private function setWensKleuren(){
|
||||
if(!isset($this->ijkpunt->wens)) return;
|
||||
|
||||
$kleur = $this->CI->Scorekleuren_model->getWensKleur($this->scoretype, $this->ijkpunt->wens);
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->ijkpunt->wenskleur = $kleur;
|
||||
}
|
||||
|
||||
private function setAdviezen(){
|
||||
if(isset($this->ijkpunt->wens) &&
|
||||
$this->ijkpunt->huidig < $this->ijkpunt->wens &&
|
||||
|
||||
$this->ijkpunt->wens!= 0 &&
|
||||
isset($this->ijkpunt->omschrijving ) &&
|
||||
$this->ijkpunt->disabled == 'F' &&
|
||||
$this->ijkpunt->disablenvt == 'F'){
|
||||
$this->adviezen[] = [
|
||||
"nummer"=> $this->ijkpunt->nummer,
|
||||
"omschrijving" =>$this->ijkpunt->omschrijving
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
private function setResultatenOverzicht()
|
||||
{
|
||||
if ($this->ijkpunt->score > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->ijkpunt->score;
|
||||
$this->welkehoogste = $this->ijkpunt->nummer;
|
||||
}
|
||||
if ($this->ijkpunt->score <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->ijkpunt->score;
|
||||
$this->welkelaagste = $this->ijkpunt->nummer;
|
||||
}
|
||||
}
|
||||
|
||||
private function telIJkpuntenok(){
|
||||
if ($this->ambities && $this->ijkpunt->score >= $this->ambities->zprocent && $this->ijkpunt->disablenvt == 'F') {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
|
||||
private function setGemiddelde(){
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->score = 0;
|
||||
$deler = $this->aantalY - $this->aantalnvt;
|
||||
if($deler > 0) $this->gemiddelde->score = round($this->somscore / $deler);
|
||||
$this->gemiddelde->gem = $this->gemiddelde->score;
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->kleur = $this->getKleur ($this->gemiddelde->score);
|
||||
|
||||
}
|
||||
|
||||
private function addGemiddeldeScore(){
|
||||
if(! $this->gemiddelde) return;
|
||||
array_push($this->ijkpunten, $this->gemiddelde);
|
||||
|
||||
}
|
||||
|
||||
private function setResults()
|
||||
{
|
||||
$this->resultaten = [
|
||||
'totgem' => $this->gemiddelde->score,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
|
||||
$this->results= [
|
||||
'orgnaam' => $this->orgnaam,
|
||||
'ijkpunten' => $this->ijkpunten,
|
||||
'leerkrachten' => $this->leerkrachten,
|
||||
'metingen' => $this->metingen,
|
||||
'ambities' => $this->ambities,
|
||||
'kleuren' => $this->kleuren,
|
||||
'wensen' => $this->wensen,
|
||||
'resultaten' => $this->resultaten,
|
||||
'adviezen' => $this->adviezen,
|
||||
'aantalY' => $this->aantalY
|
||||
|
||||
|
||||
];
|
||||
}
|
||||
|
||||
private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
$ambitieorgs .= $orgid . ',';
|
||||
$valtonder = $this->CI->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
if($valtonder != $orgid){
|
||||
return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
}
|
||||
|
||||
return $ambitieorgs;
|
||||
|
||||
}
|
||||
|
||||
private function setGevuldeVersies12(){
|
||||
$orgids = [];
|
||||
if (count($this->onderorgs) > 0) {
|
||||
foreach ($this->onderorgs as $index => $this->org) {
|
||||
$orgids[] = $this->org->id;
|
||||
}
|
||||
$this->orgstring = implode(',', $orgids);
|
||||
} else $this->orgstring = false;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ class Hoofdstuk
|
||||
private $sopkeuze;
|
||||
private $view;
|
||||
private $tab;
|
||||
//private $imagecode;
|
||||
private $tabelid;
|
||||
private $imagedata;
|
||||
private $vervangingscode;
|
||||
|
||||
@@ -29,162 +29,162 @@ class Inspectieafbeeldingen {
|
||||
$this->inspectieoordelen = $inspectieOordelen;
|
||||
$this->orgid = $orgid;
|
||||
$this->clusterid = 4;
|
||||
$this->handle();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getInspectieAfbeeldingen(){
|
||||
return $this->inspectieafbeeldingen;
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
$this->setOordelen();
|
||||
$this->setIJkpunten();
|
||||
$this->telIJkpunten();
|
||||
$this->setSWVid();
|
||||
$this->setLabels();
|
||||
$this->setKleurcodes();
|
||||
$this->setKleuren();
|
||||
$this->setPeriode();
|
||||
$this->loopOordelen();
|
||||
$this->setKolombreedte();
|
||||
$this->setOrgbreedte();
|
||||
$this->setInspectieAfbeeldingen();
|
||||
}
|
||||
|
||||
private function setOordelen(){
|
||||
$this->oordelen = $this->inspectieoordelen['oordelen'];
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->inspectieoordelen['ijkpunten'];
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
$this->aantalY = count($this->ijkpunten);
|
||||
}
|
||||
}
|
||||
|
||||
private function setSWVid(){
|
||||
$this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
}
|
||||
|
||||
private function setLabels(){
|
||||
$this->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
}
|
||||
|
||||
private function setKleurcodes(){
|
||||
$this->kleurcodes = new Kleurcodes();
|
||||
}
|
||||
|
||||
private function setKleuren(){
|
||||
// $this->kleuren = $this->CI->Organisaties_model->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
|
||||
}
|
||||
|
||||
|
||||
private function setPeriode(){
|
||||
$this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
$this->vantm = "Gegevens uit periode ".$this->orgversie->periodenummer." van ".mysql2date($this->orgversie->geldigvanaf)." t/m ".mysql2date($this->orgversie->geldigtm);
|
||||
}
|
||||
|
||||
private function loopOordelen(){
|
||||
if (!$this->oordelen) return;
|
||||
foreach ($this->oordelen as $index => $this->oordeel) {
|
||||
if(! isset($this->oordeel->normid)) return;
|
||||
$this->setOordeelKleuren();
|
||||
$this->setWensID();
|
||||
$this->setWensKleuren();
|
||||
$this->setAdvies();
|
||||
}
|
||||
}
|
||||
|
||||
private function setOordeelKleuren(){
|
||||
switch ($this->oordeel->normid) {
|
||||
case 1:
|
||||
$this->oordeel->kleur = $this->kleuren->kleur1;
|
||||
break;
|
||||
case 2:
|
||||
$this->oordeel->kleur = $this->kleuren->kleur2;
|
||||
break;
|
||||
case 3:
|
||||
$this->oordeel->kleur = $this->kleuren->kleur3;
|
||||
break;
|
||||
case 4:
|
||||
$this->oordeel->kleur = $this->kleuren->kleur4;
|
||||
break;
|
||||
default:
|
||||
$this->oordeel->kleur = '#ffffff';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private function setWensID()
|
||||
{
|
||||
if (!$this->oordeel->wensid) {
|
||||
$this->oordeel->wensid = 3;
|
||||
}
|
||||
}
|
||||
private function setWensKleuren(){
|
||||
|
||||
switch ($this->oordeel->wensid) {
|
||||
case 1:
|
||||
$this->oordeel->wenskleur = $this->kleuren->kleur1;
|
||||
break;
|
||||
case 2:
|
||||
$this->oordeel->wenskleur = $this->kleuren->kleur2;
|
||||
break;
|
||||
case 3:
|
||||
$this->oordeel->wenskleur = $this->kleuren->kleur3;
|
||||
break;
|
||||
case 4:
|
||||
$this->oordeel->wenskleur = $this->kleuren->kleur4;
|
||||
break;
|
||||
default:
|
||||
$this->oordeel->wenskleur = '#ffffff';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private function setAdvies(){
|
||||
if($this->oordeel->normid < $this->oordeel->wensid && $this->oordeel->normid != 0 && $this->oordeel->wensid != 0){
|
||||
|
||||
array_push($this->adviezen, ["nummer"=> $this->oordeel->nummer, "omschrijving" =>$this->oordeel->omschrijving]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private function setKolombreedte(){
|
||||
if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
$kolombreedte = floor(($this->rij - $this->standaardorg)/$this->aantal);
|
||||
$this->kolombreedte = $kolombreedte . 'px';
|
||||
}
|
||||
private function setOrgbreedte(){
|
||||
if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
$orgbreedte = floor($this->rij - ($this->aantal * $this->kolombreedte));
|
||||
$this->orgbreedte = $orgbreedte . 'px';
|
||||
}
|
||||
|
||||
private function setInspectieAfbeeldingen(){
|
||||
$this->inspectieafbeeldingen =[
|
||||
"module" => $this->modulenr,
|
||||
"oordelen" => $this->oordelen,
|
||||
"labels" => $this->labels,
|
||||
"kleuren" => $this->kleuren,
|
||||
"vantm" => $this->vantm,
|
||||
"adviezen" => $this->adviezen,
|
||||
"kolombreedte" => $this->kolombreedte,
|
||||
"orgbreedte" => $this->orgbreedte,
|
||||
"ijkpunten" => $this->ijkpunten,
|
||||
"aantalY" => $this->aantalY
|
||||
];
|
||||
}
|
||||
// public function getInspectieAfbeeldingen(){
|
||||
// return $this->inspectieafbeeldingen;
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
// $this->setOordelen();
|
||||
// $this->setIJkpunten();
|
||||
// $this->telIJkpunten();
|
||||
// $this->setSWVid();
|
||||
// $this->setLabels();
|
||||
// $this->setKleurcodes();
|
||||
// $this->setKleuren();
|
||||
// $this->setPeriode();
|
||||
// $this->loopOordelen();
|
||||
// $this->setKolombreedte();
|
||||
// $this->setOrgbreedte();
|
||||
// $this->setInspectieAfbeeldingen();
|
||||
// }
|
||||
//
|
||||
// private function setOordelen(){
|
||||
// $this->oordelen = $this->inspectieoordelen['oordelen'];
|
||||
// }
|
||||
//
|
||||
// private function setIJkpunten(){
|
||||
// $this->ijkpunten = $this->inspectieoordelen['ijkpunten'];
|
||||
// }
|
||||
//
|
||||
// private function telIJkpunten(){
|
||||
// if($this->ijkpunten){
|
||||
// $this->aantalY = count($this->ijkpunten);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setSWVid(){
|
||||
// $this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setLabels(){
|
||||
// $this->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
// }
|
||||
//
|
||||
// private function setKleurcodes(){
|
||||
// $this->kleurcodes = new Kleurcodes();
|
||||
// }
|
||||
//
|
||||
// private function setKleuren(){
|
||||
//// $this->kleuren = $this->CI->Organisaties_model->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
// $this->kleuren = new stdClass();
|
||||
// $this->kleuren->kleur1 = '#e08885';
|
||||
// $this->kleuren->kleur2 = '#ffcc80';
|
||||
// $this->kleuren->kleur3 = '#9fdf9f';
|
||||
// $this->kleuren->kleur4 = '#99d6ff';
|
||||
//
|
||||
// $this->kleuren->organisatie_id = '0';
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function setPeriode(){
|
||||
// $this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
// $this->vantm = "Gegevens uit periode ".$this->orgversie->periodenummer." van ".mysql2date($this->orgversie->geldigvanaf)." t/m ".mysql2date($this->orgversie->geldigtm);
|
||||
// }
|
||||
//
|
||||
// private function loopOordelen(){
|
||||
// if (!$this->oordelen) return;
|
||||
// foreach ($this->oordelen as $index => $this->oordeel) {
|
||||
// if(! isset($this->oordeel->normid)) return;
|
||||
// $this->setOordeelKleuren();
|
||||
// $this->setWensID();
|
||||
// $this->setWensKleuren();
|
||||
// $this->setAdvies();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setOordeelKleuren(){
|
||||
// switch ($this->oordeel->normid) {
|
||||
// case 1:
|
||||
// $this->oordeel->kleur = $this->kleuren->kleur1;
|
||||
// break;
|
||||
// case 2:
|
||||
// $this->oordeel->kleur = $this->kleuren->kleur2;
|
||||
// break;
|
||||
// case 3:
|
||||
// $this->oordeel->kleur = $this->kleuren->kleur3;
|
||||
// break;
|
||||
// case 4:
|
||||
// $this->oordeel->kleur = $this->kleuren->kleur4;
|
||||
// break;
|
||||
// default:
|
||||
// $this->oordeel->kleur = '#ffffff';
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setWensID()
|
||||
// {
|
||||
// if (!$this->oordeel->wensid) {
|
||||
// $this->oordeel->wensid = 3;
|
||||
// }
|
||||
// }
|
||||
// private function setWensKleuren(){
|
||||
//
|
||||
// switch ($this->oordeel->wensid) {
|
||||
// case 1:
|
||||
// $this->oordeel->wenskleur = $this->kleuren->kleur1;
|
||||
// break;
|
||||
// case 2:
|
||||
// $this->oordeel->wenskleur = $this->kleuren->kleur2;
|
||||
// break;
|
||||
// case 3:
|
||||
// $this->oordeel->wenskleur = $this->kleuren->kleur3;
|
||||
// break;
|
||||
// case 4:
|
||||
// $this->oordeel->wenskleur = $this->kleuren->kleur4;
|
||||
// break;
|
||||
// default:
|
||||
// $this->oordeel->wenskleur = '#ffffff';
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setAdvies(){
|
||||
// if($this->oordeel->normid < $this->oordeel->wensid && $this->oordeel->normid != 0 && $this->oordeel->wensid != 0){
|
||||
//
|
||||
// array_push($this->adviezen, ["nummer"=> $this->oordeel->nummer, "omschrijving" =>$this->oordeel->omschrijving]);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setKolombreedte(){
|
||||
// if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
// $kolombreedte = floor(($this->rij - $this->standaardorg)/$this->aantal);
|
||||
// $this->kolombreedte = $kolombreedte . 'px';
|
||||
// }
|
||||
// private function setOrgbreedte(){
|
||||
// if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
// $orgbreedte = floor($this->rij - ($this->aantal * $this->kolombreedte));
|
||||
// $this->orgbreedte = $orgbreedte . 'px';
|
||||
// }
|
||||
//
|
||||
// private function setInspectieAfbeeldingen(){
|
||||
// $this->inspectieafbeeldingen =[
|
||||
// "module" => $this->modulenr,
|
||||
// "oordelen" => $this->oordelen,
|
||||
// "labels" => $this->labels,
|
||||
// "kleuren" => $this->kleuren,
|
||||
// "vantm" => $this->vantm,
|
||||
// "adviezen" => $this->adviezen,
|
||||
// "kolombreedte" => $this->kolombreedte,
|
||||
// "orgbreedte" => $this->orgbreedte,
|
||||
// "ijkpunten" => $this->ijkpunten,
|
||||
// "aantalY" => $this->aantalY
|
||||
// ];
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -15,57 +15,57 @@ class Inspectieoordelen
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->clusterid = $clusterid;
|
||||
$this->handle();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getInspectieOordelen(){
|
||||
return $this->inspectieoordelen;//oordelen zijn inclusief wensen
|
||||
}
|
||||
|
||||
public function getOordelen(){
|
||||
return $this->oordelen;
|
||||
}
|
||||
|
||||
public function getIJkpunten(){
|
||||
return $this->ijkpunten;
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
$this->setOordelen();
|
||||
$this->loopOordelen();
|
||||
$this->setIJkpunten();
|
||||
$this->setInspectieOordelen();
|
||||
}
|
||||
|
||||
|
||||
private function setOordelen(){
|
||||
$this->oordelen = $this->CI->Scores_model->getstandaardfrequenties(false, $this->orgid, $this->orgversieid);
|
||||
}
|
||||
|
||||
private function loopOordelen(){
|
||||
foreach ($this->oordelen ? $this->oordelen : [] as $this->oordeel){
|
||||
if($this->oordeel->normid){
|
||||
$this->standaarden++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setMelding(){
|
||||
$this->melding = "";
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->CI->Orgversies_model->getijkpunten($this->orgversieid);
|
||||
}
|
||||
|
||||
private function setInspectieOordelen()
|
||||
{
|
||||
if ($this->standaarden >= 2) {
|
||||
$this->inspectieoordelen =
|
||||
["oordelen" => $this->oordelen,
|
||||
"ijkpunten" => $this->ijkpunten];
|
||||
} else {
|
||||
$this->inspectieoordelen = false;
|
||||
}
|
||||
}
|
||||
// public function getInspectieOordelen(){
|
||||
// return $this->inspectieoordelen;//oordelen zijn inclusief wensen
|
||||
// }
|
||||
//
|
||||
// public function getOordelen(){
|
||||
// return $this->oordelen;
|
||||
// }
|
||||
//
|
||||
// public function getIJkpunten(){
|
||||
// return $this->ijkpunten;
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
// $this->setOordelen();
|
||||
// $this->loopOordelen();
|
||||
// $this->setIJkpunten();
|
||||
// $this->setInspectieOordelen();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function setOordelen(){
|
||||
// $this->oordelen = $this->CI->Scores_model->getstandaardfrequenties(false, $this->orgid, $this->orgversieid);
|
||||
// }
|
||||
//
|
||||
// private function loopOordelen(){
|
||||
// foreach ($this->oordelen ? $this->oordelen : [] as $this->oordeel){
|
||||
// if($this->oordeel->normid){
|
||||
// $this->standaarden++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setMelding(){
|
||||
// $this->melding = "";
|
||||
// }
|
||||
//
|
||||
// private function setIJkpunten(){
|
||||
// $this->ijkpunten = $this->CI->Orgversies_model->getijkpunten($this->orgversieid);
|
||||
// }
|
||||
//
|
||||
// private function setInspectieOordelen()
|
||||
// {
|
||||
// if ($this->standaarden >= 2) {
|
||||
// $this->inspectieoordelen =
|
||||
// ["oordelen" => $this->oordelen,
|
||||
// "ijkpunten" => $this->ijkpunten];
|
||||
// } else {
|
||||
// $this->inspectieoordelen = false;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
@@ -40,353 +40,353 @@ class Schoolafbeeldingen {
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->clusterid = $clusterid;
|
||||
$this->setScores();
|
||||
$this->setAmbities();
|
||||
$this->setWensen();
|
||||
$this->setIJkpunten();
|
||||
$this->handle();
|
||||
// $this->setScores();
|
||||
// $this->setAmbities();
|
||||
// $this->setWensen();
|
||||
// $this->setIJkpunten();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getSchoolAfbeeldingen(){
|
||||
return $this->schoolafbeeldingen;
|
||||
}
|
||||
|
||||
public function getIJkpunten(){
|
||||
return $this->ijkpunten;
|
||||
}
|
||||
|
||||
public function getLabels(){
|
||||
return $this->labels;
|
||||
}
|
||||
|
||||
public function getScores(){
|
||||
return $this->scores;
|
||||
}
|
||||
|
||||
public function getAmbities(){
|
||||
return $this->ambities;
|
||||
}
|
||||
|
||||
public function getOrgVersie(){
|
||||
return $this->orgversie;
|
||||
}
|
||||
|
||||
public function getResultaten(){
|
||||
$gem = "";
|
||||
if($this->gemiddelde){
|
||||
$gem = $this->gemiddelde->gem;
|
||||
}
|
||||
$this->resultaten = [
|
||||
'totgem' => $gem,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
|
||||
return $this->resultaten;
|
||||
}
|
||||
|
||||
public function getVantm(){
|
||||
return $this->vantm;
|
||||
}
|
||||
|
||||
public function getAdviezen(){
|
||||
return $this->adviezen;
|
||||
}
|
||||
|
||||
public function getSomscore(){
|
||||
return $this->somscore;
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->schoolscores->getScores();
|
||||
}
|
||||
|
||||
private function setAmbities(){
|
||||
$this->ambities = $this->schoolscores->getAmbities();
|
||||
}
|
||||
|
||||
private function setWensen(){
|
||||
$this->wensen = $this->schoolscores->getWensen();
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->schoolscores->getIJKpunten();
|
||||
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
$this->setSwvid();
|
||||
$this->setLabels();
|
||||
$this->telIJkpunten();
|
||||
$this->setPeriode();
|
||||
$this->setKleuren();
|
||||
$this->loopScores1();
|
||||
$this->setGemiddeldeScore();
|
||||
$this->addGemiddeldeScore();
|
||||
$this->loopScores2();
|
||||
$this->setKolombreedte();
|
||||
$this->setOrgbreedte();
|
||||
$this->setSchoolAfbeeldingen();
|
||||
|
||||
}
|
||||
private function setSwvid(){
|
||||
$this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
}
|
||||
|
||||
private function setLabels(){
|
||||
$this->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
if(! $this->labels){
|
||||
$this->labels = $this->CI->Labels_model->getalllabels(1);
|
||||
}
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
foreach($this->ijkpunten as $ijkpunt){
|
||||
if($ijkpunt->disabled == 'F'){
|
||||
$this->aantalY++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setPeriode(){
|
||||
$this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
$this->vantm = "Gegevens uit periode ".$this->orgversie->periodenummer." van ".mysql2date($this->orgversie->geldigvanaf)." t/m ".mysql2date($this->orgversie->geldigtm);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function setKleuren(){
|
||||
|
||||
// $this->kleuren = $this->kleurcodes->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
// if(!$this->kleuren || $this->kleuren == " ") {
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->cluster_id = $this->clusterid;
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->orgversie->scoretype== 7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
}
|
||||
// $this->kleuren->kleur1 = '#fe2219';
|
||||
// $this->kleuren->kleur2 = '#fea719';
|
||||
// $this->kleuren->kleur3 = '#15d029';
|
||||
// $this->kleuren->kleur4 = '#1558d0';
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
// public function getSchoolAfbeeldingen(){
|
||||
// return $this->schoolafbeeldingen;
|
||||
// }
|
||||
//
|
||||
// public function getIJkpunten(){
|
||||
// return $this->ijkpunten;
|
||||
// }
|
||||
//
|
||||
// public function getLabels(){
|
||||
// return $this->labels;
|
||||
// }
|
||||
//
|
||||
// public function getScores(){
|
||||
// return $this->scores;
|
||||
// }
|
||||
// public function getAmbities(){
|
||||
// return $this->ambities;
|
||||
// }
|
||||
//
|
||||
// public function getOrgVersie(){
|
||||
// return $this->orgversie;
|
||||
// }
|
||||
//
|
||||
// public function getResultaten(){
|
||||
// $gem = "";
|
||||
// if($this->gemiddelde){
|
||||
// $gem = $this->gemiddelde->gem;
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private function loopScores1(){
|
||||
if(!$this->scores) return;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
|
||||
$this->somscore = $this->somscore + $this->score->gem;
|
||||
|
||||
$this->aantalscores++;
|
||||
}
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
|
||||
$this->disablenvt++;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function setGemiddeldeScore(){
|
||||
if(!$this->scores || $this->aantalscores == 0) return;
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->gem = 0;
|
||||
$deler = $this->aantalY - $this->disablenvt;
|
||||
if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
$this->score = $this->gemiddelde;
|
||||
}
|
||||
|
||||
private function addGemiddeldeScore(){
|
||||
if(!$this->scores || ! $this->gemiddelde) return;
|
||||
array_push($this->scores, $this->score);
|
||||
}
|
||||
|
||||
private function loopScores2()
|
||||
{
|
||||
if (!$this->scores) return;
|
||||
$scoretype = $this->scores[0]->scoretype;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
$this->setScoreNummer();
|
||||
$this->rondScoresAf();
|
||||
$this->setScoreKleuren($scoretype);
|
||||
$this->addGewensteScores($index);
|
||||
$this->setWensKleuren($scoretype);
|
||||
$this->setAdvies();
|
||||
$this->setResultatenOverzicht();
|
||||
$this->telIJKpuntenok();
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreNummer(){
|
||||
$this->score->huidig = 1;
|
||||
if ($this->score->gem >= $this->kleuren->grens1) $this->score->huidig =2;
|
||||
if ($this->score->gem >= $this->kleuren->grens2) $this->score->huidig =3;
|
||||
if ($this->score->gem >= $this->kleuren->grens3) $this->score->huidig =4;
|
||||
|
||||
if($this->orgversie->scoretype == 7){
|
||||
if ($this->score->gem == $this->kleuren->grens3) $this->score->huidig = 4;
|
||||
if ($this->score->gem < $this->kleuren->grens3) $this->score->huidig = 3;
|
||||
if ($this->score->gem <= $this->kleuren->grens2) $this->score->huidig = 2;
|
||||
if ($this->score->gem <= $this->kleuren->grens1) $this->score->huidig = 1;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private function rondScoresAf(){
|
||||
$this->score->gem = round($this->score->gem);
|
||||
}
|
||||
|
||||
|
||||
private function setScoreKleuren($scoretype){
|
||||
|
||||
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($scoretype, $this->score->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->kleur = $kleur;
|
||||
|
||||
|
||||
// switch ($this->score->huidig) {
|
||||
// case 1:
|
||||
// $this->score->kleur = $this->kleuren->kleur1;
|
||||
// break;
|
||||
// case 2:
|
||||
// $this->score->kleur = $this->kleuren->kleur2;
|
||||
// break;
|
||||
// case 3:
|
||||
// $this->score->kleur = $this->kleuren->kleur3;
|
||||
// break;
|
||||
// case 4:
|
||||
// $this->score->kleur = $this->kleuren->kleur4;
|
||||
// break;
|
||||
// default:
|
||||
// $this->score->kleur = '#ffffff';
|
||||
// $this->resultaten = [
|
||||
// 'totgem' => $gem,
|
||||
// 'ijkpuntenok' => $this->ijkpuntenok,
|
||||
// 'welkehoogste' => $this->welkehoogste,
|
||||
// 'hoogstescore' => round($this->hoogstescore, 1),
|
||||
// 'welkelaagste' => $this->welkelaagste,
|
||||
// 'laagstescore' => round($this->laagstescore, 1),
|
||||
// ];
|
||||
//
|
||||
// return $this->resultaten;
|
||||
// }
|
||||
//
|
||||
// public function getVantm(){
|
||||
// return $this->vantm;
|
||||
// }
|
||||
//
|
||||
// public function getAdviezen(){
|
||||
// return $this->adviezen;
|
||||
// }
|
||||
//
|
||||
// public function getSomscore(){
|
||||
// return $this->somscore;
|
||||
// }
|
||||
//
|
||||
// private function setScores(){
|
||||
// $this->scores = $this->schoolscores->getScores();
|
||||
// }
|
||||
//
|
||||
// private function setAmbities(){
|
||||
// $this->ambities = $this->schoolscores->getAmbities();
|
||||
// }
|
||||
//
|
||||
// private function setWensen(){
|
||||
// $this->wensen = $this->schoolscores->getWensen();
|
||||
// }
|
||||
//
|
||||
// private function setIJkpunten(){
|
||||
// $this->ijkpunten = $this->schoolscores->getIJKpunten();
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
// $this->setSwvid();
|
||||
// $this->setLabels();
|
||||
// $this->telIJkpunten();
|
||||
// $this->setPeriode();
|
||||
// $this->setKleuren();
|
||||
// $this->loopScores1();
|
||||
// $this->setGemiddeldeScore();
|
||||
// $this->addGemiddeldeScore();
|
||||
// $this->loopScores2();
|
||||
// $this->setKolombreedte();
|
||||
// $this->setOrgbreedte();
|
||||
// $this->setSchoolAfbeeldingen();
|
||||
//
|
||||
// }
|
||||
// private function setSwvid(){
|
||||
// $this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setLabels(){
|
||||
// $this->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
// if(! $this->labels){
|
||||
// $this->labels = $this->CI->Labels_model->getalllabels(1);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
private function addGewensteScores($index){
|
||||
$this->score->wens = 3;
|
||||
if ($this->wensen && $index < $this->aantalscores) {
|
||||
$this->score->wens = $this->wensen[$index]->wens;
|
||||
}
|
||||
}
|
||||
|
||||
private function setWensKleuren($scoretype){
|
||||
if(! isset($this->wensen)) return;
|
||||
if(!isset($this->score->wens)) return;
|
||||
$kleur = $this->CI->Scorekleuren_model->getWensKleur($scoretype, $this->score->wens);
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->wenskleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function setAdvies(){
|
||||
|
||||
if(isset($this->score->wens) &&
|
||||
$this->score->huidig < $this->score->wens &&
|
||||
$this->score->wens!= 0 &&
|
||||
$this->score->disabled == 'F' &&
|
||||
$this->score->disablenvt == 'F'){
|
||||
$omschrijving = "";
|
||||
if(isset($this->score->omschrijving)){
|
||||
$omschrijving = $this->score->omschrijving;
|
||||
}
|
||||
array_push($this->adviezen, ["nummer"=> $this->score->nummer, "omschrijving" =>$omschrijving]);
|
||||
}
|
||||
}
|
||||
|
||||
private function setResultatenOverzicht()
|
||||
{
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
if ($this->score->gem > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->score->gem;
|
||||
$this->welkehoogste = $this->score->nummer;
|
||||
}
|
||||
if ($this->score->gem <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->score->gem;
|
||||
$this->welkelaagste = $this->score->nummer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function telIJkpuntenok()
|
||||
{
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
if ($this->ambities && $this->score->gem >= $this->ambities->zprocent && $this->score->disabled == 'F') {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setKolombreedte(){
|
||||
if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
$kolombreedte = floor(($this->rij - $this->standaardorg)/$this->aantal);
|
||||
$this->kolomInt = $kolombreedte;
|
||||
$this->kolombreedte = $kolombreedte . 'px';
|
||||
}
|
||||
private function setOrgbreedte(){
|
||||
if($this->aantalY > 1){
|
||||
$this->aantal = $this->aantalY;}
|
||||
$orgbreedte = floor($this->rij - ($this->aantal * $this->kolomInt));
|
||||
$this->orgbreedte = $orgbreedte . 'px';
|
||||
}
|
||||
|
||||
private function setSchoolAfbeeldingen()
|
||||
{
|
||||
//nagaan of het tabelid altijd klopt
|
||||
if (!$this->scores) {
|
||||
$this->schoolafbeeldingen = false;
|
||||
|
||||
}
|
||||
|
||||
if ($this->scores) {
|
||||
$this->schoolafbeeldingen = [
|
||||
"module" => $this->modulenr,
|
||||
"scores" => $this->scores,
|
||||
"labels" => $this->labels,
|
||||
|
||||
"kleuren" => $this->kleuren,
|
||||
"vantm" => $this->vantm,
|
||||
"ambitie" => $this->ambities,
|
||||
"adviezen" => $this->adviezen,
|
||||
"ijkpunten" => $this->ijkpunten,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
"aantalY" => $this->aantalY,
|
||||
"totgem" => $this->gemiddelde->gem,
|
||||
"orgbreedte" => $this->orgbreedte,
|
||||
"kolombreedte" => $this->kolombreedte,
|
||||
];
|
||||
}
|
||||
}
|
||||
// }
|
||||
//
|
||||
// private function telIJkpunten(){
|
||||
// if($this->ijkpunten){
|
||||
// foreach($this->ijkpunten as $ijkpunt){
|
||||
// if($ijkpunt->disabled == 'F'){
|
||||
// $this->aantalY++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setPeriode(){
|
||||
// $this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
// $this->vantm = "Gegevens uit periode ".$this->orgversie->periodenummer." van ".mysql2date($this->orgversie->geldigvanaf)." t/m ".mysql2date($this->orgversie->geldigtm);
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// private function setKleuren(){
|
||||
//
|
||||
//// $this->kleuren = $this->kleurcodes->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
//// if(!$this->kleuren || $this->kleuren == " ") {
|
||||
// $this->kleuren = new stdClass();
|
||||
// $this->kleuren->cluster_id = $this->clusterid;
|
||||
// $this->kleuren->grens1 = '60';
|
||||
// $this->kleuren->grens2 = '80';
|
||||
// $this->kleuren->grens3 = '90';
|
||||
// $this->kleuren->grens4 = '100';
|
||||
// if($this->orgversie->scoretype== 7){
|
||||
// $this->kleuren->grens1 = '33';
|
||||
// $this->kleuren->grens2 = '66';
|
||||
// $this->kleuren->grens3 = '100';
|
||||
// }
|
||||
//// $this->kleuren->kleur1 = '#fe2219';
|
||||
//// $this->kleuren->kleur2 = '#fea719';
|
||||
//// $this->kleuren->kleur3 = '#15d029';
|
||||
//// $this->kleuren->kleur4 = '#1558d0';
|
||||
// $this->kleuren->kleur1 = '#e08885';
|
||||
// $this->kleuren->kleur2 = '#ffcc80';
|
||||
// $this->kleuren->kleur3 = '#9fdf9f';
|
||||
// $this->kleuren->kleur4 = '#99d6ff';
|
||||
// $this->kleuren->organisatie_id = '0';
|
||||
//// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// private function loopScores1(){
|
||||
// if(!$this->scores) return;
|
||||
// foreach ($this->scores as $index => $this->score) {
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
//
|
||||
// $this->somscore = $this->somscore + $this->score->gem;
|
||||
//
|
||||
// $this->aantalscores++;
|
||||
// }
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
|
||||
// $this->disablenvt++;
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setGemiddeldeScore(){
|
||||
// if(!$this->scores || $this->aantalscores == 0) return;
|
||||
// $this->gemiddelde = new stdClass();
|
||||
// $this->gemiddelde->gem = 0;
|
||||
// $deler = $this->aantalY - $this->disablenvt;
|
||||
// if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
//
|
||||
// $this->gemiddelde->disabled = 'F';
|
||||
// $this->gemiddelde->disablenvt = 'F';
|
||||
// $this->gemiddelde->nummer = 'gem';
|
||||
// $this->score = $this->gemiddelde;
|
||||
// }
|
||||
//
|
||||
// private function addGemiddeldeScore(){
|
||||
// if(!$this->scores || ! $this->gemiddelde) return;
|
||||
// array_push($this->scores, $this->score);
|
||||
// }
|
||||
//
|
||||
// private function loopScores2()
|
||||
// {
|
||||
// if (!$this->scores) return;
|
||||
// $scoretype = $this->scores[0]->scoretype;
|
||||
// foreach ($this->scores as $index => $this->score) {
|
||||
// $this->setScoreNummer();
|
||||
// $this->rondScoresAf();
|
||||
// $this->setScoreKleuren($scoretype);
|
||||
// $this->addGewensteScores($index);
|
||||
// $this->setWensKleuren($scoretype);
|
||||
// $this->setAdvies();
|
||||
// $this->setResultatenOverzicht();
|
||||
// $this->telIJKpuntenok();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setScoreNummer(){
|
||||
// $this->score->huidig = 1;
|
||||
// if ($this->score->gem >= $this->kleuren->grens1) $this->score->huidig =2;
|
||||
// if ($this->score->gem >= $this->kleuren->grens2) $this->score->huidig =3;
|
||||
// if ($this->score->gem >= $this->kleuren->grens3) $this->score->huidig =4;
|
||||
//
|
||||
// if($this->orgversie->scoretype == 7){
|
||||
// if ($this->score->gem == $this->kleuren->grens3) $this->score->huidig = 4;
|
||||
// if ($this->score->gem < $this->kleuren->grens3) $this->score->huidig = 3;
|
||||
// if ($this->score->gem <= $this->kleuren->grens2) $this->score->huidig = 2;
|
||||
// if ($this->score->gem <= $this->kleuren->grens1) $this->score->huidig = 1;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function rondScoresAf(){
|
||||
// $this->score->gem = round($this->score->gem);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function setScoreKleuren($scoretype){
|
||||
//
|
||||
//
|
||||
// $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($scoretype, $this->score->gem);
|
||||
// $kleur = $kleur->kleurcode;
|
||||
// if(!$kleur) $kleur = '#ffffff';
|
||||
// $this->score->kleur = $kleur;
|
||||
//
|
||||
//
|
||||
//// switch ($this->score->huidig) {
|
||||
//// case 1:
|
||||
//// $this->score->kleur = $this->kleuren->kleur1;
|
||||
//// break;
|
||||
//// case 2:
|
||||
//// $this->score->kleur = $this->kleuren->kleur2;
|
||||
//// break;
|
||||
//// case 3:
|
||||
//// $this->score->kleur = $this->kleuren->kleur3;
|
||||
//// break;
|
||||
//// case 4:
|
||||
//// $this->score->kleur = $this->kleuren->kleur4;
|
||||
//// break;
|
||||
//// default:
|
||||
//// $this->score->kleur = '#ffffff';
|
||||
//// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function addGewensteScores($index){
|
||||
// $this->score->wens = 3;
|
||||
// if ($this->wensen && $index < $this->aantalscores) {
|
||||
// $this->score->wens = $this->wensen[$index]->wens;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setWensKleuren($scoretype){
|
||||
// if(! isset($this->wensen)) return;
|
||||
// if(!isset($this->score->wens)) return;
|
||||
// $kleur = $this->CI->Scorekleuren_model->getWensKleur($scoretype, $this->score->wens);
|
||||
// if(!$kleur) $kleur = '#ffffff';
|
||||
// $this->score->wenskleur = $kleur;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setAdvies(){
|
||||
//
|
||||
// if(isset($this->score->wens) &&
|
||||
// $this->score->huidig < $this->score->wens &&
|
||||
// $this->score->wens!= 0 &&
|
||||
// $this->score->disabled == 'F' &&
|
||||
// $this->score->disablenvt == 'F'){
|
||||
// $omschrijving = "";
|
||||
// if(isset($this->score->omschrijving)){
|
||||
// $omschrijving = $this->score->omschrijving;
|
||||
// }
|
||||
// array_push($this->adviezen, ["nummer"=> $this->score->nummer, "omschrijving" =>$omschrijving]);
|
||||
// }
|
||||
// }
|
||||
// private function telIJkpuntenok()
|
||||
// {
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
// if ($this->ambities && $this->score->gem >= $this->ambities->zprocent && $this->score->disabled == 'F') {
|
||||
// $this->ijkpuntenok++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setResultatenOverzicht()
|
||||
// {
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
// if ($this->score->gem > $this->hoogstescore) {
|
||||
// $this->hoogstescore = $this->score->gem;
|
||||
// $this->welkehoogste = $this->score->nummer;
|
||||
// }
|
||||
// if ($this->score->gem <= $this->laagstescore) {
|
||||
// $this->laagstescore = $this->score->gem;
|
||||
// $this->welkelaagste = $this->score->nummer;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// private function setKolombreedte(){
|
||||
// if($this->aantalY > 1) $this->aantal = $this->aantalY;
|
||||
// $kolombreedte = floor(($this->rij - $this->standaardorg)/$this->aantal);
|
||||
// $this->kolomInt = $kolombreedte;
|
||||
// $this->kolombreedte = $kolombreedte . 'px';
|
||||
// }
|
||||
// private function setOrgbreedte(){
|
||||
// if($this->aantalY > 1){
|
||||
// $this->aantal = $this->aantalY;}
|
||||
// $orgbreedte = floor($this->rij - ($this->aantal * $this->kolomInt));
|
||||
// $this->orgbreedte = $orgbreedte . 'px';
|
||||
// }
|
||||
//
|
||||
// private function setSchoolAfbeeldingen()
|
||||
// {
|
||||
// //nagaan of het tabelid altijd klopt
|
||||
// if (!$this->scores) {
|
||||
// $this->schoolafbeeldingen = false;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// if ($this->scores) {
|
||||
// $this->schoolafbeeldingen = [
|
||||
// "module" => $this->modulenr,
|
||||
// "scores" => $this->scores,
|
||||
// "labels" => $this->labels,
|
||||
//
|
||||
// "kleuren" => $this->kleuren,
|
||||
// "vantm" => $this->vantm,
|
||||
// "ambitie" => $this->ambities,
|
||||
// "adviezen" => $this->adviezen,
|
||||
// "ijkpunten" => $this->ijkpunten,
|
||||
// 'ijkpuntenok' => $this->ijkpuntenok,
|
||||
// 'welkehoogste' => $this->welkehoogste,
|
||||
// 'hoogstescore' => round($this->hoogstescore, 1),
|
||||
// 'welkelaagste' => $this->welkelaagste,
|
||||
// 'laagstescore' => round($this->laagstescore, 1),
|
||||
// "aantalY" => $this->aantalY,
|
||||
// "totgem" => $this->gemiddelde->gem,
|
||||
// "orgbreedte" => $this->orgbreedte,
|
||||
// "kolombreedte" => $this->kolombreedte,
|
||||
// ];
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -4,18 +4,32 @@ class Schoolscores
|
||||
{
|
||||
private $CI;
|
||||
private $ijkpunten;
|
||||
private $aantalY = 0;
|
||||
private $scores;
|
||||
private $score;
|
||||
private $somscore;
|
||||
private $org;
|
||||
private $ambities;
|
||||
private $resultaten;
|
||||
private $wensen;
|
||||
private $schoolScores;
|
||||
private $adviezen= [];
|
||||
private $aantaldisablenvt = 0;
|
||||
private $aantalscores = 0;
|
||||
private $ijkpuntenok = 0;
|
||||
private $welkelaagste;
|
||||
private $welkehoogste;
|
||||
private $laagstescore = 110;
|
||||
private $hoogstescore = 0;
|
||||
private $gemiddelde;
|
||||
|
||||
|
||||
public function __construct( $orgversieid, $orgid)
|
||||
public function __construct( $orgversieid, $orgid, $scoretype, $isVergelijking)
|
||||
{
|
||||
$this->CI =& get_instance();
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->scoretype= $scoretype;
|
||||
$this->isVergelijking = $isVergelijking;
|
||||
$this->handle();
|
||||
}
|
||||
|
||||
@@ -31,22 +45,30 @@ class Schoolscores
|
||||
return $this->wensen;
|
||||
}
|
||||
|
||||
public function getSchoolScores()
|
||||
{
|
||||
return $this->schoolScores;
|
||||
}
|
||||
|
||||
public function getIJkpunten(){
|
||||
return $this->ijkpunten;
|
||||
}
|
||||
|
||||
public function getResults(){
|
||||
return $this->results;
|
||||
}
|
||||
|
||||
private function handle()
|
||||
{
|
||||
$this->setIJkpunten();
|
||||
{ $this->setIJkpunten();
|
||||
$this->telIJkpunten();
|
||||
$this->setOrglist();
|
||||
$this->setOrg();
|
||||
$this->setScores();
|
||||
$this->setMetingen();
|
||||
$this->setAmbities();
|
||||
$this->setWensen();
|
||||
$this->setSchoolScores();
|
||||
$this->setKleuren();
|
||||
$this->loopScores1();
|
||||
$this->loopScores2();
|
||||
$this->setGemiddeldeScore();
|
||||
$this->addGemiddeldeScore();
|
||||
|
||||
$this->setResults();
|
||||
}
|
||||
|
||||
|
||||
@@ -54,21 +76,374 @@ class Schoolscores
|
||||
$this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgid);
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
foreach($this->ijkpunten as $ijkpunt){
|
||||
if($ijkpunt->disabled == 'F'){
|
||||
$this->aantalY++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setAmbities(){
|
||||
$this->ambities = $this->CI->Ambities_model->getOrgAmbities($this->orgversieid, $this->orgid);
|
||||
}
|
||||
|
||||
private function setOrglist(){
|
||||
$orglist = $this->CI->Organisaties_model->getlistrecursief($this->orgid, []);
|
||||
if($orglist) {
|
||||
$this->orgstring = implode(',', $orglist);
|
||||
}
|
||||
}
|
||||
private function setOrg(){
|
||||
$this->org = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
$this->orgnaam = $this->org->brin? $this->org->brin . ' ' . $this->org->naamkort : $this->org->naamkort;
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgstring);
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
$this->metingen = new stdClass();
|
||||
if(count($this->scores)==0)
|
||||
$this->metingen->aantal= 0;
|
||||
$this->metingen->aantalorgs = 0;
|
||||
|
||||
if($this->org->soort == 4) {
|
||||
$this->metingen->aantal = 1;
|
||||
$this->metingen->aantalorgs = 1;
|
||||
}
|
||||
else {
|
||||
$this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgstring);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private function setAmbities(){
|
||||
$ambitieorgs = '';
|
||||
|
||||
$ambitieorgs = $this->getAmbitieOrgs($this->orgid, $ambitieorgs);
|
||||
$ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
|
||||
$toporgsarray = explode(',', $ambitieorgs);
|
||||
$toporgs = '';
|
||||
$index = 0;
|
||||
for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
if($index < 2) {
|
||||
$toporgs .= $toporgsarray[$i] . ',';
|
||||
$index++;
|
||||
}
|
||||
}
|
||||
$toporgs = rtrim($toporgs, ',' );
|
||||
|
||||
$this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
}
|
||||
|
||||
|
||||
private function setWensen(){
|
||||
if($this->isVergelijking =='T' ) {$this->wensen = false;
|
||||
return;
|
||||
}
|
||||
$this->wensen = $this->CI->Wenssituaties_model->getgewenst( $this->orgversieid, $this->orgid);
|
||||
}
|
||||
|
||||
private function setSchoolScores(){
|
||||
$this->schoolScores = [
|
||||
$this->ijkpunten, $this->scores, $this->ambities, $this->wensen];
|
||||
}
|
||||
private function setKleuren(){
|
||||
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->scoretype ==7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
}
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
// }
|
||||
}
|
||||
|
||||
private function loopScores1(){
|
||||
if(!$this->scores) return;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
$this->somscore = $this->somscore + $this->score->gem;
|
||||
$this->aantalscores++;
|
||||
}
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
|
||||
$this->aantaldisablenvt++;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function loopScores2(){
|
||||
if (!$this->scores) return;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
$this->setScoreNummer();
|
||||
$this->rondScoresAf();
|
||||
$this->setScoreKleuren();
|
||||
$this->telIJkpuntenok();
|
||||
$this->setResultaten();
|
||||
$this->addGewensteScores($index);
|
||||
$this->setWenskleuren();
|
||||
$this->setAdviezen();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreNummer(){
|
||||
if($this->isVergelijking =='T' ) return;
|
||||
$this->score->huidig = 1;
|
||||
if ($this->score->gem >= $this->kleuren->grens1) $this->score->huidig =2;
|
||||
if ($this->score->gem >= $this->kleuren->grens2) $this->score->huidig =3;
|
||||
if ($this->score->gem >= $this->kleuren->grens3) $this->score->huidig =4;
|
||||
|
||||
if($this->scoretype == 7){
|
||||
if ($this->score->gem == $this->kleuren->grens3) $this->score->huidig = 4;
|
||||
if ($this->score->gem < $this->kleuren->grens3) $this->score->huidig = 3;
|
||||
if ($this->score->gem <= $this->kleuren->grens2) $this->score->huidig = 2;
|
||||
if ($this->score->gem <= $this->kleuren->grens1) $this->score->huidig = 1;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function rondScoresAf(){
|
||||
$this->score->gem = round($this->score->gem);
|
||||
|
||||
}
|
||||
|
||||
private function setScoreKleuren(){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->score->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->kleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function telIJkpuntenok(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
$zprocent = 60;
|
||||
if(isset($this->ambities) && $this->ambities ) $zprocent = $this->ambities->zprocent;
|
||||
if ($this->score->gem >= $zprocent ) {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setResultaten(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
|
||||
if ($this->score->gem > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->score->gem;
|
||||
$this->welkehoogste = $this->score->nummer;
|
||||
}
|
||||
if ($this->score->gem <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->score->gem;
|
||||
$this->welkelaagste = $this->score->nummer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function addGewensteScores($index){
|
||||
if($this->isVergelijking =='T' ) return;
|
||||
|
||||
$this->score->wens = 3;
|
||||
if ($this->wensen && $index < $this->aantalscores) {
|
||||
$this->score->wens = $this->wensen[$index]->wens;
|
||||
}
|
||||
}
|
||||
|
||||
private function setWensKleuren(){
|
||||
if($this->isVergelijking =='T' ) return;
|
||||
|
||||
if(! isset($this->wensen)) return;
|
||||
if(!isset($this->score->wens)) return;
|
||||
$kleur = $this->CI->Scorekleuren_model->getWensKleur($this->scoretype, $this->score->wens);
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->wenskleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function setAdviezen(){
|
||||
if($this->isVergelijking =='T' ) {
|
||||
$this->adviezen = false;
|
||||
return;
|
||||
}
|
||||
if(isset($this->score->wens) &&
|
||||
$this->score->huidig < $this->score->wens &&
|
||||
$this->score->wens!= 0 &&
|
||||
$this->score->disabled == 'F' &&
|
||||
$this->score->disablenvt == 'F'){
|
||||
$omschrijving = "";
|
||||
if(isset($this->score->omschrijving)){
|
||||
$omschrijving = $this->score->omschrijving;
|
||||
}
|
||||
$this->adviezen[] = ["nummer"=> $this->score->nummer, "omschrijving" =>$omschrijving];
|
||||
}
|
||||
}
|
||||
|
||||
private function setGemiddeldeScore(){
|
||||
if(!$this->scores || $this->aantalscores == 0) return;
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->gem = 0;
|
||||
$this->gemiddelde->score = 0;
|
||||
$deler = $this->aantalY - $this->aantaldisablenvt;
|
||||
if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->gemiddelde->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->gemiddelde->kleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function addGemiddeldeScore(){
|
||||
if(!$this->scores || ! $this->gemiddelde) return;
|
||||
array_push($this->scores, $this->gemiddelde);
|
||||
}
|
||||
|
||||
|
||||
private function setResults(){
|
||||
|
||||
$this->resultaten = [
|
||||
'totgem' => $this->gemiddelde->gem,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
|
||||
$this->results= [
|
||||
'orgnaam' => $this->orgnaam,
|
||||
'ijkpunten' => $this->ijkpunten,
|
||||
'scores' => $this->scores,
|
||||
'metingen' => $this->metingen,
|
||||
'ambities' => $this->ambities,
|
||||
'kleuren' => $this->kleuren,
|
||||
'wensen' => $this->wensen,
|
||||
'resultaten' => $this->resultaten,
|
||||
'adviezen' => $this->adviezen,
|
||||
'aantalY' => $this->aantalY
|
||||
|
||||
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
$ambitieorgs .= $orgid . ',';
|
||||
$valtonder = $this->CI->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
if($valtonder != $orgid){
|
||||
return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
}
|
||||
|
||||
return $ambitieorgs;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// private $CI;
|
||||
// private $ijkpunten;
|
||||
// private $scores;
|
||||
// private $ambities;
|
||||
// private $wensen;
|
||||
// private $schoolScores;
|
||||
//
|
||||
//
|
||||
// public function __construct( $orgversieid, $orgid)
|
||||
// {
|
||||
// $this->CI =& get_instance();
|
||||
// $this->orgversieid = $orgversieid;
|
||||
// $this->orgid = $orgid;
|
||||
// $this->handle();
|
||||
// }
|
||||
|
||||
// public function getScores(){
|
||||
// return $this->scores;
|
||||
// }
|
||||
//
|
||||
// public function getAmbities(){
|
||||
// return $this->ambities;
|
||||
// }
|
||||
//
|
||||
// public function getWensen(){
|
||||
// return $this->wensen;
|
||||
// }
|
||||
//
|
||||
// public function getSchoolScores()
|
||||
// {
|
||||
// return $this->schoolScores;
|
||||
// }
|
||||
//
|
||||
// public function getIJkpunten(){
|
||||
// return $this->ijkpunten;
|
||||
// }
|
||||
//
|
||||
// private function handle()
|
||||
// {
|
||||
// $this->setIJkpunten();
|
||||
// $this->setScores();
|
||||
// $this->setAmbities();
|
||||
// $this->setWensen();
|
||||
// $this->setSchoolScores();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function setIJkpunten(){
|
||||
// $this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
// }
|
||||
//
|
||||
// private function setScores(){
|
||||
// $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setAmbities(){
|
||||
// $ambitieorgs = '';
|
||||
// $ambitieorgs = $this->getAmbitieOrgs($this->orgid, $ambitieorgs);
|
||||
// $ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
//
|
||||
// $toporgsarray = explode(',', $ambitieorgs);
|
||||
// $toporgs = '';
|
||||
// $index = 0;
|
||||
// for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
// if($index < 2) {
|
||||
// $toporgs .= $toporgsarray[$i] . ',';
|
||||
// $index++;
|
||||
// }
|
||||
// }
|
||||
// $toporgs = rtrim($toporgs, ',' );
|
||||
//
|
||||
// $this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
// }
|
||||
//
|
||||
// private function setWensen(){
|
||||
// $this->wensen = $this->CI->Wenssituaties_model->getgewenst( $this->orgversieid, $this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setSchoolScores(){
|
||||
// $this->schoolScores = [
|
||||
// $this->ijkpunten, $this->scores, $this->ambities, $this->wensen];
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
// $ambitieorgs .= $orgid . ',';
|
||||
// $valtonder = $this->CI->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
// if($valtonder != $orgid){
|
||||
// return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
// }
|
||||
//
|
||||
// return $ambitieorgs;
|
||||
//
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -0,0 +1,352 @@
|
||||
<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
class Scores
|
||||
{
|
||||
private $CI;
|
||||
private $ijkpunten;
|
||||
private $aantalY = 0;
|
||||
private $scores;
|
||||
private $score;
|
||||
private $somscore;
|
||||
private $org;
|
||||
private $ambities;
|
||||
private $resultaten;
|
||||
private $wensen;
|
||||
private $adviezen= [];
|
||||
private $aantaldisablenvt = 0;
|
||||
private $aantalscores = 0;
|
||||
private $ijkpuntenok = 0;
|
||||
private $welkelaagste;
|
||||
private $welkehoogste;
|
||||
private $laagstescore = 110;
|
||||
private $hoogstescore = 0;
|
||||
private $gemiddelde;
|
||||
|
||||
|
||||
public function __construct( $orgversieid, $orgid, $scoretype, $isVergelijking)
|
||||
{
|
||||
$this->CI =& get_instance();
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->scoretype= $scoretype;
|
||||
$this->isVergelijking = $isVergelijking;
|
||||
$this->handle();
|
||||
}
|
||||
|
||||
public function getScores(){
|
||||
return $this->scores;
|
||||
}
|
||||
|
||||
public function getAmbities(){
|
||||
return $this->ambities;
|
||||
}
|
||||
|
||||
public function getWensen(){
|
||||
return $this->wensen;
|
||||
}
|
||||
|
||||
public function getIJkpunten(){
|
||||
return $this->ijkpunten;
|
||||
}
|
||||
|
||||
public function getResults(){
|
||||
return $this->results;
|
||||
}
|
||||
|
||||
private function handle()
|
||||
{ $this->setIJkpunten();
|
||||
$this->telIJkpunten();
|
||||
$this->setOrglist();
|
||||
$this->setOrg();
|
||||
$this->setScores();
|
||||
$this->setMetingen();
|
||||
$this->setAmbities();
|
||||
$this->setWensen();
|
||||
$this->setKleuren();
|
||||
$this->loopScores1();
|
||||
$this->loopScores2();
|
||||
$this->setGemiddeldeScore();
|
||||
$this->addGemiddeldeScore();
|
||||
|
||||
$this->setResults();
|
||||
}
|
||||
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
foreach($this->ijkpunten as $ijkpunt){
|
||||
if($ijkpunt->disabled == 'F'){
|
||||
$this->aantalY++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setOrglist(){
|
||||
$orglist = $this->CI->Organisaties_model->getlistrecursief($this->orgid, []);
|
||||
if($orglist) {
|
||||
$this->orgstring = implode(',', $orglist);
|
||||
}
|
||||
}
|
||||
private function setOrg(){
|
||||
$this->org = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
$this->orgnaam = $this->org->brin? $this->org->brin . ' ' . $this->org->naamkort : $this->org->naamkort;
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgstring);
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
$this->metingen = new stdClass();
|
||||
if(count($this->scores)==0)
|
||||
$this->metingen->aantal= 0;
|
||||
$this->metingen->aantalorgs = 0;
|
||||
|
||||
if($this->org->soort == 4) {
|
||||
$this->metingen->aantal = 1;
|
||||
$this->metingen->aantalorgs = 1;
|
||||
}
|
||||
else {
|
||||
$this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgstring);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private function setAmbities(){
|
||||
$ambitieorgs = '';
|
||||
|
||||
$ambitieorgs = $this->getAmbitieOrgs($this->orgid, $ambitieorgs);
|
||||
$ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
|
||||
$toporgsarray = explode(',', $ambitieorgs);
|
||||
$toporgs = '';
|
||||
$index = 0;
|
||||
for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
if($index < 2) {
|
||||
$toporgs .= $toporgsarray[$i] . ',';
|
||||
$index++;
|
||||
}
|
||||
}
|
||||
$toporgs = rtrim($toporgs, ',' );
|
||||
|
||||
$this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
}
|
||||
|
||||
|
||||
private function setWensen(){
|
||||
if($this->isVergelijking =='T' ) {$this->wensen = false;
|
||||
return;
|
||||
}
|
||||
$this->wensen = $this->CI->Wenssituaties_model->getgewenst( $this->orgversieid, $this->orgid);
|
||||
}
|
||||
|
||||
private function setKleuren(){
|
||||
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->scoretype ==7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
}
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
// }
|
||||
}
|
||||
|
||||
private function loopScores1(){
|
||||
if(!$this->scores) return;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
$this->somscore = $this->somscore + $this->score->gem;
|
||||
$this->aantalscores++;
|
||||
}
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
|
||||
$this->aantaldisablenvt++;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function loopScores2(){
|
||||
if (!$this->scores) return;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
$this->setScoreNummer();
|
||||
$this->rondScoresAf();
|
||||
$this->setScoreKleuren();
|
||||
$this->telIJkpuntenok();
|
||||
$this->setResultaten();
|
||||
$this->addGewensteScores($index);
|
||||
$this->setWenskleuren();
|
||||
$this->setAdviezen();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreNummer(){
|
||||
if($this->isVergelijking =='T' ) return;
|
||||
$this->score->huidig = 1;
|
||||
if ($this->score->gem >= $this->kleuren->grens1) $this->score->huidig =2;
|
||||
if ($this->score->gem >= $this->kleuren->grens2) $this->score->huidig =3;
|
||||
if ($this->score->gem >= $this->kleuren->grens3) $this->score->huidig =4;
|
||||
|
||||
if($this->scoretype == 7){
|
||||
if ($this->score->gem == $this->kleuren->grens3) $this->score->huidig = 4;
|
||||
if ($this->score->gem < $this->kleuren->grens3) $this->score->huidig = 3;
|
||||
if ($this->score->gem <= $this->kleuren->grens2) $this->score->huidig = 2;
|
||||
if ($this->score->gem <= $this->kleuren->grens1) $this->score->huidig = 1;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function rondScoresAf(){
|
||||
$this->score->gem = round($this->score->gem);
|
||||
|
||||
}
|
||||
|
||||
private function setScoreKleuren(){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->score->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->kleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function telIJkpuntenok(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
$zprocent = 60;
|
||||
if(isset($this->ambities) && $this->ambities ) $zprocent = $this->ambities->zprocent;
|
||||
if ($this->score->gem >= $zprocent ) {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setResultaten(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
|
||||
if ($this->score->gem > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->score->gem;
|
||||
$this->welkehoogste = $this->score->nummer;
|
||||
}
|
||||
if ($this->score->gem <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->score->gem;
|
||||
$this->welkelaagste = $this->score->nummer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function addGewensteScores($index){
|
||||
if($this->isVergelijking =='T' ) return;
|
||||
|
||||
$this->score->wens = 3;
|
||||
if ($this->wensen && $index < $this->aantalscores) {
|
||||
$this->score->wens = $this->wensen[$index]->wens;
|
||||
}
|
||||
}
|
||||
|
||||
private function setWensKleuren(){
|
||||
if($this->isVergelijking =='T' ) return;
|
||||
|
||||
if(! isset($this->wensen)) return;
|
||||
if(!isset($this->score->wens)) return;
|
||||
$kleur = $this->CI->Scorekleuren_model->getWensKleur($this->scoretype, $this->score->wens);
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->wenskleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function setAdviezen(){
|
||||
if($this->isVergelijking =='T' ) {
|
||||
$this->adviezen = false;
|
||||
return;
|
||||
}
|
||||
if(isset($this->score->wens) &&
|
||||
$this->score->huidig < $this->score->wens &&
|
||||
$this->score->wens!= 0 &&
|
||||
$this->score->disabled == 'F' &&
|
||||
$this->score->disablenvt == 'F'){
|
||||
$omschrijving = "";
|
||||
if(isset($this->score->omschrijving)){
|
||||
$omschrijving = $this->score->omschrijving;
|
||||
}
|
||||
$this->adviezen[] = ["nummer"=> $this->score->nummer, "omschrijving" =>$omschrijving];
|
||||
}
|
||||
}
|
||||
|
||||
private function setGemiddeldeScore(){
|
||||
if(!$this->scores || $this->aantalscores == 0) return;
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->gem = 0;
|
||||
$this->gemiddelde->score = 0;
|
||||
$deler = $this->aantalY - $this->aantaldisablenvt;
|
||||
if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->gemiddelde->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->gemiddelde->kleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function addGemiddeldeScore(){
|
||||
if(!$this->scores || ! $this->gemiddelde) return;
|
||||
array_push($this->scores, $this->gemiddelde);
|
||||
}
|
||||
|
||||
|
||||
private function setResults(){
|
||||
|
||||
$this->resultaten = [
|
||||
'totgem' => $this->gemiddelde->gem,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
|
||||
$this->results= [
|
||||
'orgnaam' => $this->orgnaam,
|
||||
'ijkpunten' => $this->ijkpunten,
|
||||
'scores' => $this->scores,
|
||||
'metingen' => $this->metingen,
|
||||
'ambities' => $this->ambities,
|
||||
'kleuren' => $this->kleuren,
|
||||
'wensen' => $this->wensen,
|
||||
'resultaten' => $this->resultaten,
|
||||
'adviezen' => $this->adviezen,
|
||||
'aantalY' => $this->aantalY
|
||||
|
||||
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
$ambitieorgs .= $orgid . ',';
|
||||
$valtonder = $this->CI->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
if($valtonder != $orgid){
|
||||
return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
}
|
||||
|
||||
return $ambitieorgs;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -52,7 +52,7 @@ class Compacteonderdelen
|
||||
}
|
||||
|
||||
public function getSchoolnaam(){
|
||||
return $this->organisatie->naam;
|
||||
return $this->organisatie->naamkort;
|
||||
}
|
||||
|
||||
private function handle()
|
||||
@@ -437,7 +437,7 @@ class Compacteonderdelen
|
||||
'onderdelen' => $this->onderdelenNew,
|
||||
'schooljaarnr' => $this->schooljaarnr,
|
||||
'schooljaar' => $this->schooljaar->naam,
|
||||
'orgnaam' => $this->organisatie->naam
|
||||
'orgnaam' => $this->organisatie->naamkort
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,255 +2,254 @@
|
||||
|
||||
class Afbeeldingen {
|
||||
|
||||
private $CI;
|
||||
private $swvid;
|
||||
private $scores;
|
||||
private $score;
|
||||
private $somscore;
|
||||
private $kleuren;
|
||||
private $kleurcodes;
|
||||
private $orgversie;
|
||||
private $gemiddelde;
|
||||
private $nummer;
|
||||
private $gem;
|
||||
private $aantalscores = 0;
|
||||
private $ijkpuntenok = 0;
|
||||
private $welkehoogste = 0;
|
||||
private $hoogstescore = -1;
|
||||
private $welkelaagste = 0;
|
||||
private $laagstescore = 101;
|
||||
private $resultaten;
|
||||
private $disablenvt = 0;
|
||||
private $ijkpunten;
|
||||
private $aantalY = 0;
|
||||
|
||||
public function __construct($scoresObject, $modulenr, $orgversieid, $clusterid, $orgid, $zprocent){
|
||||
$this->CI = & get_instance();
|
||||
$this->scoresobject = $scoresObject;
|
||||
$this->modulenr = $modulenr;
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->clusterid = $clusterid;
|
||||
$this->zprocent = $zprocent;
|
||||
$this->handle();
|
||||
}
|
||||
|
||||
public function getScores(){
|
||||
return $this->scores;
|
||||
}
|
||||
|
||||
public function getResultaten(){
|
||||
$gem ="";
|
||||
if($this->gemiddelde){
|
||||
$gem = $this->gemiddelde->gem;
|
||||
}
|
||||
|
||||
$this->resultaten = [
|
||||
'totgem' => $gem,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
|
||||
return $this->resultaten;
|
||||
}
|
||||
|
||||
public function getKleuren(){
|
||||
return $this->kleuren;
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
$this->setIJkpunten();
|
||||
$this->telIJkpunten();
|
||||
$this->setScores();
|
||||
$this->setSWVid();
|
||||
$this->setOrgversie();
|
||||
// $this->setKleurcodes();
|
||||
$this->setKleuren();
|
||||
$this->loopScores1();
|
||||
$this->setGemiddeldeScore();
|
||||
$this->addGemiddeldeScore();
|
||||
$this->loopScores2();
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
foreach($this->ijkpunten as $ijkpunt){
|
||||
if($ijkpunt->disabled == 'F'){
|
||||
$this->aantalY++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->scoresobject->getScores();
|
||||
}
|
||||
|
||||
private function setSWVid(){
|
||||
$this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
}
|
||||
|
||||
private function setOrgversie(){
|
||||
$this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
}
|
||||
|
||||
private function setKleurcodes(){
|
||||
$this->kleurcodes = new Kleurcodes();
|
||||
}
|
||||
|
||||
private function setKleuren(){
|
||||
// $this->kleuren = $this->kleurcodes->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
// if(!$this->kleuren || $this->kleuren == " ") {
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->cluster_id = $this->clusterid;
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->orgversie->scoretype ==7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
}
|
||||
// $this->kleuren->kleur1 = '#fe2219';
|
||||
// $this->kleuren->kleur2 = '#fea719';
|
||||
// $this->kleuren->kleur3 = '#15d029';
|
||||
// $this->kleuren->kleur4 = '#1558d0';
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
// private $CI;
|
||||
// private $swvid;
|
||||
// private $scores;
|
||||
// private $score;
|
||||
// private $somscore;
|
||||
// private $kleuren;
|
||||
// private $kleurcodes;
|
||||
// private $orgversie;
|
||||
// private $gemiddelde;
|
||||
// private $nummer;
|
||||
// private $gem;
|
||||
// private $aantalscores = 0;
|
||||
// private $ijkpuntenok = 0;
|
||||
// private $welkehoogste = 0;
|
||||
// private $hoogstescore = -1;
|
||||
// private $welkelaagste = 0;
|
||||
// private $laagstescore = 101;
|
||||
// private $resultaten;
|
||||
// private $disablenvt = 0;
|
||||
// private $ijkpunten;
|
||||
// private $aantalY = 0;
|
||||
//
|
||||
// public function __construct($scoresObject, $modulenr, $orgversieid, $clusterid, $orgid){
|
||||
// $this->CI = & get_instance();
|
||||
// $this->scoresobject = $scoresObject;
|
||||
// $this->modulenr = $modulenr;
|
||||
// $this->orgversieid = $orgversieid;
|
||||
// $this->orgid = $orgid;
|
||||
// $this->clusterid = $clusterid;
|
||||
// $this->handle();
|
||||
// }
|
||||
//
|
||||
// public function getScores(){
|
||||
// return $this->scores;
|
||||
// }
|
||||
//
|
||||
// public function getResultaten(){
|
||||
// $gem ="";
|
||||
// if($this->gemiddelde){
|
||||
// $gem = $this->gemiddelde->gem;
|
||||
// }
|
||||
}
|
||||
|
||||
private function loopScores1(){
|
||||
if(!$this->scores) return;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
// $this->berekenGemiddelden();
|
||||
$this->setScoreSom();
|
||||
$this->setAantalScores($index);
|
||||
}
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
|
||||
$this->disablenvt++;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// private function berekenGemiddelden(){
|
||||
// if(!$this->scores) return;
|
||||
// $this->score->gem = 0;
|
||||
// if($this->score->num > 0 ){
|
||||
//// $this->score->gem = round((($this->score->somscore/ $this->score->num)* 10)/10);
|
||||
// $this->score->gem = $this->score->somscore/ $this->score->num;
|
||||
//
|
||||
// $this->resultaten = [
|
||||
// 'totgem' => $gem,
|
||||
// 'ijkpuntenok' => $this->ijkpuntenok,
|
||||
// 'welkehoogste' => $this->welkehoogste,
|
||||
// 'hoogstescore' => round($this->hoogstescore, 1),
|
||||
// 'welkelaagste' => $this->welkelaagste,
|
||||
// 'laagstescore' => round($this->laagstescore, 1),
|
||||
// ];
|
||||
//
|
||||
// return $this->resultaten;
|
||||
// }
|
||||
//
|
||||
// public function getKleuren(){
|
||||
// return $this->kleuren;
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
// $this->setIJkpunten();
|
||||
// $this->telIJkpunten();
|
||||
// $this->setScores();
|
||||
// $this->setSWVid();
|
||||
// $this->setOrgversie();
|
||||
//// $this->setKleurcodes();
|
||||
// $this->setKleuren();
|
||||
// $this->loopScores1();
|
||||
// $this->setGemiddeldeScore();
|
||||
// $this->addGemiddeldeScore();
|
||||
// $this->loopScores2();
|
||||
// }
|
||||
//
|
||||
// private function setIJkpunten(){
|
||||
// $this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
// }
|
||||
//
|
||||
// private function telIJkpunten(){
|
||||
// if($this->ijkpunten){
|
||||
// foreach($this->ijkpunten as $ijkpunt){
|
||||
// if($ijkpunt->disabled == 'F'){
|
||||
// $this->aantalY++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
private function setScoreSom(){
|
||||
|
||||
$this->somscore = $this->somscore + $this->score->gem;
|
||||
|
||||
}
|
||||
|
||||
private function setAantalScores($index){
|
||||
$this->aantalscores++;
|
||||
}
|
||||
|
||||
private function setGemiddeldeScore(){
|
||||
if(!$this->scores || $this->aantalscores == 0) return;
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->gem = 0;
|
||||
$deler = $this->aantalY - $this->disablenvt;
|
||||
if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
$this->score = $this->gemiddelde;
|
||||
}
|
||||
|
||||
private function addGemiddeldeScore(){
|
||||
if(!$this->scores || ! $this->gemiddelde) return;
|
||||
array_push($this->scores, $this->score);
|
||||
}
|
||||
|
||||
private function loopScores2(){
|
||||
if (!$this->scores) return;
|
||||
$scoretype = $this->scores[0]->scoretype;
|
||||
foreach ($this->scores as $index => $this->score) {
|
||||
$this->setScoreNummer();
|
||||
$this->rondScoresAf();
|
||||
$this->setScoreKleuren($scoretype);
|
||||
$this->setResultatenOverzicht();
|
||||
$this->telIJkpuntenok();
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreNummer(){
|
||||
$this->score->huidig = 1;
|
||||
if ($this->score->gem >= $this->kleuren->grens1) $this->score->huidig =2;
|
||||
if ($this->score->gem >= $this->kleuren->grens2) $this->score->huidig =3;
|
||||
if ($this->score->gem >= $this->kleuren->grens3) $this->score->huidig =4;
|
||||
}
|
||||
|
||||
private function rondScoresAf(){
|
||||
$this->score->gem = round($this->score->gem);
|
||||
|
||||
}
|
||||
|
||||
private function setScoreKleuren($scoretype){
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($scoretype, $this->score->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->kleur = $kleur;
|
||||
|
||||
|
||||
// switch ($this->score->huidig) {
|
||||
// case 1:
|
||||
// $this->score->kleur = $this->kleuren->kleur1;
|
||||
// break;
|
||||
// case 2:
|
||||
// $this->score->kleur = $this->kleuren->kleur2;
|
||||
// break;
|
||||
// case 3:
|
||||
// $this->score->kleur = $this->kleuren->kleur3;
|
||||
// break;
|
||||
// case 4:
|
||||
// $this->score->kleur = $this->kleuren->kleur4;
|
||||
// break;
|
||||
// default:
|
||||
// $this->score->kleur = '#ffffff';
|
||||
//
|
||||
// private function setScores(){
|
||||
// $this->scores = $this->scoresobject->getScores();
|
||||
// }
|
||||
//
|
||||
// private function setSWVid(){
|
||||
// $this->swvid = $this->CI->Organisaties_model->get_swvid($this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setOrgversie(){
|
||||
// $this->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->orgversieid);
|
||||
// }
|
||||
//
|
||||
// private function setKleurcodes(){
|
||||
// $this->kleurcodes = new Kleurcodes();
|
||||
// }
|
||||
//
|
||||
// private function setKleuren(){
|
||||
//// $this->kleuren = $this->kleurcodes->getKleurcodesOrg($this->clusterid, $this->swvid);
|
||||
//// if(!$this->kleuren || $this->kleuren == " ") {
|
||||
// $this->kleuren = new stdClass();
|
||||
// $this->kleuren->cluster_id = $this->clusterid;
|
||||
// $this->kleuren->grens1 = '60';
|
||||
// $this->kleuren->grens2 = '80';
|
||||
// $this->kleuren->grens3 = '90';
|
||||
// $this->kleuren->grens4 = '100';
|
||||
// if($this->orgversie->scoretype ==7){
|
||||
// $this->kleuren->grens1 = '33';
|
||||
// $this->kleuren->grens2 = '66';
|
||||
// $this->kleuren->grens3 = '100';
|
||||
// }
|
||||
//// $this->kleuren->kleur1 = '#fe2219';
|
||||
//// $this->kleuren->kleur2 = '#fea719';
|
||||
//// $this->kleuren->kleur3 = '#15d029';
|
||||
//// $this->kleuren->kleur4 = '#1558d0';
|
||||
// $this->kleuren->kleur1 = '#e08885';
|
||||
// $this->kleuren->kleur2 = '#ffcc80';
|
||||
// $this->kleuren->kleur3 = '#9fdf9f';
|
||||
// $this->kleuren->kleur4 = '#99d6ff';
|
||||
// $this->kleuren->organisatie_id = '0';
|
||||
//// }
|
||||
// }
|
||||
//
|
||||
// private function loopScores1(){
|
||||
// if(!$this->scores) return;
|
||||
// foreach ($this->scores as $index => $this->score) {
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
//// $this->berekenGemiddelden();
|
||||
// $this->setScoreSom();
|
||||
// $this->setAantalScores($index);
|
||||
// }
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
|
||||
// $this->disablenvt++;
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//// private function berekenGemiddelden(){
|
||||
//// if(!$this->scores) return;
|
||||
//// $this->score->gem = 0;
|
||||
//// if($this->score->num > 0 ){
|
||||
////// $this->score->gem = round((($this->score->somscore/ $this->score->num)* 10)/10);
|
||||
//// $this->score->gem = $this->score->somscore/ $this->score->num;
|
||||
//// }
|
||||
//// }
|
||||
//
|
||||
// private function setScoreSom(){
|
||||
//
|
||||
// $this->somscore = $this->somscore + $this->score->gem;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setAantalScores($index){
|
||||
// $this->aantalscores++;
|
||||
// }
|
||||
//
|
||||
// private function setGemiddeldeScore(){
|
||||
// if(!$this->scores || $this->aantalscores == 0) return;
|
||||
// $this->gemiddelde = new stdClass();
|
||||
// $this->gemiddelde->gem = 0;
|
||||
// $deler = $this->aantalY - $this->disablenvt;
|
||||
// if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
//
|
||||
// $this->gemiddelde->disabled = 'F';
|
||||
// $this->gemiddelde->disablenvt = 'F';
|
||||
// $this->gemiddelde->nummer = 'gem';
|
||||
// $this->score = $this->gemiddelde;
|
||||
// }
|
||||
//
|
||||
// private function addGemiddeldeScore(){
|
||||
// if(!$this->scores || ! $this->gemiddelde) return;
|
||||
// array_push($this->scores, $this->score);
|
||||
// }
|
||||
//
|
||||
// private function loopScores2(){
|
||||
// if (!$this->scores) return;
|
||||
// $scoretype = $this->scores[0]->scoretype;
|
||||
// foreach ($this->scores as $index => $this->score) {
|
||||
// $this->setScoreNummer();
|
||||
// $this->rondScoresAf();
|
||||
// $this->setScoreKleuren($scoretype);
|
||||
// $this->setResultatenOverzicht();
|
||||
// $this->telIJkpuntenok();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setScoreNummer(){
|
||||
// $this->score->huidig = 1;
|
||||
// if ($this->score->gem >= $this->kleuren->grens1) $this->score->huidig =2;
|
||||
// if ($this->score->gem >= $this->kleuren->grens2) $this->score->huidig =3;
|
||||
// if ($this->score->gem >= $this->kleuren->grens3) $this->score->huidig =4;
|
||||
// }
|
||||
//
|
||||
// private function rondScoresAf(){
|
||||
// $this->score->gem = round($this->score->gem);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setScoreKleuren($scoretype){
|
||||
// $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($scoretype, $this->score->gem);
|
||||
// $kleur = $kleur->kleurcode;
|
||||
// if(!$kleur) $kleur = '#ffffff';
|
||||
// $this->score->kleur = $kleur;
|
||||
//
|
||||
//
|
||||
//// switch ($this->score->huidig) {
|
||||
//// case 1:
|
||||
//// $this->score->kleur = $this->kleuren->kleur1;
|
||||
//// break;
|
||||
//// case 2:
|
||||
//// $this->score->kleur = $this->kleuren->kleur2;
|
||||
//// break;
|
||||
//// case 3:
|
||||
//// $this->score->kleur = $this->kleuren->kleur3;
|
||||
//// break;
|
||||
//// case 4:
|
||||
//// $this->score->kleur = $this->kleuren->kleur4;
|
||||
//// break;
|
||||
//// default:
|
||||
//// $this->score->kleur = '#ffffff';
|
||||
//// }
|
||||
// }
|
||||
//
|
||||
// private function setResultatenOverzicht(){
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
//
|
||||
// if ($this->score->gem > $this->hoogstescore) {
|
||||
// $this->hoogstescore = $this->score->gem;
|
||||
// $this->welkehoogste = $this->score->nummer;
|
||||
// }
|
||||
// if ($this->score->gem <= $this->laagstescore) {
|
||||
// $this->laagstescore = $this->score->gem;
|
||||
// $this->welkelaagste = $this->score->nummer;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function telIJkpuntenok(){
|
||||
// if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
// if ($this->score->gem >= $this->zprocent) {
|
||||
// $this->ijkpuntenok++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
private function setResultatenOverzicht(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
|
||||
if ($this->score->gem > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->score->gem;
|
||||
$this->welkehoogste = $this->score->nummer;
|
||||
}
|
||||
if ($this->score->gem <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->score->gem;
|
||||
$this->welkelaagste = $this->score->nummer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function telIJkpuntenok(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
if ($this->score->gem >= $this->zprocent) {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ class Bestuurscores
|
||||
private $scores;
|
||||
private $orgstring;
|
||||
private $metingen;
|
||||
private $ambities;
|
||||
|
||||
|
||||
public function __construct( $orgversieid, $orgid, $vorm)
|
||||
@@ -14,40 +15,73 @@ class Bestuurscores
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->vorm = $vorm;
|
||||
$this->handle();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getScores(){
|
||||
return $this->scores;
|
||||
}
|
||||
|
||||
public function getMetingen(){
|
||||
return $this->metingen;
|
||||
}
|
||||
|
||||
|
||||
private function handle(){
|
||||
|
||||
|
||||
$this->setOrglist();
|
||||
$this->setScores();
|
||||
$this->setMetingen();
|
||||
}
|
||||
|
||||
|
||||
private function setOrglist(){
|
||||
$orglist = $this->CI->Organisaties_model->getlistrecursief($this->orgid, []);
|
||||
if($orglist) {
|
||||
$this->orgstring = implode(',', $orglist);
|
||||
}
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgstring);
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
$this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgstring);
|
||||
}
|
||||
// public function getScores(){
|
||||
// return $this->scores;
|
||||
// }
|
||||
//
|
||||
// public function getMetingen(){
|
||||
// return $this->metingen;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function handle(){
|
||||
//
|
||||
//
|
||||
// $this->setOrglist();
|
||||
// $this->setScores();
|
||||
// $this->setMetingen();
|
||||
// $this->setAmbities();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private function setOrglist(){
|
||||
// $orglist = $this->CI->Organisaties_model->getlistrecursief($this->orgid, []);
|
||||
// if($orglist) {
|
||||
// $this->orgstring = implode(',', $orglist);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setScores(){
|
||||
// $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgstring);
|
||||
// }
|
||||
//
|
||||
// private function setMetingen(){
|
||||
// $this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgstring);
|
||||
// }
|
||||
//
|
||||
// private function setAmbities(){
|
||||
//
|
||||
// $ambitieorgs = '';
|
||||
// $ambitieorgs = $this->getAmbitieOrgs($this->orgid, $ambitieorgs);
|
||||
// $ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
//
|
||||
// $toporgsarray = explode(',', $ambitieorgs);
|
||||
// $toporgs = '';
|
||||
// $index = 0;
|
||||
// for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
// if($index < 2) {
|
||||
// $toporgs .= $toporgsarray[$i] . ',';
|
||||
// $index++;
|
||||
// }
|
||||
// }
|
||||
// $toporgs = rtrim($toporgs, ',' );
|
||||
//
|
||||
// $this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
// $ambitieorgs .= $orgid . ',';
|
||||
// $valtonder = $this->CI->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
// if($valtonder != $orgid){
|
||||
// return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
// }
|
||||
//
|
||||
// return $ambitieorgs;
|
||||
//
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -4,16 +4,32 @@ class Individuelescores
|
||||
{
|
||||
private $CI;
|
||||
private $userid;
|
||||
private $aantalY = 0;
|
||||
private $scores;
|
||||
private $score;
|
||||
private $ambities;
|
||||
private $kleuren;
|
||||
private $aantaldisablenvt = 0;
|
||||
private $aantalscores = 0;
|
||||
private $ijkpuntenok = 0;
|
||||
private $results;
|
||||
private $gemiddelde;
|
||||
private $resultaten;
|
||||
private $adviezen;
|
||||
private $somscore = 0;
|
||||
private $welkelaagste;
|
||||
private $welkehoogste;
|
||||
private $laagstescore = 110;
|
||||
private $hoogstescore = 0;
|
||||
|
||||
public function __construct( $orgversieid, $orguserid, $orgid)
|
||||
|
||||
public function __construct( $orgversieid, $orguserid, $orgid, $scoretype)
|
||||
{
|
||||
$this->CI = & get_instance();
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->orguserid = $orguserid;
|
||||
$this->teller = 0;
|
||||
$this->scoretype = $scoretype;
|
||||
$this->handle();
|
||||
}
|
||||
|
||||
@@ -21,42 +37,242 @@ class Individuelescores
|
||||
return $this->scores;
|
||||
}
|
||||
|
||||
public function getResults(){
|
||||
return $this->results;
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
$this->setUserid();
|
||||
$this->setOrg();
|
||||
$this->setIJkpunten();
|
||||
$this->telIJkpunten();
|
||||
$this->setScores();
|
||||
$this->setAmbities();
|
||||
$this->setKleuren();
|
||||
$this->loopScores();
|
||||
$this->setGemiddeldeScore();
|
||||
$this->addGemiddeldeScore();
|
||||
$this->setResults();
|
||||
|
||||
}
|
||||
|
||||
private function setUserid(){
|
||||
$this->userid = $this->CI->Orgusers_model->get_fieldvalue(['id' =>$this->orguserid], 'user_id');
|
||||
}
|
||||
private function setOrg(){
|
||||
$this->org = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
$this->orgnaam = $this->org->brin? $this->org->brin . ' ' . $this->org->naamkort : $this->org->naamkort;
|
||||
}
|
||||
|
||||
private function setIJkpunten(){
|
||||
$this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->orgversieid);
|
||||
}
|
||||
|
||||
private function telIJkpunten(){
|
||||
if($this->ijkpunten){
|
||||
foreach($this->ijkpunten as $ijkpunt){
|
||||
if($ijkpunt->disabled == 'F'){
|
||||
$this->aantalY++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->CI->Scores_model->calculateindividualscores($this->orgversieid, $this->orgid, $this->userid);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function setAmbities(){
|
||||
$ambitieorgs = '';
|
||||
|
||||
$ambitieorgs = $this->getAmbitieOrgs($this->orgid, $ambitieorgs);
|
||||
$ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
|
||||
$toporgsarray = explode(',', $ambitieorgs);
|
||||
$toporgs = '';
|
||||
$index = 0;
|
||||
for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
if($index < 2) {
|
||||
$toporgs .= $toporgsarray[$i] . ',';
|
||||
$index++;
|
||||
}
|
||||
}
|
||||
$toporgs = rtrim($toporgs, ',' );
|
||||
|
||||
$this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
|
||||
}
|
||||
|
||||
private function setKleuren(){
|
||||
|
||||
$this->kleuren = new stdClass();
|
||||
$this->kleuren->grens1 = '60';
|
||||
$this->kleuren->grens2 = '80';
|
||||
$this->kleuren->grens3 = '90';
|
||||
$this->kleuren->grens4 = '100';
|
||||
if($this->scoretype ==7){
|
||||
$this->kleuren->grens1 = '33';
|
||||
$this->kleuren->grens2 = '66';
|
||||
$this->kleuren->grens3 = '100';
|
||||
}
|
||||
$this->kleuren->kleur1 = '#e08885';
|
||||
$this->kleuren->kleur2 = '#ffcc80';
|
||||
$this->kleuren->kleur3 = '#9fdf9f';
|
||||
$this->kleuren->kleur4 = '#99d6ff';
|
||||
$this->kleuren->organisatie_id = '0';
|
||||
|
||||
}
|
||||
|
||||
|
||||
private function loopScores(){
|
||||
$this->aantaldisablenvt = 0;
|
||||
if(! isset($this->scores) || $this->scores == false ) return;
|
||||
foreach($this->scores as $this->score) {
|
||||
$this->setNietVanToepassing();
|
||||
$this->setGem();
|
||||
$this->setSomscores();
|
||||
$this->setScoreKleuren();
|
||||
$this->telIJkpuntenok();
|
||||
$this->setResultaten();
|
||||
$this->setAdviezen();
|
||||
}
|
||||
}
|
||||
|
||||
private function setNietVanToepassing(){
|
||||
if(! isset($this->scores) || $this->scores == false ) return;
|
||||
$this->score->disablenvt = 'F';
|
||||
if($this->score->aantalvier> 0 && $this->score->aantalvier == $this->score->aantalnvt)
|
||||
if($this->score->aantalvier> 0 && $this->score->aantalvier == $this->score->aantalnvt){
|
||||
$this->score->disablenvt = 'T';
|
||||
$this->aantaldisablenvt++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private function setGem(){
|
||||
if(! isset($this->scores) || $this->scores == false ) return;
|
||||
$this->score->gem = 0;
|
||||
if(isset($this->score->somscore) && $this->score->num > 0) {
|
||||
$this->score->gem = $this->score->somscore/$this->score->num;
|
||||
$this->score->gem = round($this->score->somscore/$this->score->num);
|
||||
}
|
||||
}
|
||||
|
||||
private function setSomscores()
|
||||
{ if(! isset($this->scores) || $this->scores == false ) return;
|
||||
if ($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
$this->somscore = $this->somscore + $this->score->gem;
|
||||
$this->aantalscores++;
|
||||
}
|
||||
}
|
||||
|
||||
private function setScoreKleuren(){
|
||||
if(! isset($this->scores) || $this->scores == false ) return;
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->score->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->score->kleur = $kleur;
|
||||
|
||||
}
|
||||
|
||||
private function telIJkpuntenok(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
if ($this->score->gem >= $this->ambities->zprocent) {
|
||||
$this->ijkpuntenok++;
|
||||
}
|
||||
}
|
||||
}
|
||||
private function setResultaten(){
|
||||
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
|
||||
|
||||
if ($this->score->gem > $this->hoogstescore) {
|
||||
$this->hoogstescore = $this->score->gem;
|
||||
$this->welkehoogste = $this->score->nummer;
|
||||
}
|
||||
if ($this->score->gem <= $this->laagstescore) {
|
||||
$this->laagstescore = $this->score->gem;
|
||||
$this->welkelaagste = $this->score->nummer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setAdviezen(){
|
||||
if(! isset($this->scores) || $this->scores == false ) return;
|
||||
if(isset($this->score->wens) &&
|
||||
$this->score->huidig < $this->score->wens &&
|
||||
$this->score->wens!= 0 &&
|
||||
$this->score->disabled == 'F' &&
|
||||
$this->score->disablenvt == 'F'){
|
||||
$omschrijving = "";
|
||||
if(isset($this->score->omschrijving)){
|
||||
$omschrijving = $this->score->omschrijving;
|
||||
}
|
||||
$this->adviezen[] = ["nummer"=> $this->score->nummer, "omschrijving" =>$omschrijving];
|
||||
}
|
||||
}
|
||||
private function setGemiddeldeScore(){
|
||||
if(!$this->scores || $this->aantalscores == 0) return;
|
||||
$this->gemiddelde = new stdClass();
|
||||
$this->gemiddelde->gem = 0;
|
||||
$deler = $this->aantalY - $this->aantaldisablenvt;
|
||||
if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
|
||||
|
||||
$this->gemiddelde->disabled = 'F';
|
||||
$this->gemiddelde->disablenvt = 'F';
|
||||
$this->gemiddelde->nummer = 'gem';
|
||||
|
||||
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->gemiddelde->gem);
|
||||
$kleur = $kleur->kleurcode;
|
||||
if(!$kleur) $kleur = '#ffffff';
|
||||
$this->gemiddelde->kleur = $kleur;
|
||||
|
||||
}
|
||||
private function addGemiddeldeScore(){
|
||||
if(!$this->scores || ! $this->gemiddelde) return;
|
||||
array_push($this->scores, $this->gemiddelde);
|
||||
}
|
||||
|
||||
private function setResults(){
|
||||
if($this->scores) {
|
||||
$this->resultaten = [
|
||||
'totgem' => $this->gemiddelde->gem,
|
||||
'ijkpuntenok' => $this->ijkpuntenok,
|
||||
'welkehoogste' => $this->welkehoogste,
|
||||
'hoogstescore' => round($this->hoogstescore, 1),
|
||||
'welkelaagste' => $this->welkelaagste,
|
||||
'laagstescore' => round($this->laagstescore, 1),
|
||||
];
|
||||
}
|
||||
|
||||
$this->results= [
|
||||
'orgnaam' => $this->orgnaam,
|
||||
'ijkpunten' => $this->ijkpunten,
|
||||
'scores' => $this->scores ? $this->scores : false,
|
||||
'ambities' => $this->ambities,
|
||||
'kleuren' => $this->kleuren,
|
||||
'resultaten' => $this->resultaten,
|
||||
'adviezen' => $this->adviezen,
|
||||
'aantalY' => $this->aantalY
|
||||
|
||||
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
$ambitieorgs .= $orgid . ',';
|
||||
$valtonder = $this->CI->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
if($valtonder != $orgid){
|
||||
return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
}
|
||||
return $ambitieorgs;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -9,6 +9,7 @@ class Kamerscores
|
||||
private $orgids;
|
||||
private $scores;
|
||||
private $metingen;
|
||||
private $ambities;
|
||||
|
||||
public function __construct( $orgversieid, $orgid, $vorm)
|
||||
{
|
||||
@@ -16,64 +17,77 @@ class Kamerscores
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->vorm = $vorm;
|
||||
$this->handle();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getScores(){
|
||||
return $this->scores;
|
||||
}
|
||||
public function getMetingen(){
|
||||
return $this->metingen;
|
||||
}
|
||||
// public function getScores(){
|
||||
// return $this->scores;
|
||||
// }
|
||||
// public function getMetingen(){
|
||||
// return $this->metingen;
|
||||
// }
|
||||
//
|
||||
// public function getOrgnaam(){
|
||||
// return $this->kamernaam;
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
//
|
||||
// $this->setOrg();
|
||||
// $this->setKamerOrgid();
|
||||
// $this->setKamernaam();
|
||||
// $this->setScholenString();
|
||||
// $this->setScores();
|
||||
// $this->setMetingen();
|
||||
// $this->setAmbities();
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setOrg(){
|
||||
// $this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setKamerOrgid(){
|
||||
// switch($this->organisatie->soort){
|
||||
// case 2: $this->kamerid = $this->orgid;
|
||||
// break;
|
||||
// case 3: $this->kamerid = $this->organisatie->valtonder_id;
|
||||
// break;
|
||||
// case 4: $bestuursid = $this->organisatie->valtonder_id;
|
||||
// $this->kamerid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$bestuursid], 'valtonder_id');
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setKamernaam(){
|
||||
// $this->kamernaam = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$this->kamerid],'naamkort');
|
||||
// }
|
||||
//
|
||||
// private function setScholenString(){
|
||||
// $this->orgids = implode(',' , $this->CI->Organisaties_model->getscholenondertarget($this->kamerid));
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setScores(){
|
||||
//
|
||||
// if(!$this->orgids) return;
|
||||
// $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgids);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private function setMetingen(){
|
||||
// $this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgids);
|
||||
// }
|
||||
//
|
||||
// private function setAmbities(){
|
||||
//
|
||||
// $kamer = $this->CI->Organisaties_model->get_record_by_id($this->kamerid);
|
||||
// $ambitieorgs = $this->kamerid .','. $kamer->valtonder_id;
|
||||
// $toporgs = $ambitieorgs;
|
||||
// $this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $ambitieorgs, $toporgs);
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
|
||||
public function getOrgnaam(){
|
||||
return $this->kamernaam;
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
|
||||
$this->setOrg();
|
||||
$this->setKamerOrgid();
|
||||
$this->setKamernaam();
|
||||
$this->setScholenString();
|
||||
$this->setScores();
|
||||
$this->setMetingen();
|
||||
|
||||
}
|
||||
|
||||
private function setOrg(){
|
||||
$this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
}
|
||||
|
||||
private function setKamerOrgid(){
|
||||
switch($this->organisatie->soort){
|
||||
case 2: $this->kamerid = $this->orgid;
|
||||
break;
|
||||
case 3: $this->kamerid = $this->organisatie->valtonder_id;
|
||||
break;
|
||||
case 4: $bestuursid = $this->organisatie->valtonder_id;
|
||||
$this->kamerid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$bestuursid], 'valtonder_id');
|
||||
}
|
||||
}
|
||||
|
||||
private function setKamernaam(){
|
||||
$this->kamernaam = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$this->kamerid],'naamkort');
|
||||
}
|
||||
|
||||
private function setScholenString(){
|
||||
$this->orgids = implode(',' , $this->CI->Organisaties_model->getscholenondertarget($this->kamerid));
|
||||
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
|
||||
if(!$this->orgids) return;
|
||||
$this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgids);
|
||||
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
$this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgids);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,49 +4,39 @@ class Lijsten
|
||||
{
|
||||
private $CI;
|
||||
private $modulenr;
|
||||
private $ijkpunten;
|
||||
private $clusterid;
|
||||
private $versienaam;
|
||||
private $soort;
|
||||
private $aantal;
|
||||
private $schoolScores;
|
||||
private $gemiddeldeScores;
|
||||
private $bestuurScores;
|
||||
private $kamerScores;
|
||||
private $swvScores;
|
||||
private $schoolAfbeeldingen;
|
||||
private $gemiddeldenAfbeeldingen;
|
||||
private $bestuurAfbeeldingen;
|
||||
private $kamerAfbeeldingen;
|
||||
private $swvAfbeeldingen;
|
||||
private $score;
|
||||
private $onderorgs;
|
||||
private $zprocent;
|
||||
private $ambitiearray = [];
|
||||
private $ijkpunten;
|
||||
private $results;
|
||||
private $scores;
|
||||
private $vergelijkingen;
|
||||
private $lijst;
|
||||
private $lijsten = [];
|
||||
private $nieuwste = 0;
|
||||
private $nieuwsteversie;
|
||||
private $kleuren;
|
||||
private $org;
|
||||
private $orgstring;
|
||||
private $sopinfo;
|
||||
private $eigenambitie = 'F';
|
||||
|
||||
public function getLijsten(){
|
||||
return $this->lijsten;
|
||||
|
||||
}
|
||||
|
||||
public function getNieuwsteVersie(){
|
||||
return $this->nieuwsteversie;
|
||||
}
|
||||
|
||||
public function getEigenAmbitie(){
|
||||
return $this->eigenambitie;
|
||||
}
|
||||
|
||||
public function getIJkpunten(){
|
||||
return $this->ijkpunten;
|
||||
}
|
||||
|
||||
|
||||
public function getKleuren(){
|
||||
return $this->kleuren;
|
||||
return $this->results['kleuren'];
|
||||
}
|
||||
|
||||
public function getSopInfo(){
|
||||
@@ -62,12 +52,12 @@ class Lijsten
|
||||
|
||||
private function handle(){
|
||||
$this->setModulenummer();
|
||||
$this->setClusterid();
|
||||
$this->setOrg();
|
||||
$this->setSoort();
|
||||
$this->setAantal();
|
||||
|
||||
$this->loopSelecties();
|
||||
$this->loopLijsten();
|
||||
$this->setKleuren();
|
||||
$this->setSopInfo();
|
||||
}
|
||||
|
||||
@@ -77,61 +67,37 @@ class Lijsten
|
||||
$this->modulenr = $this->CI->Versies_model->get_fieldvalue(['id' => $versieid], 'modulenr');
|
||||
}
|
||||
|
||||
private function setClusterid(){
|
||||
$this->clusterid = $this->CI->Modules_model->get_fieldvalue(['sysnr' =>$this->modulenr], 'cluster_id');
|
||||
private function setOrg(){
|
||||
$this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
}
|
||||
|
||||
private function setSoort(){
|
||||
$this->soort = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$this->orgid], 'soort');
|
||||
$this->soort = $this->organisatie->soort;
|
||||
}
|
||||
|
||||
private function setAantal(){
|
||||
$this->aantal = count($this->selecties);
|
||||
}
|
||||
|
||||
|
||||
private function loopSelecties(){
|
||||
|
||||
for($index = 0; $index < $this->aantal; $index++){
|
||||
$this->versienaam = "";
|
||||
$this->schoolScores = new stdClass();
|
||||
$this->gemiddeldeScores = new stdClass();
|
||||
$this->bestuurScores = new stdClass();
|
||||
$this->swvScores = new StdClass();
|
||||
$this->schoolAfbeeldingen = new stdClass();
|
||||
$this->gemiddeldenAfbeeldingen = new stdClass();
|
||||
$this->bestuurAfbeeldingen = new stdClass();
|
||||
$this->swvScores = new stdClass();
|
||||
$this->lijst = new stdClass();
|
||||
$this->setOrgversieid($index);
|
||||
$this->setIJkpunten($index);
|
||||
$this->setVorm($index);
|
||||
$this->setOrgversie();
|
||||
$this->setIJkpunten($index);
|
||||
$this->setVersieNaam();
|
||||
$this->setOrgnaam();
|
||||
$this->setBrin();
|
||||
$this->setLabels();
|
||||
$this->setResults();
|
||||
$this->setVergelijkingen();
|
||||
$this->setVergelijkingScores();
|
||||
$this->setAmbities();
|
||||
$this->setZprocent();
|
||||
$this->setSchoolScores();
|
||||
$this->setIndividueleScores();
|
||||
$this->setBestuurScores();
|
||||
$this->setKamerScores();
|
||||
$this->setSWVScores();
|
||||
$this->setLijstScores();
|
||||
$this->setMetingen();
|
||||
$this->setGemiddeldeScores();
|
||||
$this->setAdviezen();
|
||||
$this->setGemiddeldenAdviezen();
|
||||
$this->setVNaam();
|
||||
$this->loopVergelijkingScores();
|
||||
// $this->setSchoolMetingen();
|
||||
// $this->setIndividueleMetingen();
|
||||
// $this->setMetingenVergelijking();
|
||||
// $this->setMetingenVergelijkingIndividueel();
|
||||
$this->setResultaten();
|
||||
$this->setLijst();
|
||||
$this->setrapportInfo();
|
||||
$this->setLijsten();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,361 +105,123 @@ class Lijsten
|
||||
$this->lijst->orgversieid = $this->selecties[$index]['orgversieid'];
|
||||
}
|
||||
|
||||
private function setIJkpunten($index){
|
||||
if($index != 0) return;
|
||||
$ijkpunten = $this->CI->Ijkpunten_model->getijkpunten($this->lijst->orgversieid);
|
||||
foreach($ijkpunten as $ijkpunt){
|
||||
$indicatoren= $this->CI->Indicatoren_model->getindicatoren($ijkpunt->id);
|
||||
if($indicatoren){
|
||||
$this->ijkpunten[] = $ijkpunt;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private function setVorm($index){
|
||||
$this->lijst->vorm = $this->selecties[$index]['vorm'];
|
||||
}
|
||||
|
||||
private function setOrgversie(){
|
||||
$this->lijst->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->lijst->orgversieid);
|
||||
|
||||
$this->lijst->orgversie = $this->CI->Orgversies_model->get_record_by_id($this->lijst->orgversieid);
|
||||
$this->lijst->periodenummer = $this->lijst->orgversie->periodenummer;
|
||||
$this->lijst->jaartal = substr($this->lijst->orgversie->geldigvanaf, 2,2);
|
||||
}
|
||||
|
||||
private function setIJkpunten($index){
|
||||
if($index > 0 ) return;
|
||||
$this->ijkpunten = $this->CI->Ijkpunten_model->getijkpuntenMetIndicatoren($this->lijst->orgversieid);
|
||||
}
|
||||
|
||||
private function setVersieNaam(){
|
||||
if($this->versienaam != "") return;
|
||||
$this->versienaam = $this->CI->Versies_model->get_fieldvalue(['id' => $this->lijst->orgversie->versie_id], 'naam');
|
||||
}
|
||||
|
||||
private function setOrgnaam(){
|
||||
$this->lijst->orgnaam = $this->CI->Organisaties_model->get_fieldvalue(
|
||||
['id' => $this->orgid], 'naam');
|
||||
}
|
||||
|
||||
private function setBrin(){
|
||||
if($this->soort != 4 && $this->soort != 3) return;
|
||||
$this->lijst->brin = $this->CI->Organisaties_model->get_fieldvalue(['id' => $this->orgid], 'brin');
|
||||
}
|
||||
|
||||
private function setLabels(){
|
||||
|
||||
$this->lijst->label = $this->CI->Labels_model->gettabellabel($this->modulenr);
|
||||
$this->lijst->label2 = $this->CI->Labels_model->getresultaatlabel($this->modulenr);
|
||||
}
|
||||
|
||||
private function setResults(){
|
||||
if($this->soort == 4 && $this->lijst->vorm == 2) {
|
||||
$this->gemiddelden = new Gemiddeldescores ($this->lijst->orgversieid, $this->orgid, $this->lijst->orgversie->scoretype);
|
||||
$this->results = $this->gemiddelden->getResults();
|
||||
$this->scores = $this->gemiddelden->getIJkpunten();
|
||||
}
|
||||
else {
|
||||
$this->scoresobject = new Schoolscores($this->lijst->orgversieid, $this->orgid, $this->lijst->orgversie->scoretype, 'F');
|
||||
$this->results = $this->scoresobject->getResults();
|
||||
$this->scores = $this->scoresobject->getScores();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function setVergelijkingen(){
|
||||
if($this->soort == 1) return;
|
||||
$this->vergelijkingen = new stdClass();
|
||||
switch($this->soort){
|
||||
case 2:
|
||||
case 3: $orgid = $this->organisatie->valtonder_id;
|
||||
break;
|
||||
case 4 : $bestuurid = $this->organisatie->valtonder_id;
|
||||
$orgid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$bestuurid], 'valtonder_id');
|
||||
break;
|
||||
}
|
||||
|
||||
$this->vergelijkingen = (new Schoolscores($this->lijst->orgversieid, $orgid, $this->lijst->orgversie->scoretype,'T' ))->getResults();
|
||||
}
|
||||
|
||||
|
||||
private function setVergelijkingScores(){
|
||||
if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return;
|
||||
|
||||
foreach($this->vergelijkingen['scores'] AS $i => $vergelijking){
|
||||
$this->scores[$i]->gemV = $vergelijking->gem;
|
||||
$this->scores[$i]->kleurV = $vergelijking->kleur;
|
||||
$this->scores[$i]->disabledV = $vergelijking->disabled;
|
||||
$this->scores[$i]->disablenvtV = $vergelijking->disablenvt;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function setAmbities(){
|
||||
$ambitie = $this->CI->Ambities_model->getOrgAmbities($this->lijst->orgversieid, $this->orgid);
|
||||
if (!in_array($ambitie, $this->ambitiearray, FALSE)) {
|
||||
$this->lijst->ambities = $ambitie;
|
||||
$this->ambitiearray [] = $ambitie;
|
||||
}
|
||||
}
|
||||
|
||||
private function setZprocent(){
|
||||
$this->zprocent = 0;
|
||||
if(isset($this->lijst->ambities)){
|
||||
$this->zprocent = $this->lijst->ambities->zprocent;
|
||||
}
|
||||
}
|
||||
$standaard = new stdClass();
|
||||
$standaard->ambitievan = 'standaard';
|
||||
$standaard->id = 0;
|
||||
$standaard->geldigtm = $this->lijst->orgversie->geldigtm;
|
||||
$standaard->geldigvanaf = $this->lijst->orgversie->geldigvanaf;
|
||||
$standaard->gemscore = 80;
|
||||
$standaard->naam = $this->versienaam;
|
||||
$standaard->orgversie_id = $this->lijst->orgversie->id;
|
||||
$standaard->periodenummer = $this->lijst->orgversie->periodenummer;
|
||||
$standaard->soort = 0;
|
||||
$standaard->xijkpunten = ROUND($this->results['aantalY'] * 0.8);
|
||||
$standaard->zprocent = 60;
|
||||
|
||||
private function setSchoolScores(){
|
||||
if ($this->soort != 4 || $this->lijst->vorm != 1) return;
|
||||
$this->schoolScores = new Schoolscores($this->lijst->orgversieid, $this->orgid);
|
||||
if($this->schoolScores) {
|
||||
$this->schoolAfbeeldingen = new Schoolafbeeldingen($this->schoolScores, $this->modulenr, $this->lijst->orgversieid,
|
||||
$this->clusterid, $this->orgid);
|
||||
$this->metingen = 0;
|
||||
$this->aantalorgs = 1;
|
||||
$somscore = $this->schoolAfbeeldingen->getSomscore();
|
||||
if($somscore > 0) $this->metingen = 1;
|
||||
}
|
||||
}
|
||||
|
||||
private function setIndividueleScores(){
|
||||
if($this->soort !=4 || $this->lijst->vorm != 2) return;
|
||||
$this->gemiddeldeScores = new Gemiddeldescores($this->lijst->orgversieid, $this->orgid);
|
||||
if($this->results && $this->results['ambities'] && $this->results['ambities']->gemscore > 0) $this->lijst->ambities = $this->results['ambities'];
|
||||
else $this->lijst->ambities = $standaard;
|
||||
|
||||
|
||||
if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return;
|
||||
|
||||
if($this->vergelijkingen['ambities'] && $this->vergelijkingen['ambities']->gemscore > 0 ) $ambitiesV = $this->vergelijkingen['ambities'];
|
||||
else $ambitiesV = $standaard;
|
||||
if($ambitiesV->ambitievan != $this->lijst->ambities->ambitievan) $this->lijst->ambitiesV = $ambitiesV;
|
||||
|
||||
if($this->gemiddeldeScores){
|
||||
$this->gemiddeldenAfbeeldingen = new Gemiddeldenafbeeldingen($this->gemiddeldeScores, $this->modulenr, $this->lijst->orgversieid,
|
||||
$this->clusterid, $this->orgid);
|
||||
}
|
||||
|
||||
// $this->gemiddeldeScores = new Individuelescores($this->lijst->orgversieid, $this->lijst->orguserid, $this->orgid);
|
||||
// $this->gemiddeldenAfbeeldingen = new Afbeeldingen($this->gemiddeldeScores, $this->modulenr, $this->lijst->orgversieid, $this->clusterid, $this->orgid, $this->zprocent);
|
||||
|
||||
}
|
||||
|
||||
private function setBestuurScores()
|
||||
{
|
||||
if ($this->soort != 3) return;
|
||||
$this->bestuurScores = new Bestuurscores($this->lijst->orgversieid, $this->orgid, $this->lijst->vorm);
|
||||
if ($this->bestuurScores) {
|
||||
$this->bestuurAfbeeldingen = new Afbeeldingen($this->bestuurScores, $this->modulenr, $this->lijst->orgversieid,
|
||||
$this->clusterid, $this->orgid, $this->zprocent);
|
||||
}
|
||||
}
|
||||
private function setLijst(){
|
||||
$this->lijst->naam = $this->results['orgnaam'];
|
||||
$this->lijst->scores = $this->scores;
|
||||
$metingen = $this->results['metingen'];
|
||||
$this->lijst->metingen = $metingen ? $metingen->aantal : 0;
|
||||
|
||||
private function setKamerScores(){
|
||||
if($this->soort == 1) return;
|
||||
$this->kamerScores = new Kamerscores($this->lijst->orgversieid, $this->orgid, $this->lijst->vorm);
|
||||
if($this->kamerScores) {
|
||||
$this->kamerAfbeeldingen = new Afbeeldingen($this->kamerScores, $this->modulenr, $this->lijst->orgversieid,
|
||||
$this->clusterid, $this->orgid, $this->zprocent);
|
||||
}
|
||||
}
|
||||
$this->lijst->aantalorgs = $metingen ? $metingen->aantalorgs : 0;
|
||||
|
||||
private function setSWVScores(){
|
||||
if ($this->soort == 3 || $this->soort == 4 ) return;
|
||||
$this->swvScores = new Swvscores($this->lijst->orgversieid, $this->orgid, $this->lijst->vorm);
|
||||
if($this->swvScores) {
|
||||
$this->swvAfbeeldingen = new Afbeeldingen($this->swvScores, $this->modulenr, $this->lijst->orgversieid,
|
||||
$this->clusterid, $this->orgid, $this->zprocent);
|
||||
}
|
||||
}
|
||||
$this->lijst->wensen = $this->results['wensen'];
|
||||
$this->lijst->adviezen = $this->results['adviezen'];
|
||||
$this->lijst->resultaten = $this->results['resultaten'] ;
|
||||
$this->lijst->aantalY = $this->results['aantalY'];
|
||||
|
||||
private function setLijstScores(){
|
||||
switch($this->soort){
|
||||
case 1:
|
||||
if(empty($this->swvAfbeeldingen)) return;
|
||||
$this->lijst->scores = $this->swvAfbeeldingen->getScores();
|
||||
|
||||
break;
|
||||
case 2: if(empty($this->kamerAfbeeldingen)) return;
|
||||
$this->lijst->scores = $this->kamerAfbeeldingen->getScores();
|
||||
$this->lijst->vergelijkingen = $this->swvAfbeeldingen->getScores();
|
||||
break;
|
||||
case 3: if(empty($this->bestuurAfbeeldingen)) return;
|
||||
$this->lijst->scores = $this->bestuurAfbeeldingen->getScores();
|
||||
$this->lijst->vergelijkingen = $this->kamerAfbeeldingen->getScores();
|
||||
break;
|
||||
case 4: if(empty($this->schoolAfbeeldingen) && empty($this->gemiddeldenAfbeeldingen)) return;
|
||||
if(count((array) $this->schoolAfbeeldingen) > 0) {
|
||||
$this->lijst->scores = $this->schoolAfbeeldingen->getScores();
|
||||
}
|
||||
if(count((array)$this->gemiddeldenAfbeeldingen)> 0){
|
||||
$this->lijst->scores = $this->gemiddeldenAfbeeldingen->getIJkpunten();
|
||||
}
|
||||
$this->lijst->vergelijkingen = $this->kamerAfbeeldingen->getScores();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
$this->lijst->metingen = 0;
|
||||
$this->lijst->aantalorgs = 0;
|
||||
$this->lijst->metingenV = 0;
|
||||
$this->lijst->aantalorgsV = 0;
|
||||
|
||||
|
||||
switch($this->soort){
|
||||
case 1:
|
||||
if(empty($this->swvScores)) return;
|
||||
$metingen = $this->swvScores->getMetingen();
|
||||
break;
|
||||
case 2: if(empty($this->kamerScores)) return;
|
||||
$metingen = $this->kamerScores->getMetingen();
|
||||
$metingenV = $this->swvScores->getMetingen();
|
||||
break;
|
||||
case 3: if(empty($this->bestuurScores)) return;
|
||||
$metingen = $this->bestuurScores->getMetingen();
|
||||
$metingenV = $this->kamerScores->getMetingen();
|
||||
break;
|
||||
case 4: if(empty($this->schoolScores) ||empty($this->gemiddeldeScores) ) return;
|
||||
if(count((array) $this->schoolScores) > 0) {
|
||||
$somscore = $this->schoolAfbeeldingen->getSomscore();
|
||||
if($somscore > 0) $this->lijst->metingen = 1;
|
||||
$this->lijst->aantalorgs = 1;
|
||||
}
|
||||
if(count((array)$this->gemiddeldeScores)> 0){
|
||||
$this->lijst->metingen = $this->gemiddeldeScores->getAantalLeerkrachten();
|
||||
$this->lijst->aantalorgs = 1;
|
||||
|
||||
}
|
||||
$metingenV = $this->kamerScores->getMetingen();
|
||||
break;
|
||||
}
|
||||
|
||||
if(isset($metingen)) {
|
||||
$this->lijst->metingen = $metingen->aantal;
|
||||
$this->lijst->aantalorgs = $metingen->aantalorgs;
|
||||
}
|
||||
if(isset($metingenV)) {
|
||||
$this->lijst->metingenV = $metingenV->aantal;
|
||||
$this->lijst->aantalorgsV = $metingenV->aantalorgs;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private function setGemiddeldeScores(){
|
||||
if(count((array)$this->gemiddeldenAfbeeldingen) == 0) return;
|
||||
foreach($this->lijst->scores as $index => $this->score){
|
||||
$this->score->gem = 0;
|
||||
if(isset($this->score->score) && $this->score->score > 0) {
|
||||
$this->score->gem = $this->score->score;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setAdviezen(){
|
||||
if(count((array)$this->schoolAfbeeldingen) == 0) return;
|
||||
if($this->soort != 4) return;
|
||||
$this->lijst->adviezen = $this->schoolAfbeeldingen->getAdviezen();
|
||||
}
|
||||
|
||||
private function setGemiddeldenAdviezen(){
|
||||
if(count((array)$this->gemiddeldenAfbeeldingen) == 0) return;
|
||||
if($this->soort != 4) return;
|
||||
$this->lijst->adviezen = $this->gemiddeldenAfbeeldingen->getAdviezen();
|
||||
}
|
||||
|
||||
|
||||
private function setVNaam(){
|
||||
switch($this->soort){
|
||||
case 1: $this->lijst->vNaam = null;
|
||||
break;
|
||||
case 2: $this->lijst->vNaam = $this->swvScores->getOrgnaam();
|
||||
break;
|
||||
case 3:
|
||||
case 4: $this->lijst->vNaam = $this->kamerScores->getOrgnaam();
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private function loopVergelijkingScores(){
|
||||
if(!isset($this->lijst->vergelijkingen) || !$this->lijst->vergelijkingen) return;
|
||||
|
||||
foreach($this->lijst->vergelijkingen AS $index => $vergelijking){
|
||||
$this->setVergelijkingScores($index);
|
||||
}
|
||||
}
|
||||
|
||||
private function setVergelijkingScores($i){
|
||||
if($this->lijst->scores && $this->lijst->scores[$i]) {
|
||||
$this->lijst->scores[$i]->gemV = $this->lijst->vergelijkingen[$i]->gem;
|
||||
$this->lijst->scores[$i]->kleurV = $this->lijst->vergelijkingen[$i]->kleur;
|
||||
$this->lijst->scores[$i]->disabledV = $this->lijst->vergelijkingen[$i]->disabled;
|
||||
$this->lijst->scores[$i]->disablenvtV = $this->lijst->vergelijkingen[$i]->disablenvt;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// private function setSchoolMetingen(){
|
||||
//
|
||||
// if($this->lijst->vorm != 1) return;
|
||||
// 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->aantalorgs = 0;
|
||||
//
|
||||
// else {
|
||||
// $this->lijst->aantalorgs = $this->lijst->scores[0]->aantalscholen;
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// }
|
||||
|
||||
// private function setIndividueleMetingen(){
|
||||
// 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 = $gevuld->aantal;}
|
||||
// };
|
||||
//
|
||||
// if ($this->soort == 3) {
|
||||
// $gevuld = $this->CI->Scores_model->fCountGevuldeBestuurVersies($this->lijst->orgversieid, $this->orgid);
|
||||
// if($gevuld){
|
||||
// $this->lijst->metingen = $gevuld->aantal;
|
||||
// $this->lijst->aantalorgs = $gevuld->aantalorgs;}
|
||||
// };
|
||||
//
|
||||
// if ($this->soort == 2) {
|
||||
//
|
||||
// $this->onderorgs = $this->CI->Organisaties_model->getscholenonderkamer($this->orgid);
|
||||
// $this->setGevuldeVersies12();
|
||||
// $metingen = $this->CI->Scores_model->fCountGevuldeKamerEnSWVVersies($this->lijst->orgversieid, $this->orgstring);
|
||||
// if($metingen){
|
||||
// $this->lijst->metingen = $metingen->aantal;
|
||||
// $this->lijst->aantalorgs = $metingen->aantalorgs;
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// if ($this->soort == 1) {
|
||||
// $this->onderorgs = $this->CI->Organisaties_model->getscholenonderswv($this->orgid);
|
||||
// $this->setGevuldeVersies12();
|
||||
// $metingen = $this->CI->Scores_model->fCountGevuldeKamerEnSwvVersies($this->lijst->orgversieid, $this->orgstring);
|
||||
// if($metingen){
|
||||
// $this->lijst->metingen = $metingen->aantal;
|
||||
// $this->lijst->aantalorgs = $metingen->aantalorgs;
|
||||
// }
|
||||
// };
|
||||
// }
|
||||
|
||||
// private function setGevuldeVersies12(){
|
||||
// $orgids = [];
|
||||
// if (count($this->onderorgs) > 0) {
|
||||
// foreach ($this->onderorgs as $index => $this->org) {
|
||||
// $orgids[] = $this->org->id;
|
||||
// }
|
||||
// $this->orgstring = implode(',', $orgids);
|
||||
// } else $this->orgstring = false;
|
||||
//
|
||||
//
|
||||
// }
|
||||
|
||||
// private function setMetingenVergelijking(){
|
||||
// if(!isset($this->lijst->vergelijkingen) || !($this->lijst->vergelijkingen)) return;
|
||||
// if($this->lijst->vorm != 1) return;
|
||||
// foreach($this->lijst->vergelijkingen as $index => $this->lijst->vergelijking) {
|
||||
// $this->lijst->metingenV= 0;
|
||||
// if(! isset($this->lijst->vergelijking->aantalscholen)){continue;}
|
||||
// $this->lijst->metingenV = $this->lijst->vergelijking->aantalscholen;
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
// private function setMetingenVergelijkingIndividueel(){
|
||||
// if(! isset($this->lijst->vergelijkingen )|| ! ($this->lijst->vergelijkingen)) return;
|
||||
// if($this->lijst->vorm != 2) return;
|
||||
// $this->lijst->metingenV = new stdClass();
|
||||
// $this->lijst->metingenV = 0;
|
||||
// foreach($this->lijst->vergelijkingen as $index => $this->lijst->vergelijking) {
|
||||
// if(! isset($this->lijst->vergelijking->aantallijsten)){continue;}
|
||||
// $this->lijst->metingenV = $this->lijst->vergelijking->aantallijsten;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
|
||||
private function setResultaten(){
|
||||
switch($this->soort) {
|
||||
case 1: if(count((array)$this->swvAfbeeldingen)==0 ) return;
|
||||
$this->lijst->resultaten = $this->swvAfbeeldingen->getResultaten();
|
||||
break;
|
||||
case 2: if(count((array)$this->kamerAfbeeldingen) ==0) return;
|
||||
$this->lijst->resultaten = $this->kamerAfbeeldingen->getResultaten();
|
||||
break;
|
||||
case 3: if(count((array)$this->bestuurAfbeeldingen)== 0) return;
|
||||
$this->lijst->resultaten = $this->bestuurAfbeeldingen->getResultaten();
|
||||
break;
|
||||
case 4: if (count((array)$this->schoolAfbeeldingen)==0 && count((array)$this->gemiddeldenAfbeeldingen)==0)return;
|
||||
if(count((array)$this->schoolAfbeeldingen) > 0) {
|
||||
$this->lijst->resultaten = $this->schoolAfbeeldingen->getResultaten();
|
||||
}
|
||||
if(count((array)$this->gemiddeldenAfbeeldingen) > 0){
|
||||
$this->lijst->resultaten = $this->gemiddeldenAfbeeldingen->getResultaten();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return;
|
||||
$this->lijst->naamV = $this->vergelijkingen['orgnaam'];
|
||||
$metingenV = $this->vergelijkingen['metingen'];
|
||||
$this->lijst->metingenV = $metingenV ? $metingenV->aantal : 0;
|
||||
$this->lijst->aantalorgsV = $metingenV ? $metingenV->aantalorgs : 0;
|
||||
}
|
||||
|
||||
private function setRapportInfo(){
|
||||
$scholen = ' scholen';
|
||||
@@ -523,6 +251,8 @@ class Lijsten
|
||||
foreach ($this->lijsten as $index => $this->lijst) {
|
||||
if (!$this->lijst->orgversie) continue;
|
||||
$this->setNieuwsteVersie();
|
||||
$this->setEigenAmbitie();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -533,19 +263,9 @@ class Lijsten
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function setKleuren(){
|
||||
if(count((array)$this->gemiddeldenAfbeeldingen)> 0){
|
||||
$this->kleuren = $this->gemiddeldenAfbeeldingen->getKleuren();
|
||||
}
|
||||
else if(count((array)$this->kamerAfbeeldingen)> 0){
|
||||
$this->kleuren = $this->kamerAfbeeldingen->getKleuren();
|
||||
}
|
||||
else if(count((array)$this->swvAfbeeldingen)> 0){
|
||||
$this->kleuren = $this->swvAfbeeldingen->getKleuren();
|
||||
}
|
||||
|
||||
private function setEigenAmbitie(){
|
||||
if($this->eigenambitie== 'T') return;
|
||||
if($this->lijst->ambities->ambitievan != 'standaard') $this->eigenambitie = 'T';
|
||||
}
|
||||
|
||||
private function setSopInfo(){
|
||||
@@ -554,8 +274,10 @@ class Lijsten
|
||||
'lijsten' => $this->lijsten,
|
||||
'aantal' => $this->aantal,
|
||||
'nieuwsteversie' => $this->nieuwsteversie,
|
||||
'kleuren' => $this->kleuren,
|
||||
'versienaam' => $this->versienaam
|
||||
'kleuren' => $this->results['kleuren'],
|
||||
'versienaam' => $this->versienaam,
|
||||
'eigenambitie' => $this->eigenambitie
|
||||
|
||||
];
|
||||
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ class Swvscores
|
||||
private $orgids;
|
||||
private $scores;
|
||||
private $metingen;
|
||||
private $ambities;
|
||||
|
||||
|
||||
public function __construct( $orgversieid, $orgid, $vorm)
|
||||
@@ -17,64 +18,70 @@ class Swvscores
|
||||
$this->orgversieid = $orgversieid;
|
||||
$this->orgid = $orgid;
|
||||
$this->vorm = $vorm;
|
||||
$this->handle();
|
||||
// $this->handle();
|
||||
}
|
||||
|
||||
public function getScores(){
|
||||
return $this->scores;
|
||||
}
|
||||
|
||||
public function getMetingen(){
|
||||
return $this->metingen;
|
||||
}
|
||||
|
||||
public function getOrgnaam(){
|
||||
return $this->swvnaam;
|
||||
}
|
||||
|
||||
private function handle(){
|
||||
|
||||
$this->setOrg();
|
||||
$this->setSWVid();
|
||||
$this->setSWVnaam();
|
||||
$this->setScholenString();
|
||||
$this->setScores();
|
||||
$this->setMetingen();
|
||||
}
|
||||
|
||||
private function setOrg(){
|
||||
$this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
}
|
||||
|
||||
private function setSWVid(){
|
||||
switch($this->organisatie->soort){
|
||||
case 1: $this->swvid = $this->orgid;
|
||||
break;
|
||||
case 2: $this->swvid = $this->organisatie->valtonder_id;
|
||||
break;
|
||||
case 3: $kamerid = $this->organisatie->valtonder_id;
|
||||
$this->swvid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$kamerid], 'valtonder_id');
|
||||
break;
|
||||
case 4: $bestuurid = $this->organisatie->valtonder_id;
|
||||
$kamerid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$bestuurid], 'valtonder_id');
|
||||
$this->swvid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$kamerid], 'valtonder_id');
|
||||
}
|
||||
}
|
||||
|
||||
private function setSWVnaam(){
|
||||
$this->swvnaam = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$this->swvid],'naamkort');
|
||||
}
|
||||
|
||||
private function setScholenString(){
|
||||
$this->orgids = implode(',' , $this->CI->Organisaties_model->getscholenondertarget($this->swvid));
|
||||
}
|
||||
|
||||
private function setScores(){
|
||||
$this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgids);
|
||||
}
|
||||
|
||||
private function setMetingen(){
|
||||
$this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgids);
|
||||
}
|
||||
// public function getScores(){
|
||||
// return $this->scores;
|
||||
// }
|
||||
//
|
||||
// public function getMetingen(){
|
||||
// return $this->metingen;
|
||||
// }
|
||||
//
|
||||
// public function getOrgnaam(){
|
||||
// return $this->swvnaam;
|
||||
// }
|
||||
//
|
||||
// private function handle(){
|
||||
//
|
||||
// $this->setOrg();
|
||||
// $this->setSWVid();
|
||||
// $this->setSWVnaam();
|
||||
// $this->setScholenString();
|
||||
// $this->setScores();
|
||||
// $this->setMetingen();
|
||||
// $this->setAmbities();
|
||||
// }
|
||||
//
|
||||
// private function setOrg(){
|
||||
// $this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
// }
|
||||
//
|
||||
// private function setSWVid(){
|
||||
// switch($this->organisatie->soort){
|
||||
// case 1: $this->swvid = $this->orgid;
|
||||
// break;
|
||||
// case 2: $this->swvid = $this->organisatie->valtonder_id;
|
||||
// break;
|
||||
// case 3: $kamerid = $this->organisatie->valtonder_id;
|
||||
// $this->swvid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$kamerid], 'valtonder_id');
|
||||
// break;
|
||||
// case 4: $bestuurid = $this->organisatie->valtonder_id;
|
||||
// $kamerid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$bestuurid], 'valtonder_id');
|
||||
// $this->swvid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$kamerid], 'valtonder_id');
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private function setSWVnaam(){
|
||||
// $this->swvnaam = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$this->swvid],'naamkort');
|
||||
// }
|
||||
//
|
||||
// private function setScholenString(){
|
||||
// $this->orgids = implode(',' , $this->CI->Organisaties_model->getscholenondertarget($this->swvid));
|
||||
// }
|
||||
//
|
||||
// private function setScores(){
|
||||
// $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgids);
|
||||
// }
|
||||
//
|
||||
// private function setMetingen(){
|
||||
// $this->metingen = $this->CI->Scores_model->fCountGevuldeVersiesNieuw($this->orgversieid, $this->orgids);
|
||||
// }
|
||||
//
|
||||
// private function setAmbities(){
|
||||
// $this->ambities = $this->CI->Ambities_model->mh_get_ambitie_orgversie($this->orgversieid, $this->swvid, $this->swvid);
|
||||
//
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -4,20 +4,7 @@ class Userlijsten
|
||||
{
|
||||
private $CI;
|
||||
private $modulenr;
|
||||
private $clusterid;
|
||||
private $individueleScores;
|
||||
private $kamerScores;
|
||||
private $gemiddeldeScores;
|
||||
private $individueleAfbeeldingen;
|
||||
private $kamerAfbeeldingen;
|
||||
private $gemiddeldenAfbeeldingen;
|
||||
private $orgversieid;
|
||||
private $scores;
|
||||
private $vNaam;
|
||||
private $zprocent;
|
||||
private $vergelijking;
|
||||
private $vergelijkingen;
|
||||
private $ambitiearray = [];
|
||||
private $lijst;
|
||||
private $lijsten = [];
|
||||
private $nieuwste = 0;
|
||||
@@ -41,7 +28,6 @@ class Userlijsten
|
||||
|
||||
private function handle(){
|
||||
$this->setModulenummer();
|
||||
$this->setClusterid();
|
||||
$this->loopOrgVersies();
|
||||
$this->loopLijsten();
|
||||
}
|
||||
@@ -50,27 +36,19 @@ class Userlijsten
|
||||
$this->modulenr = $this->CI->session->userdata('module');
|
||||
}
|
||||
|
||||
private function setClusterid(){
|
||||
$this->clusterid = $this->CI->Modules_model->get_fieldvalue(['sysnr' =>$this->modulenr], 'cluster_id');
|
||||
}
|
||||
|
||||
|
||||
private function loopOrgVersies(){
|
||||
foreach($this->orgversies as $index => $this->orgversieid){
|
||||
$this->lijst = new stdClass();
|
||||
$this->setOrgversie();
|
||||
$this->setVersieNaam();
|
||||
$this->setLabels();
|
||||
$this->setOrganisatie();
|
||||
$this->setIndividueleScores();
|
||||
$this->setVergelijkingen();
|
||||
$this->setVergelijkingScores();
|
||||
$this->setAmbities();
|
||||
$this->setZprocent();
|
||||
$this->setIndividueleAfbeeldingen();
|
||||
$this->setKamerAfbeeldingen();
|
||||
$this->setLijstScores();
|
||||
$this->setGemiddeldenAfbeeldingen();
|
||||
$this->loopVergelijkingScores();
|
||||
$this->setIndividueleMetingen();
|
||||
$this->setMetingenVergelijkingIndividueel();
|
||||
$this->setVNaam();
|
||||
$this->setResultaten();
|
||||
$this->setLijst();
|
||||
$this->setLijsten();
|
||||
}
|
||||
}
|
||||
@@ -82,108 +60,98 @@ class Userlijsten
|
||||
mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm);
|
||||
}
|
||||
|
||||
private function setVersieNaam(){
|
||||
$this->versienaam = $this->CI->Versies_model->get_fieldvalue(['id' => $this->lijst->orgversie->versie_id], 'naam');
|
||||
|
||||
}
|
||||
|
||||
private function setLabels(){
|
||||
// $this->lijst->labels = $this->CI->Labels_model->getalllabels($this->modulenr);
|
||||
$this->lijst->label = $this->CI->Labels_model->gettabellabel($this->modulenr);
|
||||
$this->lijst->label2 = $this->CI->Labels_model->getresultaatlabel($this->modulenr);
|
||||
|
||||
}
|
||||
|
||||
private function setOrganisatie(){
|
||||
$this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
|
||||
|
||||
}
|
||||
|
||||
private function setIndividueleScores(){
|
||||
$this->individueel = new Individuelescores($this->orgversieid, $this->orguserid, $this->orgid, $this->lijst->orgversie->scoretype);
|
||||
$this->results = $this->individueel->getResults();
|
||||
$this->scores = $this->individueel->getScores();
|
||||
}
|
||||
|
||||
private function setVergelijkingen(){
|
||||
if(!isset($this->scores) || !$this->scores) return;
|
||||
$bestuurid = $this->organisatie->valtonder_id;
|
||||
$orgid = $this->CI->Organisaties_model->get_fieldvalue(['id'=>$bestuurid], 'valtonder_id');
|
||||
$this->vergelijkingen = (new Schoolscores($this->orgversieid, $orgid, 2, 'T'))->getResults() ;
|
||||
}
|
||||
|
||||
private function setVergelijkingScores(){
|
||||
if(!isset($this->scores) || !$this->scores) return;
|
||||
if( (!isset($this->vergelijkingen) ||! $this->vergelijkingen )) return;
|
||||
|
||||
foreach($this->vergelijkingen['scores'] AS $i =>$vergelijking){
|
||||
$this->scores[$i]->gemV = $vergelijking->gem;
|
||||
$this->scores[$i]->kleurV = $vergelijking->kleur;
|
||||
$this->scores[$i]->disabledV = $vergelijking->disabled;
|
||||
$this->scores[$i]->disablenvtV = $vergelijking->disablenvt;
|
||||
}
|
||||
}
|
||||
private function setAmbities(){
|
||||
$ambitie = $this->CI->Ambities_model->getOrgAmbities($this->orgversieid, $this->orgid);
|
||||
if (!in_array($ambitie, $this->ambitiearray, FALSE)) {
|
||||
$this->lijst->ambities = $ambitie;
|
||||
$this->ambitiearray [] = $ambitie;
|
||||
if(!isset($this->scores) || !$this->scores) return;
|
||||
$standaard = new stdClass();
|
||||
$standaard->ambitievan = 'standaard';
|
||||
$standaard->id = 0;
|
||||
$standaard->geldigtm = $this->lijst->orgversie->geldigtm;
|
||||
$standaard->geldigvanaf = $this->lijst->orgversie->geldigvanaf;
|
||||
$standaard->gemscore = 80;
|
||||
$standaard->naam = $this->versienaam;
|
||||
$standaard->orgversie_id = $this->lijst->orgversie->id;
|
||||
$standaard->periodenummer = $this->lijst->orgversie->periodenummer;
|
||||
$standaard->soort = 0;
|
||||
$standaard->xijkpunten = ROUND($this->results['aantalY'] * 0.8);
|
||||
$standaard->zprocent = 60;
|
||||
|
||||
if($this->results && $this->results['ambities'] && $this->results['ambities']->gemscore > 0) $this->lijst->ambities = $this->results['ambities'];
|
||||
else $this->lijst->ambities = $standaard;
|
||||
|
||||
if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return;
|
||||
|
||||
if($this->vergelijkingen['ambities'] && $this->vergelijkingen['ambities']->gemscore > 0 ) $ambitiesV = $this->vergelijkingen['ambities'];
|
||||
else $ambitiesV = $standaard;
|
||||
if($ambitiesV->ambitievan != $this->lijst->ambities->ambitievan) $this->lijst->ambitiesV = $ambitiesV;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private function setLijst(){
|
||||
$this->lijst->naam = $this->results['orgnaam'];
|
||||
$this->lijst->scores = $this->scores;
|
||||
if(isset($this->scores)) {
|
||||
$this->lijst->metingen = 1 ;
|
||||
$this->lijst->aantalorgs = 1 ;
|
||||
$this->lijst->adviezen = $this->results['adviezen'];
|
||||
$this->lijst->resultaten = $this->results['resultaten'];
|
||||
}
|
||||
}
|
||||
|
||||
private function setZprocent(){
|
||||
$this->zprocent = 0;
|
||||
if(isset($this->lijst->ambities)){
|
||||
$this->zprocent = $this->lijst->ambities->zprocent;
|
||||
}
|
||||
}
|
||||
|
||||
private function setIndividueleAfbeeldingen(){
|
||||
$this->individueleScores = new Individuelescores($this->orgversieid, $this->orguserid, $this->orgid);
|
||||
$this->individueleAfbeeldingen = new Afbeeldingen($this->individueleScores, $this->modulenr, $this->orgversieid, $this->clusterid, $this->orgid, $this->zprocent);
|
||||
}
|
||||
|
||||
|
||||
private function setKamerAfbeeldingen(){
|
||||
$vorm = 2;
|
||||
$this->kamerScores = new Kamerscores($this->orgversieid, $this->orgid, $vorm);
|
||||
if($this->kamerScores){
|
||||
$this->kamerAfbeeldingen = new Afbeeldingen($this->kamerScores, $this->modulenr, $this->orgversieid,
|
||||
$this->clusterid, $this->orgid, $this->zprocent);
|
||||
}
|
||||
}
|
||||
|
||||
private function setLijstScores(){
|
||||
if (!$this->kamerAfbeeldingen || !$this->individueleAfbeeldingen) return; {
|
||||
$this->lijst->scores = $this->individueleAfbeeldingen->getScores();
|
||||
|
||||
$this->lijst->vergelijkingen = $this->kamerAfbeeldingen->getScores();
|
||||
}
|
||||
}
|
||||
|
||||
private function setGemiddeldenAfbeeldingen(){
|
||||
$this->gemiddeldeScores= new Gemiddeldescores($this->orgversieid, $this->orgid);
|
||||
if($this->gemiddeldeScores){
|
||||
$this->gemiddeldenAfbeeldingen = new Gemiddeldenafbeeldingen($this->gemiddeldeScores, $this->modulenr, $this->orgversieid, $this->clusterid,$this->orgid);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function loopVergelijkingScores(){
|
||||
if( (!isset($this->lijst->vergelijkingen) ||$this->lijst->vergelijkingen== false )) return;
|
||||
for($i = 0; $i < count($this->lijst->vergelijkingen); $i++){
|
||||
$this->setVergelijkingScores($i);
|
||||
}
|
||||
}
|
||||
|
||||
private function setVergelijkingScores($i){
|
||||
if($this->lijst->vergelijkingen[$i]) {
|
||||
$this->lijst->scores[$i]->gemV = $this->lijst->vergelijkingen[$i]->gem;
|
||||
$this->lijst->scores[$i]->kleurV = $this->lijst->vergelijkingen[$i]->kleur;
|
||||
$this->lijst->scores[$i]->disabledV = $this->lijst->vergelijkingen[$i]->disabled;
|
||||
$this->lijst->scores[$i]->disablenvtV = $this->lijst->vergelijkingen[$i]->disablenvt;
|
||||
else{
|
||||
$this->lijst->metingen = 0 ;
|
||||
$this->lijst->aantalorgs = 1 ;
|
||||
$this->lijst->adviezen = false;
|
||||
$this->lijst->resultaten = false;
|
||||
|
||||
}
|
||||
$this->lijst->aantalY = $this->results['aantalY'];
|
||||
if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return;
|
||||
$this->lijst->naamV = $this->vergelijkingen['orgnaam'];
|
||||
$metingenV = $this->vergelijkingen['metingen'];
|
||||
$this->lijst->metingenV = $metingenV ? $metingenV->aantal : 0;
|
||||
$this->lijst->aantalorgsV = $metingenV ? $metingenV->aantalorgs : 0;
|
||||
}
|
||||
|
||||
|
||||
private function setIndividueleMetingen(){
|
||||
if(!isset($this->lijst->scores)||$this->lijst->scores == false ) return;
|
||||
$this->lijst->metingen = 1;
|
||||
$this->lijst->aantalorgs = 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function setMetingenVergelijkingIndividueel(){
|
||||
if(! isset($this->lijst->vergelijkingen)||$this->lijst->vergelijkingen == false ) return;
|
||||
foreach($this->lijst->vergelijkingen as $index => $this->lijst->vergelijking) {
|
||||
$metingenV = $this->kamerScores->getMetingen();
|
||||
if($metingenV) {
|
||||
$this->lijst->metingenV = $metingenV->aantal;
|
||||
$this->lijst->aantalorgsV = $metingenV->aantalorgs;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function setVNaam(){
|
||||
$this->lijst->vNaam = $this->kamerScores->getOrgnaam();
|
||||
}
|
||||
|
||||
private function setResultaten(){
|
||||
if(!$this->gemiddeldenAfbeeldingen) return;
|
||||
$this->lijst->resultaten = $this->gemiddeldenAfbeeldingen->getResultaten();
|
||||
}
|
||||
|
||||
private function setLijsten(){
|
||||
$this->lijsten [] = $this->lijst;
|
||||
}
|
||||
@@ -203,4 +171,6 @@ class Userlijsten
|
||||
$this->nieuwsteversie = $this->lijst->orgversie->id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -102,4 +102,66 @@ class Ambities_model extends MY_Model{
|
||||
};
|
||||
return $ambitie;
|
||||
}
|
||||
|
||||
function mh_get_ambities($moduleid, $ambitieorgs, $toporgs){
|
||||
$this->sql = " SELECT A.id AS ambitieID,
|
||||
A.gem_score AS gemscore,
|
||||
A.x_ijkpunten AS xijkpunten,
|
||||
A.z_procent AS zprocent,
|
||||
OV.id AS orgversie_id,
|
||||
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
|
||||
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
|
||||
OV.periodenummer, V.naam,
|
||||
O.soort AS soort,
|
||||
concat_ws(' ', O.brin, O.naamkort) AS organisatie,
|
||||
O.id AS orgID,
|
||||
CASE WHEN O.soort = 1 THEN
|
||||
'swv'
|
||||
WHEN O.soort = 2 THEN
|
||||
'regio'
|
||||
WHEN O.soort = 3 THEN
|
||||
'bestuur'
|
||||
WHEN O.soort = 4 THEN
|
||||
'school'
|
||||
END AS ambitievan
|
||||
|
||||
FROM tb_orgversies OV
|
||||
JOIN tb_versies V ON OV.versie_id = V.id
|
||||
JOIN tb_ambities A ON A.orgversie_id = OV.id
|
||||
JOIN tb_organisaties O ON A.organisatie_id = O.id
|
||||
WHERE A.organisatie_id IN ({$ambitieorgs})
|
||||
AND OV.organisatie_id IN ({$toporgs})
|
||||
AND V.modulenr = {$moduleid}
|
||||
AND OV.actief = 1
|
||||
ORDER BY soort DESC ";
|
||||
return $this->get_query_result();
|
||||
}
|
||||
|
||||
function mh_get_ambitie_orgversie($orgversieid, $ambitieorgs, $toporgs){
|
||||
$this->sql = " SELECT A.id AS ambitieID,
|
||||
A.gem_score AS gemscore,
|
||||
A.x_ijkpunten AS xijkpunten,
|
||||
A.z_procent AS zprocent,
|
||||
O.naam AS ambitievan
|
||||
|
||||
FROM tb_orgversies OV
|
||||
JOIN tb_versies V ON OV.versie_id = V.id
|
||||
JOIN tb_ijkpunten Y ON V.id = Y.versie_id
|
||||
JOIN tb_ambities A ON A.orgversie_id = OV.id
|
||||
JOIN tb_organisaties O ON A.organisatie_id = O.id
|
||||
WHERE A.organisatie_id IN ({$ambitieorgs})
|
||||
AND OV.organisatie_id IN ({$toporgs})
|
||||
AND OV.id = {$orgversieid}
|
||||
AND Y.disabled = 'F'
|
||||
ORDER BY soort DESC
|
||||
LIMIT 1 ";
|
||||
return $this->get_query_row();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -42,6 +42,18 @@ class Ijkpunten_model extends MY_Model{
|
||||
return $this->get_query_row('aantalY');
|
||||
}
|
||||
|
||||
function telijkpunten_bij_orgs($toporgs, $modulenr){
|
||||
$this->sql=" SELECT COUNT(DISTINCT(Y.id)) AS aantalY
|
||||
FROM tb_ijkpunten Y
|
||||
JOIN tb_orgversies OV ON OV.versie_id = Y.versie_id
|
||||
JOIN tb_versies V ON V.id = OV.versie_id
|
||||
WHERE OV.organisatie_id IN({$toporgs})
|
||||
AND V.modulenr = {$modulenr}
|
||||
AND OV.actief = 1
|
||||
AND Y.disabled = 'F' ";
|
||||
return $this->get_query_row('aantalY');
|
||||
}
|
||||
|
||||
function getijkpunten1($versieid){
|
||||
$this->sql="SELECT Y.id, Y.nummer,Y.omschrijving,Y.toelichting, Y.disabled
|
||||
FROM tb_ijkpunten Y
|
||||
|
||||
@@ -265,6 +265,20 @@ class Orgversies_model extends MY_Model{
|
||||
return $this->get_query_result();
|
||||
}
|
||||
|
||||
function getAmbitieVersie($toporgs, $moduleid){
|
||||
$this->sql = "SELECT
|
||||
OV.id AS orgversie_id,
|
||||
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
|
||||
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
|
||||
OV.periodenummer, V.naam
|
||||
FROM tb_orgversies OV
|
||||
JOIN tb_versies V ON OV.versie_id = V.id
|
||||
WHERE OV.organisatie_id IN ({$toporgs})
|
||||
AND V.modulenr = {$moduleid}
|
||||
AND OV.actief = 1 ";
|
||||
return $this->get_query_row();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -26,7 +26,7 @@ class Scores_model extends MY_Model{
|
||||
return $this->get_query_result();
|
||||
}
|
||||
function calculateindividualscores($orgversieid, $orgid, $userid){
|
||||
$this->sql="SELECT SC.id, filledversion_id, SC.ijkpunt_id, scoretype, score, Y.disabled,
|
||||
$this->sql="SELECT SC.id, filledversion_id, SC.ijkpunt_id, scoretype, score, score AS gem, Y.disabled,
|
||||
SUM(CASE WHEN Y.disabled = 'T' THEN 0
|
||||
WHEN Y.disabled = 'F' THEN
|
||||
CASE
|
||||
|
||||
@@ -16,6 +16,7 @@ class Sopinhouden_model extends MY_Model{
|
||||
'monpas/Filledversions_model',
|
||||
'monpas/Groepen_model',
|
||||
'monpas/Hoofdstukken_model',
|
||||
'monpas/Ijkpunten_model',
|
||||
'monpas/Labels_model',
|
||||
'monpas/Ondersteuningtijden_model',
|
||||
'monpas/Orgversies_model',
|
||||
@@ -555,8 +556,40 @@ class Sopinhouden_model extends MY_Model{
|
||||
}
|
||||
if ($targetversieid) {
|
||||
$scores = $this->Scores_model->getgemscores($targetversieid, $orgid);
|
||||
$ambitie = $this->Ambities_model->getOrgAmbities($targetversieid, $orgid);
|
||||
}
|
||||
$ambitieorgs = '';
|
||||
|
||||
$ambitieorgs = $this->getAmbitieOrgs($this->globorgid, $ambitieorgs);
|
||||
$ambitieorgs = rtrim($ambitieorgs, ',');
|
||||
|
||||
$toporgsarray = explode(',', $ambitieorgs);
|
||||
$toporgs = '';
|
||||
$index = 0;
|
||||
for($i = count($toporgsarray)-1; $i >= 0 ; $i--) {
|
||||
if($index < 2) {
|
||||
$toporgs .= $toporgsarray[$i] . ',';
|
||||
$index++;
|
||||
}
|
||||
}
|
||||
$toporgs = rtrim($toporgs, ',' );
|
||||
|
||||
$ambitie = $this->Ambities_model->mh_get_ambitie_orgversie($targetversieid, $ambitieorgs, $toporgs);
|
||||
if(!isset($ambitie->ambitieID)) {
|
||||
$xijkpunten = $this->Ijkpunten_model->telijkpunten($targetversieid);
|
||||
$orgversie = $this->Orgversies_model->get_record_by_id($targetversieid);
|
||||
$ambitie = new stdClass();
|
||||
$ambitie->ambitievan = 'standaard';
|
||||
$ambitie->AmbitieID = 0;
|
||||
$ambitie->geldigtm = $orgversie->geldigtm;
|
||||
$ambitie->geldigvanaf = $orgversie->geldigvanaf;
|
||||
$ambitie->gemscore = 80;
|
||||
$ambitie->orgversie_id = $targetversieid;
|
||||
$ambitie->periodenummer = $orgversie->periodenummer;
|
||||
$ambitie->soort = 0;
|
||||
$ambitie->xijkpunten = $xijkpunten;
|
||||
$ambitie->zprocent = 60;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (!$targetversieid || !$scores){
|
||||
return array('grafiek1' => '',
|
||||
@@ -579,7 +612,7 @@ class Sopinhouden_model extends MY_Model{
|
||||
// $gem=$score->somscore / $score->num;
|
||||
// };
|
||||
//LS ACTIEF GEMAAKT
|
||||
// $score->kleurcode = $this->kleurcodes->getkleur($score->gem);
|
||||
$score->kleurcode = $this->kleurcodes->getkleur($score->gem);
|
||||
|
||||
if ($score->disabled == 'F' && $score->disablenvt == 'F') {
|
||||
$totgem = $totgem + $score->gem;
|
||||
@@ -673,6 +706,17 @@ class Sopinhouden_model extends MY_Model{
|
||||
'targetversie' => $targetversieid);
|
||||
}
|
||||
|
||||
private function getAmbitieOrgs($orgid, $ambitieorgs){
|
||||
$ambitieorgs .= $orgid . ',';
|
||||
$valtonder = $this->Organisaties_model->get_fieldvalue(['id' => $orgid], 'valtonder_id');
|
||||
if($valtonder != $orgid){
|
||||
return $this->getAmbitieOrgs($valtonder, $ambitieorgs);
|
||||
}
|
||||
|
||||
return $ambitieorgs;
|
||||
|
||||
}
|
||||
|
||||
|
||||
function getlksscores($orgid, $orgversieid,$aantalijkpunten){
|
||||
$lks = $this->Filledversions_model->getlks($orgid, $orgversieid);
|
||||
@@ -785,7 +829,7 @@ class Sopinhouden_model extends MY_Model{
|
||||
}
|
||||
$score->kleur = '#808080';
|
||||
if(isset($score->kleurcode)) $score->kleur = $score->kleurcode;
|
||||
$score->huidig = $score->kleurnummer;
|
||||
$score->huidig = $score->kleur;
|
||||
if($targetversie->scoretype == 7){
|
||||
if($score->gem == $grens3) $score->huidig = 4;
|
||||
if($score->gem < $grens3) $score->huidig = 3;
|
||||
|
||||
@@ -50,5 +50,17 @@ class Autorisatienivos_model extends MY_Model{
|
||||
return $this->get_query_row('nivo');
|
||||
}
|
||||
|
||||
function checkmanage($userid, $orgid){
|
||||
$this->sql=" SELECT nivo
|
||||
FROM tb_autorisatienivos AN
|
||||
JOIN tb_autorisaties A ON A.nivo_id = AN.id
|
||||
JOIN tb_orgusers OU ON OU.id = A.orguser_id
|
||||
WHERE OU.user_id = {$userid}
|
||||
AND OU.organisatie_id = {$orgid}
|
||||
AND AN.nivo IN (1, 4, 16, 64, 256) ";
|
||||
return $this->get_query_row('nivo');
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
}()
|
||||
|
||||
@@ -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"); ?>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
}]
|
||||
});
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
minimaal <?=$ambitie->xijkpunten?>
|
||||
<?=$labels['ijkpunten']?>
|
||||
op <?=$ambitie->zprocent?>% of hoger.
|
||||
<br>
|
||||
<?=$ambitie->ambitievan ?>-ambitie
|
||||
</p>
|
||||
|
||||
<hr/>
|
||||
|
||||
@@ -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>
|
||||
@@ -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
|
||||
});
|
||||
|
||||
}()
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
}()
|
||||
|
||||
@@ -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">
|
||||
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
"source": "https://github.com/bcit-ci/CodeIgniter"
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.0",
|
||||
"php": ">=7.4",
|
||||
"mailgun/mailgun-php": "^3.5",
|
||||
"kriswallsmith/buzz": "^1.2",
|
||||
"nyholm/psr7": "^1.4"
|
||||
|
||||
@@ -895,7 +895,7 @@ tr.selected, td.selected{
|
||||
.integer{
|
||||
text-align: right;
|
||||
padding-right: 3px;
|
||||
max-width: 40px;
|
||||
max-width: 50px;
|
||||
}
|
||||
.datum{
|
||||
width: 80px;
|
||||
|
||||
@@ -108,6 +108,8 @@ ls.initIJkpuntenModel = function(){
|
||||
}
|
||||
|
||||
function fAddLijst(i, l, nieuw){
|
||||
|
||||
console.log(l, "lijst")
|
||||
var dit = this;
|
||||
this.tooninfo = ko.observable(false);
|
||||
if(nieuw === l.orgversie.id) {
|
||||
@@ -115,12 +117,12 @@ ls.initIJkpuntenModel = function(){
|
||||
}
|
||||
this.orgversieid = l.orgversie.id;
|
||||
this.scoretype = l.orgversie.scoretype;
|
||||
this.orgnaam = l.orgnaam;
|
||||
this.orgnaam = l.naam;
|
||||
this.wijik = "schoolversie";
|
||||
if (l.vorm === '2') {
|
||||
dit.wijik = "individuele versie"
|
||||
}
|
||||
this.naamV = l.vNaam;
|
||||
this.naamV = l.naamV;
|
||||
this.metingen = l.metingen;
|
||||
this.metingenV = l.metingenV;
|
||||
this.vantm = l.vantm;
|
||||
@@ -128,40 +130,33 @@ ls.initIJkpuntenModel = function(){
|
||||
this.jaartal = l.jaartal;
|
||||
|
||||
this.label = l.label;
|
||||
this.ambities = ko.observable(false);
|
||||
if(l.ambities) {
|
||||
if (l.ambities.gemscore && l.ambities.xijkpunten && l.ambities.zprocent) {
|
||||
dit.ambities(true);
|
||||
}
|
||||
}
|
||||
this.gemscore = 0;
|
||||
if(l.ambities) {
|
||||
dit.gemscore = l.ambities.gemscore;
|
||||
}
|
||||
this.ijkpunten = 0;
|
||||
if(l.ambities) {
|
||||
dit.ijkpunten = l.ambities.xijkpunten;
|
||||
}
|
||||
this.zprocent = 0;
|
||||
if(l.ambities) {
|
||||
dit.zprocent = l.ambities.zprocent;
|
||||
}
|
||||
this.gemscore = l.ambities.gemscore;
|
||||
this.ijkpunten = l.ambities.xijkpunten;
|
||||
this.zprocent = l.ambities.zprocent;
|
||||
this.ambitiesoort = l.ambities.soort;
|
||||
this.ambitiesoortV = l.ambities.soortV ? l.ambities.soortV : false;
|
||||
this.ambitievan = l.ambities.ambitievan === 'standaard' ? '(standaard ingestelde ambitie)':
|
||||
'(ambitie van: ' + l.ambities.ambitievan + ')';
|
||||
this.gemscoreV = l.ambitiesV && l.ambitiesV.gemscore ? l.ambitiesV.gemscore: false ;
|
||||
this.ijkpuntenV = l.ambitiesV && l.ambitiesV.xijkpunten ? l.ambitiesV.xijkpunten: false;
|
||||
this.zprocentV = l.ambitiesV && l.ambitiesV.zprocent ? l.ambitiesV.zprocent: false;
|
||||
this.ambitievanV = l.ambitiesV && l.ambitiesV.ambitievan ? l.ambitiesV.ambitievan === 'standaard' ?
|
||||
'(standaard ingestelde ambitie)': '(ambitie van: ' + l.ambitiesV.ambitievan: false ;
|
||||
|
||||
this.scores = ko.observableArray([]);
|
||||
this.erzijnscores = ko.observable(true);
|
||||
if(l.scores){
|
||||
var meegeven = 'scores';
|
||||
$.each(l.scores, function (i, s){
|
||||
dit.scores.push(new fAddScore(i,s, meegeven))
|
||||
})
|
||||
}
|
||||
else if(l.vergelijkingen){
|
||||
|
||||
var meegeven = 'vergelijkingen';
|
||||
$.each(l.vergelijkingen, function (x, v){
|
||||
dit.scores.push(new fAddScore(x,v, meegeven))
|
||||
dit.scores.push(new fAddScore(i,s))
|
||||
})
|
||||
}
|
||||
//
|
||||
//
|
||||
// var meegeven = 'vergelijkingen';
|
||||
// $.each(l.vergelijkingen, function (x, v){
|
||||
// dit.scores.push(new fAddScore(x,v, meegeven))
|
||||
// })
|
||||
// }
|
||||
else{
|
||||
this.erzijnscores(false);
|
||||
}
|
||||
@@ -176,55 +171,20 @@ ls.initIJkpuntenModel = function(){
|
||||
|
||||
}
|
||||
|
||||
function fAddScore(i,s, meegeven){
|
||||
function fAddScore(i,s){
|
||||
|
||||
var index = i;
|
||||
var dit = this;
|
||||
// dit.aantalScores = ko.observable(0);
|
||||
// if(index){
|
||||
// dit.aantalScores(index + 1);
|
||||
// }
|
||||
this.nummer = s.nummer;
|
||||
this.omschrijving = s.omschrijving;
|
||||
this.toelichting = s.toelichting;
|
||||
if (meegeven == 'vergelijkingen'){
|
||||
this.gem = '';
|
||||
this.gemV = s.gemV;
|
||||
this.disabled = ko.observable(false);
|
||||
this.disabledV = ko.observable(false);
|
||||
if(s.disablenvtV =='T') dit.gemV ='nvt';
|
||||
if(s.disabledV =='T') dit.gemV ='uitgezet';
|
||||
if(s.disabledV =='T') dit.gem ='uitgezet';
|
||||
if(s.disabledV == 'T') dit.disabledV(true)
|
||||
this.disablenvt = ko.observable(false);
|
||||
this.disablenvtV = ko.observable(false);
|
||||
if(s.disablenvtV == 'T') dit.disablenvtV(true);
|
||||
this.kleur = 'lightgray';
|
||||
this.kleurV = ko.observable ='lightgray';
|
||||
if(s.disabled == 'F' && s.disablenvt == 'F')this.kleurV =s.kleurV;
|
||||
this.disabled = ko.observable(s.disabled === 'T');
|
||||
this.disabledV = ko.observable(s.disabledV === 'T');
|
||||
this.disablenvt = ko.observable(s.disablenvt === 'T');
|
||||
this.disablenvtV = ko.observable(s.disablenvtV === 'T');
|
||||
this.gem = s.disablenvt ==='T'? 'nvt' : s.disabled ==='T' ?'uitgezet': s.gem;
|
||||
this.gemV = s.disablenvt ==='T'? 'nvt' : s.disabledV ==='T' ? 'uitgezet' : s.gemV;
|
||||
this.kleur = s.disabled === 'F' && s.disablenvt === 'F'? s.kleur : 'lightgray';
|
||||
this.kleurV = s.disabledV === 'F' && s.disablenvtV === 'F'? s.kleur : 'lightgray';
|
||||
|
||||
}
|
||||
else {
|
||||
this.gem = s.gem;
|
||||
if(s.disablenvt =='T') dit.gem ='nvt';
|
||||
if(s.disabled =='T') dit.gem ='uitgezet';
|
||||
this.gemV = s.gemV;
|
||||
if(s.disablenvtV =='T') dit.gemV ='nvt';
|
||||
if(s.disabledV =='T') dit.gemV ='uitgezet';
|
||||
this.disabled = ko.observable(false);
|
||||
if(s.disabled == 'T') dit.disabled(true);
|
||||
this.disabledV = ko.observable(false);
|
||||
if(s.disabledV == 'T') dit.disabledV(true)
|
||||
this.disablenvt = ko.observable(false);
|
||||
if(s.disablenvt == 'T') dit.disablenvt(true);
|
||||
this.disablenvtV = ko.observable(false);
|
||||
if(s.disablenvtV == 'T') dit.disablenvtV(true);
|
||||
this.kleur = 'lightgray';
|
||||
if(s.disabled == 'F' && s.disablenvt == 'F')this.kleur = s.kleur;
|
||||
this.kleurV = 'lightgray';
|
||||
if(s.disabledV == 'F' && s.disablenvtV == 'F')this.kleurV =s.kleurV;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function fAddUser(p){
|
||||
@@ -288,6 +248,7 @@ ls.initIJkpuntenModel = function(){
|
||||
medewerkerKiezen : ko.observable(false),
|
||||
ijkgrafiek : ko.observable(''),
|
||||
scoretype : ko.observable(''),
|
||||
eigenambitie : ko.observable(false),
|
||||
|
||||
|
||||
initBindings :function(){
|
||||
@@ -340,7 +301,7 @@ ls.initIJkpuntenModel = function(){
|
||||
if (self.selectedOrg() === undefined) return;
|
||||
$.post('index.php/monpas/rapijkpunten/getvergelijkbareversies/'+ self.selectedOrg().id, function(result) {
|
||||
|
||||
if (result && result.series. length > 0 ) {
|
||||
if (result && result.series.length > 0 ) {
|
||||
|
||||
|
||||
self.series.removeAll();
|
||||
@@ -463,9 +424,12 @@ ls.initIJkpuntenModel = function(){
|
||||
self.lijsten.removeAll();
|
||||
self.ijkpunten.removeAll();
|
||||
self.aantal('');
|
||||
self.eigenambitie(false);
|
||||
var teller = 0;
|
||||
if( Number(result.lijsten[0].resultaten.totgem) > 0 ) {
|
||||
self.eigenambitie(result.eigenambitie === 'T');
|
||||
|
||||
$.each(result.lijsten, function (i, p) {
|
||||
|
||||
if (p.scores || p.vergelijkingen) {
|
||||
self.erzijnlijsten(true);
|
||||
self.nietIngevuld(false)
|
||||
@@ -481,10 +445,8 @@ ls.initIJkpuntenModel = function(){
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
else{
|
||||
self.nietIngevuld(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(self.erzijnlijsten()){
|
||||
var nieuw = '';
|
||||
@@ -497,10 +459,7 @@ ls.initIJkpuntenModel = function(){
|
||||
self.label(l.label)
|
||||
|
||||
}
|
||||
|
||||
|
||||
self.lijsten.push(new fAddLijst(j,l, nieuw))
|
||||
|
||||
});
|
||||
|
||||
if (result.aantal) {
|
||||
@@ -511,6 +470,8 @@ ls.initIJkpuntenModel = function(){
|
||||
self.scorekleuren(new fAddKleur(result.kleuren));
|
||||
|
||||
}
|
||||
console.log(result.ijkpunten, "ijkpunten");
|
||||
console.log(result.lijsten, "lijsten")
|
||||
|
||||
if(result.ijkpunten){
|
||||
$.each(result.ijkpunten, function(y, k){
|
||||
@@ -557,17 +518,13 @@ ls.initIJkpuntenModel = function(){
|
||||
|
||||
},
|
||||
|
||||
|
||||
fGetUserScores: function(data, event){
|
||||
var self = ls.IJkpuntenModel;
|
||||
|
||||
|
||||
if ( self.selectedOrg() === undefined ||
|
||||
self.users() === undefined ||
|
||||
self.usernivo > 1 ) return;
|
||||
|
||||
if (self.selectedUser() === undefined) return;
|
||||
|
||||
if(! event.originalEvent || ! event.originalEvent.isTrusted) return;
|
||||
if(self.selectedUser().userid === '0') self.fHaalLijstenOp();
|
||||
|
||||
@@ -616,9 +573,7 @@ ls.initIJkpuntenModel = function(){
|
||||
self.nieuwsteVersie(nieuw);
|
||||
}
|
||||
$.each(result.lijsten, function (j, l) {
|
||||
|
||||
self.lijsten.push(new fAddLijst(j, l, nieuw))
|
||||
|
||||
});
|
||||
|
||||
if (result.aantal) {
|
||||
@@ -635,55 +590,61 @@ ls.initIJkpuntenModel = function(){
|
||||
},
|
||||
|
||||
fOpenGrafiek: function(){
|
||||
|
||||
var self = ls.IJkpuntenModel;
|
||||
|
||||
var dit = this;
|
||||
var lijsten = self.lijsten();
|
||||
var lijsten2 = self.lijsten();
|
||||
let soorten = [0];
|
||||
var xas = [];
|
||||
var verkorteVersies = [];
|
||||
var extraLijn = [];
|
||||
|
||||
var balkGegevens = [];
|
||||
var lijnGegevens;
|
||||
var lijnGegevens = [];
|
||||
var ambitiewaarde = 0;
|
||||
var xastitel;
|
||||
let titel = 'Versie: ' + self.selectedSerie().naam + ', scoretype: ' + self.selectedSerie().scoreomschrijving
|
||||
|
||||
$.each(lijsten, function(z, a){
|
||||
if(!soorten.includes(Number(a.ambitiesoort))) {
|
||||
soorten.push(Number(a.ambitiesoort))
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
$.each(lijsten, function(i, l) {
|
||||
var labels = [];
|
||||
var scores = [];
|
||||
var ambities = [];
|
||||
|
||||
|
||||
if(l.label){
|
||||
xastitel = l.label;
|
||||
}
|
||||
var zwart = '#0000';
|
||||
if(l.gemscore && Number(l.gemscore) > 0){
|
||||
ambitiewaarde = Number(l.gemscore);
|
||||
if(i === 0 || self.eigenambitie()) {
|
||||
|
||||
if (l.gemscore && Number(l.gemscore) > 0) {
|
||||
ambitiewaarde = Number(l.gemscore);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
lijsten[i].scores = l.scores();
|
||||
$.each(lijsten[i].scores, function (j, g) {
|
||||
var omschrijving = '';
|
||||
if(g.omschrijving){
|
||||
if(g.omschrijving){
|
||||
omschrijving = g.omschrijving;
|
||||
}
|
||||
|
||||
labels.push(g.nummer);
|
||||
scores.push({ y : Number(g.gem) == 0 ? null: Number(g.gem) ,
|
||||
scores.push({ y : Number(g.gem) === 0 ? null: Number(g.gem) ,
|
||||
color : g.kleur,
|
||||
name : g.nummer });
|
||||
|
||||
verkorteVersies.push(l.periodenummer);
|
||||
name : l.periodenummer });
|
||||
|
||||
|
||||
ambities.push(
|
||||
{
|
||||
y: ambitiewaarde,
|
||||
color: '#000000',
|
||||
name: '',
|
||||
}
|
||||
);
|
||||
if(i === 0 || self.eigenambitie()) {
|
||||
ambities.push(ambitiewaarde)
|
||||
}
|
||||
|
||||
});
|
||||
labels.unshift(' ');
|
||||
var legescore ={
|
||||
@@ -694,48 +655,53 @@ ls.initIJkpuntenModel = function(){
|
||||
};
|
||||
|
||||
scores.unshift(legescore);
|
||||
verkorteVersies.unshift(l.periodenummer);
|
||||
|
||||
labels.push(' ');
|
||||
scores.push(legescore);
|
||||
verkorteVersies.push(l.periodenummer);
|
||||
|
||||
balkGegevens[i] =({
|
||||
|
||||
balkGegevens.push({
|
||||
dataLabels: {
|
||||
format: '{point.versie}'
|
||||
format: '{point.name}'
|
||||
},
|
||||
type : 'column',
|
||||
name : verkorteVersies,
|
||||
color : '#ffffff',
|
||||
name : l.vantm,
|
||||
data : scores
|
||||
});
|
||||
|
||||
var extralijn = {
|
||||
y: ambitiewaarde,
|
||||
name: '',
|
||||
};
|
||||
ambities.unshift(extralijn);
|
||||
ambities.push(extralijn);
|
||||
if(i === 0 || self.eigenambitie()) {
|
||||
|
||||
lijnGegevens = ({
|
||||
dataLabels: {
|
||||
format: ''
|
||||
},
|
||||
type: 'spline',
|
||||
name: verkorteVersies,
|
||||
data: ambities
|
||||
});
|
||||
ambities.unshift(ambitiewaarde);
|
||||
ambities.push(ambitiewaarde);
|
||||
|
||||
balkGegevens.push(lijnGegevens);
|
||||
xas = labels;
|
||||
|
||||
lijnGegevens = ({
|
||||
dataLabels: {
|
||||
format: ''
|
||||
},
|
||||
type: 'spline',
|
||||
name: self.eigenambitie() ? 'periode ' + l.periodenummer + ', ' + l.ambitievan : 'standaard ingestelde ambitie',
|
||||
data: ambities
|
||||
});
|
||||
|
||||
balkGegevens.push(lijnGegevens);
|
||||
}
|
||||
if(i === 0) {
|
||||
xas = labels;
|
||||
}
|
||||
});
|
||||
|
||||
console.log(balkGegevens, "balkgegevens")
|
||||
|
||||
|
||||
|
||||
|
||||
self.ijkgrafiek = Highcharts.chart('hc-chart1', {
|
||||
chart: {
|
||||
type: 'column',
|
||||
margin: [10,45,100,5],
|
||||
options3d: {
|
||||
enabled: true,
|
||||
alpha: 20,
|
||||
alpha: 7,
|
||||
beta: 20,
|
||||
viewDistance: 40,
|
||||
depth: 75,
|
||||
@@ -755,30 +721,24 @@ ls.initIJkpuntenModel = function(){
|
||||
},
|
||||
|
||||
title: {
|
||||
text: ''
|
||||
text: titel
|
||||
},
|
||||
credits: {
|
||||
enabled: false,
|
||||
},
|
||||
tooltip:{
|
||||
useHTML: true,
|
||||
outside: true,
|
||||
formatter: function() {
|
||||
var txt = null;
|
||||
if(!this.point.omschrijving){
|
||||
this.point.omschrijving = '';
|
||||
}
|
||||
if(this.point.soort === 'score' || this.point.soort === 'ambitie' ) {
|
||||
txt = '<div class="ijktooltip"><p>' + this.point.vantm + '</p>' + '<br/>' + '<p>' + this.x + '. '
|
||||
+ this.point.omschrijving + ' ' + this.point.soort + ': ' + this.y + '</p></div>';
|
||||
return txt;
|
||||
}
|
||||
}
|
||||
enabled: false,
|
||||
// useHTML: true,
|
||||
// outside: true,
|
||||
// formatter: function() {
|
||||
// return this.y;
|
||||
//
|
||||
// }
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
// type: 'category',
|
||||
categories: xas,
|
||||
skew3d: true,
|
||||
// skew3d: true,
|
||||
title:{
|
||||
text: xastitel
|
||||
}
|
||||
@@ -786,14 +746,26 @@ ls.initIJkpuntenModel = function(){
|
||||
yAxis: {
|
||||
min:0,
|
||||
max: 100,
|
||||
|
||||
skew3d: true,
|
||||
title: {
|
||||
text: 'Scores'
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
enabled: false
|
||||
|
||||
legend:{
|
||||
align: 'left',
|
||||
marginLeft: '10px',
|
||||
verticalAlign: 'bottom',
|
||||
floating: false,
|
||||
width: '50%',
|
||||
itemStyle: {
|
||||
fontSize: '14px',
|
||||
fontWeight: 'normal'
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
plotOptions: {
|
||||
column:{
|
||||
pointPadding: 0.05,
|
||||
@@ -805,7 +777,7 @@ ls.initIJkpuntenModel = function(){
|
||||
enabled: true,
|
||||
inside: true,
|
||||
align: 'center',
|
||||
verticalAlign: 'bottom',
|
||||
verticalAlign: 'top',
|
||||
color: '#404040',
|
||||
style: {
|
||||
textOutline: false
|
||||
@@ -814,7 +786,6 @@ ls.initIJkpuntenModel = function(){
|
||||
|
||||
},
|
||||
spline: {
|
||||
color: '#404040',
|
||||
pointStart: 0,
|
||||
marker: {
|
||||
enabled: false
|
||||
@@ -823,7 +794,6 @@ ls.initIJkpuntenModel = function(){
|
||||
},
|
||||
series:
|
||||
balkGegevens,
|
||||
showInLegend: false
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
@@ -8,61 +8,77 @@ $(function(){
|
||||
ls.initStreefcijfersModel = function(){
|
||||
var timeout;
|
||||
|
||||
function fAddVersieAmbitie(p){
|
||||
this.id = p.id; // ambitie id
|
||||
this.periodenummer = p.periodenummer;
|
||||
this.naam = p.naam ; // versienaam
|
||||
this.orgversieid = p.orgversie_id;
|
||||
this.geldigvanaf = p.geldigvanaf;
|
||||
this.geldigtm = p.geldigtm;
|
||||
this.info = ko.computed(function(){
|
||||
var info = this.periodenummer + '. (versie: ' + this.naam + ') geldig vanaf ' + this.geldigvanaf + ' t/m ' + this.geldigtm;
|
||||
return info;
|
||||
},this);
|
||||
|
||||
this.gemscore = ko.observable(p.gemscore);
|
||||
this.xijkpunten = ko.observable(p.xijkpunten);
|
||||
this.zprocent = ko.observable(p.zprocent);
|
||||
this.wijzigok = p.wijzigok;
|
||||
function fAddVersieAmbitie(i, p){
|
||||
|
||||
let dit = this;
|
||||
this.id = p.ambitieID; // ambitie id
|
||||
this.orgID = p.orgID;
|
||||
this.gemscore = ko.observable(p.gemscore);
|
||||
this.zprocent = ko.observable(p.zprocent);
|
||||
this.xijkpunten = ko.observable(p.xijkpunten);
|
||||
this.ambitievan = ko.observable(p.ambitievan);
|
||||
this.organisatie = p.organisatie ? p.organisatie : '';
|
||||
this.soort = p.soort;
|
||||
console.log(p.soort, "soort")
|
||||
|
||||
|
||||
}
|
||||
|
||||
function fAddSwv (p){
|
||||
function fAddSWV(p){
|
||||
var dit = this;
|
||||
this.id = p.id;
|
||||
this.brin = p.brin
|
||||
this.naam = p.brin + ' - ' + p.naamkort;
|
||||
this.id = p.id;
|
||||
this.soort = p.soort;
|
||||
this.brin = p.brin;
|
||||
this.naam = p.naamkort;
|
||||
this.plaats = p.plaats;
|
||||
this.kamers = ko.observableArray([]);
|
||||
if (p.kamers){
|
||||
this.geopend = ko.observable(false);
|
||||
dit.kamers = ko.observableArray([]);
|
||||
if (p.kamers ){
|
||||
$.each(p.kamers, function(j,k){
|
||||
dit.kamers.push(new fAddNivo2(k));
|
||||
dit.kamers.push(new fAddKamer(k));
|
||||
})
|
||||
}
|
||||
if (p.bgs){
|
||||
$.each(p.bgs, function(j,k){
|
||||
dit.kamers.push(new fAddBG(k));
|
||||
});
|
||||
}
|
||||
}
|
||||
function fAddNivo2 (p){
|
||||
|
||||
function fAddKamer(p){
|
||||
var dit = this;
|
||||
this.id = p.id;
|
||||
this.naam = p.brin + ' - ' + p.naamkort;
|
||||
this.id = p.id;
|
||||
this.soort = p.soort;
|
||||
this.brin = p.brin;
|
||||
this.naam = p.naamkort;
|
||||
this.plaats = p.plaats;
|
||||
this.bgs = ko.observableArray([]);
|
||||
this.geopend = ko.observable(false);
|
||||
this.bgs = ko.observableArray([]);
|
||||
if (p.bgs){
|
||||
$.each(p.bgs, function(j,k){
|
||||
dit.bgs.push(new fAddBG(k));
|
||||
$.each(p.bgs, function(x,z){
|
||||
dit.bgs.push(new fAddBG(z));
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function fAddBG (p){
|
||||
var dit = this;
|
||||
this.id = p.id;
|
||||
this.naam = p.brin + ' - ' + p.naamkort;
|
||||
this.plaats = p.plaats;
|
||||
this.bgs = ko.observableArray([]);
|
||||
function fAddBG(p){
|
||||
var dit = this;
|
||||
this.id = p.id;
|
||||
this.soort = p.soort;
|
||||
this.brin = p.brin;
|
||||
this.naam = p.naamkort;
|
||||
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 fAddSchool(p){
|
||||
var dit = this;
|
||||
this.id = p.id;
|
||||
this.soort = p.soort;
|
||||
this.brin = p.brin;
|
||||
this.naam = p.naamkort;
|
||||
this.plaats = p.plaats;
|
||||
}
|
||||
|
||||
if (ls.StreefcijfersModel !== undefined){
|
||||
@@ -70,11 +86,29 @@ ls.initStreefcijfersModel = function(){
|
||||
}
|
||||
else {
|
||||
ls.StreefcijfersModel = {
|
||||
versieambities : ko.observableArray([]),
|
||||
swv : ko.observableArray([]),
|
||||
selectedOrganisatie : ko.observable(''),
|
||||
zelfniveau : ko.observable(3),
|
||||
bezig : ko.observable(false),
|
||||
ambities : ko.observableArray([]),
|
||||
streefcijfers : ko.observableArray(),
|
||||
orgsoort : ko.observable(1),
|
||||
orgversions : ko.observableArray([]),
|
||||
manage : ko.observable('F'),
|
||||
bezig : ko.observable(false),
|
||||
isSWV : ko.observable(false),
|
||||
insert : ko.observable(false),
|
||||
scoreNieuw : ko.observable(100),
|
||||
ijkNieuw : ko.observable(0),
|
||||
procentNieuw : ko.observable(100),
|
||||
aantalY : ko.observable(0),
|
||||
instrument : ko.observable(''),
|
||||
periodenummer : ko.observable(''),
|
||||
naam : ko.observable(''),
|
||||
geldigvanaf : ko.observable(''),
|
||||
geldigtm : ko.observable(''),
|
||||
ambitievan : ko.observable(''),
|
||||
orgversieid : ko.observable(''),
|
||||
soortNaam : ko.observable(''),
|
||||
eigenAmbitie : ko.observable(false),
|
||||
|
||||
|
||||
|
||||
initBindings :function(){
|
||||
var self = ls.StreefcijfersModel;
|
||||
@@ -86,36 +120,57 @@ ls.initStreefcijfersModel = function(){
|
||||
|
||||
initModel: function(){
|
||||
var self = ls.StreefcijfersModel;
|
||||
self.swv.removeAll();
|
||||
|
||||
$.post("index.php/monpas/streefcijfers/getorganisaties", function(swv){
|
||||
if (swv){
|
||||
self.swv.push(new fAddSwv(swv));
|
||||
self.selectedOrganisatie(self.swv()[0]);
|
||||
}
|
||||
|
||||
$.post("index.php/monpas/streefcijfers/getzelfniveau", function(nivo){
|
||||
self.zelfniveau(nivo);
|
||||
self.fGetAmbities();
|
||||
},'json')
|
||||
},'json');
|
||||
},
|
||||
|
||||
fSetSelected : function(){
|
||||
var self = ls.StreefcijfersModel;
|
||||
if (this.id == self.selectedOrganisatie().id) return;
|
||||
self.selectedOrganisatie(this);
|
||||
if (self.selectedOrganisatie() == undefined) return;
|
||||
self.fGetAmbities();
|
||||
},
|
||||
self.orgsoort('');
|
||||
$.post("index.php/monpas/streefcijfers/checkrecht", function(data){
|
||||
if(data) {self.manage(data.manage);
|
||||
self.orgsoort(data.soort)}
|
||||
|
||||
switch(Number(data.soort)){
|
||||
case 1: self.soortNaam('swv');
|
||||
break;
|
||||
case 2: self.soortNaam('regio');
|
||||
break;
|
||||
case 3: self.soortNaam('bestuur');
|
||||
break;
|
||||
case 4: self.soortNaam('school');
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
self.bezig(false);
|
||||
self.fGetAmbities();
|
||||
|
||||
},'json');
|
||||
},
|
||||
|
||||
|
||||
fGetAmbities : function() {
|
||||
var self = ls.StreefcijfersModel;
|
||||
self.versieambities.removeAll();
|
||||
$.post("index.php/monpas/streefcijfers/getorgversies_ambities/" + self.selectedOrganisatie().id, function(data){
|
||||
if (data){
|
||||
$.each(data, function(i,p){
|
||||
self.versieambities.push(new fAddVersieAmbitie(p));
|
||||
self.ambities.removeAll()
|
||||
self.eigenAmbitie(false);
|
||||
|
||||
$.post("index.php/monpas/streefcijfers/getambities/", function(data){
|
||||
self.ambities.removeAll();
|
||||
if(data=== 'geen results'){
|
||||
apprise("Er is geen actieve orgversie gevonden bij dit instrument.")
|
||||
}
|
||||
else{
|
||||
|
||||
|
||||
|
||||
$.each(data.ambities, function (i, a){
|
||||
if(self.orgsoort() === a.soort){
|
||||
self.eigenAmbitie(true)
|
||||
}
|
||||
self.ambities.push(new fAddVersieAmbitie(i, a))
|
||||
});
|
||||
self.aantalY(data.aantalY);
|
||||
self.instrument(data.module);
|
||||
self.periodenummer(data.ambities[0].periodenummer);
|
||||
self.naam(data.ambities[0].naam);
|
||||
self.geldigvanaf(data.ambities[0].geldigvanaf);
|
||||
self.geldigtm(data.ambities[0].geldigtm);
|
||||
self.orgversieid(data.ambities[0].orgversie_id);
|
||||
}
|
||||
},'json');
|
||||
},
|
||||
@@ -130,31 +185,80 @@ ls.initStreefcijfersModel = function(){
|
||||
}
|
||||
timeout = setTimeout(function(){
|
||||
self.bezig(true);
|
||||
var submitData={ "id" : dit.id,
|
||||
"orgversie_id" : dit.orgversieid,
|
||||
"organisatie_id" : self.selectedOrganisatie().id,
|
||||
"gemscore" : dit.gemscore(),
|
||||
var submitData={ "id" : dit.id,
|
||||
"orgversie_id" : self.orgversieid(),
|
||||
"gemscore" : dit.gemscore(),
|
||||
"xijkpunten" : dit.xijkpunten(),
|
||||
"zprocent" : dit.zprocent()}
|
||||
$.post("index.php/monpas/streefcijfers/updateambitie", submitData, function(newid){
|
||||
if (newid) {self.fGetAmbities();};
|
||||
if (newid) {self.fGetAmbities()}
|
||||
self.bezig(false);
|
||||
},'json');
|
||||
},700);
|
||||
},
|
||||
fNew: function(){
|
||||
var self = ls.StreefcijfersModel;
|
||||
self.insert(true);
|
||||
self.scoreNieuw(100);
|
||||
self.ijkNieuw(self.aantalY());
|
||||
self.procentNieuw(100);
|
||||
},
|
||||
|
||||
fOpslaan: function (){
|
||||
var self = ls.StreefcijfersModel;
|
||||
let dit = this;
|
||||
|
||||
if (timeout){
|
||||
clearTimeout(timeout);
|
||||
timeout = null;
|
||||
}
|
||||
timeout = setTimeout(function(){
|
||||
self.bezig(true);
|
||||
var submitData={
|
||||
"orgversieid" : self.orgversieid(),
|
||||
"gemscore" : self.scoreNieuw(),
|
||||
"xijkpunten" : self.ijkNieuw(),
|
||||
"zprocent" : self.procentNieuw()
|
||||
}
|
||||
|
||||
$.post("index.php/monpas/streefcijfers/saveAmbitie", submitData, function(newid){
|
||||
if (newid) {self.fGetAmbities()}
|
||||
self.bezig(false);
|
||||
self.insert(false);
|
||||
self.scoreNieuw(0);
|
||||
self.ijkNieuw(0);
|
||||
self.procentNieuw(0);
|
||||
|
||||
},'json');
|
||||
},700);
|
||||
|
||||
|
||||
},
|
||||
|
||||
fAnnuleer: function(){
|
||||
var self = ls.StreefcijfersModel;
|
||||
self.insert(false);
|
||||
self.scoreNieuw(0);
|
||||
self.ijkNieuw(0);
|
||||
self.procentNieuw(0);
|
||||
|
||||
},
|
||||
|
||||
|
||||
fDelete:function(){
|
||||
var self = ls.StreefcijfersModel;
|
||||
if (self.bezig()) return;
|
||||
self.bezig(true);
|
||||
var dit = this;
|
||||
|
||||
apprise("Weet u zeker dat u de criteria bij " + dit.naam + " wilt verwijderen?",
|
||||
apprise("Weet u zeker dat u de streefcijfers van " + dit.organisatie + " wilt verwijderen?",
|
||||
{verify: true, textYes:'ja', textNo: 'nee'}, function(ans){
|
||||
if (ans){
|
||||
var sd = {id : dit.id}
|
||||
$.post('index.php/monpas/streefcijfers/verwijder', sd, function(result){
|
||||
self.bezig(false);
|
||||
self.versieambities.remove(dit);
|
||||
self.ambities.removeAll();
|
||||
self.fGetAmbities()
|
||||
},'json');
|
||||
} else {
|
||||
self.bezig(false);
|
||||
|
||||
Reference in New Issue
Block a user