From df2b3e2d0c2b9fbe8d0900a56988d93b56899a27 Mon Sep 17 00:00:00 2001 From: Rogier Neeleman Date: Tue, 5 Apr 2016 07:32:25 +0200 Subject: [PATCH] data normalisation --- application/controllers/Uitslag.php | 5 +++-- application/models/Uitslag_model.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/controllers/Uitslag.php b/application/controllers/Uitslag.php index 5208079..0fb0ea9 100644 --- a/application/controllers/Uitslag.php +++ b/application/controllers/Uitslag.php @@ -32,8 +32,9 @@ class Uitslag extends CI_Controller $scores = $this->Uitslag_model->get_subgroep_punten($subgroep['id']); foreach ($scores as $score) { - $data['uitslag'][$subgroep['id']][$score['spelgebiedid']] = $score['score']; - $data['uitslag'][$subgroep['id']]['total'] = $data['uitslag'][$subgroep['id']]['total'] + $score['score']; + $scoreitem = ($score['score']/$score['maxscore'])*100; + $data['uitslag'][$subgroep['id']][$score['spelgebiedid']] = $scoreitem; + $data['uitslag'][$subgroep['id']]['total'] = $data['uitslag'][$subgroep['id']]['total'] + $scoreitem; } } diff --git a/application/models/Uitslag_model.php b/application/models/Uitslag_model.php index a4bad80..8c19b6b 100644 --- a/application/models/Uitslag_model.php +++ b/application/models/Uitslag_model.php @@ -46,6 +46,7 @@ class Uitslag_model extends CI_Model public function get_subgroep_punten($subgroepid) { $this->db->select('SUM('.$this->db->dbprefix('resultaat').'.score/'.$this->db->dbprefix('lijst').'.ronde) AS score, + SUM('.$this->db->dbprefix('vragen').'.score) AS maxscore, spelgebied.id AS spelgebiedid, '); $this->db->from('resultaat');