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

tussenstand

Browse Source
This commit is contained in:
Monique
2021-11-16 13:16:15 +01:00
parent 62d7a73c85
commit a9a63c2476
5 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/ijkpunten/Afbeeldingen.php
+42 -13
View File
@@ -20,6 +20,9 @@ class Afbeeldingen {
private $welkelaagste = 0; private $welkelaagste = 0;
private $laagstescore = 101; private $laagstescore = 101;
private $resultaten; private $resultaten;
private $disablenvt = 0;
private $ijkpunten;
private $aantalY = 0;
public function __construct($scoresObject, $modulenr, $orgversieid, $clusterid, $orgid, $zprocent){ public function __construct($scoresObject, $modulenr, $orgversieid, $clusterid, $orgid, $zprocent){
$this->CI = & get_instance(); $this->CI = & get_instance();
@@ -59,6 +62,8 @@ class Afbeeldingen {
} }
private function handle(){ private function handle(){
$this->setIJkpunten();
$this->telIJkpunten();
$this->setScores(); $this->setScores();
$this->setSWVid(); $this->setSWVid();
$this->setOrgversie(); $this->setOrgversie();
@@ -70,6 +75,20 @@ class Afbeeldingen {
$this->loopScores2(); $this->loopScores2();
} }
private function setIJkpunten(){
$this->ijkpunten = $this->CI->Orgversies_model->getijkpunten($this->orgversieid);
}
private function telIJkpunten(){
if($this->ijkpunten){
foreach($this->ijkpunten as $ijkpunt){
if($ijkpunt->disabled == 'F'){
$this->aantalY++;
}
}
}
}
private function setScores(){ private function setScores(){
$this->scores = $this->scoresobject->getScores(); $this->scores = $this->scoresobject->getScores();
} }
@@ -115,20 +134,26 @@ class Afbeeldingen {
private function loopScores1(){ private function loopScores1(){
if(!$this->scores) return; if(!$this->scores) return;
foreach ($this->scores as $index => $this->score) { foreach ($this->scores as $index => $this->score) {
$this->berekenGemiddelden(); if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
$this->setScoreSom(); // $this->berekenGemiddelden();
$this->setAantalScores($index); $this->setScoreSom();
$this->setAantalScores($index);
}
if($this->score->disabled == 'F' && $this->score->disablenvt == 'T'){
$this->disablenvt++;
}
} }
} }
private function berekenGemiddelden(){ // private function berekenGemiddelden(){
if(!$this->scores) return; // if(!$this->scores) return;
$this->score->gem = 0; // $this->score->gem = 0;
if($this->score->num > 0 ){ // if($this->score->num > 0 ){
// $this->score->gem = round((($this->score->somscore/ $this->score->num)* 10)/10); //// $this->score->gem = round((($this->score->somscore/ $this->score->num)* 10)/10);
$this->score->gem = $this->score->somscore/ $this->score->num; // $this->score->gem = $this->score->somscore/ $this->score->num;
} // }
} // }
private function setScoreSom(){ private function setScoreSom(){
@@ -137,13 +162,17 @@ class Afbeeldingen {
} }
private function setAantalScores($index){ private function setAantalScores($index){
$this->aantalscores = $index + 1; $this->aantalscores++;
} }
private function setGemiddeldeScore(){ private function setGemiddeldeScore(){
if(!$this->scores || $this->aantalscores == 0) return; if(!$this->scores || $this->aantalscores == 0) return;
$this->gemiddelde = new stdClass(); $this->gemiddelde = new stdClass();
$this->gemiddelde->gem = $this->somscore / $this->aantalscores; $this->gemiddelde->gem = 0;
$deler = $this->aantalY - $this->disablenvt;
if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
$this->gemiddelde->nummer = 'gem'; $this->gemiddelde->nummer = 'gem';
$this->score = $this->gemiddelde; $this->score = $this->gemiddelde;
} }
application/libraries/monpas/ijkpunten/Bestuurscores.php
+8 -1
View File
@@ -5,6 +5,7 @@ class Bestuurscores
private $CI; private $CI;
private $organisatie; private $organisatie;
private $scores; private $scores;
private $orgstring;
public function __construct( $orgversieid, $orgid, $vorm) public function __construct( $orgversieid, $orgid, $vorm)
@@ -31,9 +32,15 @@ class Bestuurscores
$this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid); $this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->orgid);
} }
private function setOrglist(){
$orglist = $this->CI->Organisaties_model->getlistrecursief($this->orgid);
if($orglist) {
$this->orgstring = implode(',', $orglist);
}
}
private function setScores(){ private function setScores(){
$this->scores = $this->CI->Scores_model->calculateBG($this->orgversieid, $this->orgid); $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgstring);
} }
} }
application/libraries/monpas/ijkpunten/Kamerscores.php
+1 -1
View File
@@ -63,7 +63,7 @@ class Kamerscores
private function setScores(){ private function setScores(){
if(!$this->orgids) return; if(!$this->orgids) return;
$this->scores = $this->CI->Scores_model->calculateOverScholen($this->orgversieid, $this->orgids); $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgids);
} }
application/libraries/monpas/ijkpunten/Lijsten.php
+4
View File
@@ -196,6 +196,10 @@ class Lijsten
} }
} }
private function setSchoolScores(){ private function setSchoolScores(){
if ($this->soort != 4 || $this->lijst->vorm != 1) return; if ($this->soort != 4 || $this->lijst->vorm != 1) return;
$this->schoolScores = new Schoolscores($this->lijst->orgversieid, $this->orgid); $this->schoolScores = new Schoolscores($this->lijst->orgversieid, $this->orgid);
application/libraries/monpas/ijkpunten/Swvscores.php
+1 -1
View File
@@ -64,7 +64,7 @@ class Swvscores
} }
private function setScores(){ private function setScores(){
$this->scores = $this->CI->Scores_model->calculateOverScholen($this->orgversieid, $this->orgids); $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgids);
} }
} }