diff --git a/application/libraries/monpas/Schoolscores.php b/application/libraries/monpas/Schoolscores.php index febe48d..7a66686 100644 --- a/application/libraries/monpas/Schoolscores.php +++ b/application/libraries/monpas/Schoolscores.php @@ -54,8 +54,7 @@ class Schoolscores } private function setScores(){ - $orglist [] = $this->orgid; - $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $orglist); + $this->scores = $this->CI->Scores_model->getgemscores($this->orgversieid, $this->orgid); } diff --git a/application/libraries/monpas/ijkpunten/Individuelescores.php b/application/libraries/monpas/ijkpunten/Individuelescores.php index 6826d10..356571e 100644 --- a/application/libraries/monpas/ijkpunten/Individuelescores.php +++ b/application/libraries/monpas/ijkpunten/Individuelescores.php @@ -24,7 +24,7 @@ class Individuelescores private function handle(){ $this->setUserid(); $this->setScores(); - $this->telScores(); +// $this->telScores(); } private function setUserid(){ @@ -34,11 +34,6 @@ class Individuelescores private function setScores(){ $this->scores = $this->CI->Scores_model->calculateindividualscores($this->orgversieid, $this->orgid, $this->userid); } - private function telScores(){ - foreach($this->scores as $index => $this->score){ - - } - } } \ No newline at end of file diff --git a/application/libraries/monpas/ijkpunten/Lijsten.php b/application/libraries/monpas/ijkpunten/Lijsten.php index c279da7..7b5a35e 100644 --- a/application/libraries/monpas/ijkpunten/Lijsten.php +++ b/application/libraries/monpas/ijkpunten/Lijsten.php @@ -325,6 +325,7 @@ class Lijsten } } + private function setSchoolMetingen(){ if($this->lijst->vorm != 1) return; diff --git a/application/models/monpas/Scores_model.php b/application/models/monpas/Scores_model.php index 555654e..8ca1c0f 100644 --- a/application/models/monpas/Scores_model.php +++ b/application/models/monpas/Scores_model.php @@ -516,6 +516,19 @@ class Scores_model extends MY_Model{ return $this->get_query_row(); } + function fCountGevuldeVersiesNieuw($orgversieid, $orgids){ + $this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal, COUNT(DISTINCT(O.id)) AS aantalorgs + FROM tb_scores S + JOIN tb_filledversions FV ON FV.id = S.filledversion_id + JOIN tb_organisaties O ON FV.organisatie_id = O.id + WHERE FV.orgversie_id = {$orgversieid} + AND FV.organisatie_id IN ({$orgids}) + AND FV.meetellen = 1 + AND S.score > 0 + HAVING COUNT(S.id) >= 5"; + return $this->get_query_row(); + } + function fGetGevuldeBestuurVersie($orgversieid, $bgid){