Merge branch 'feature/draganddrop' into develop

# Conflicts: # application/core/MY_Controller.php
2022-09-29 10:40:21 +02:00
parent ffd213d350 51f2ae654f
commit e8fd10435f
22 changed files with 1215 additions and 104 deletions
@@ -265,6 +265,7 @@ class Schoolafbeeldingen {
    private function setScoreKleuren($scoretype){


+
                $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($scoretype, $this->score->gem);
                $kleur = $kleur->kleurcode;
                if(!$kleur) $kleur = '#ffffff';