Merge branch 'feature/streefcijfersperorg'

# Conflicts: # application/core/MY_Controller.php
2022-11-28 23:35:04 +01:00
parent 9a89ce7b5a 18e0f0632b
commit 9e11660f36
42 changed files with 3844 additions and 2453 deletions
@@ -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
            ];
        }
 }