Merge branch 'feature/labels' into develop

application/controllers/monpas/Rapijkpunten.php

@@ -157,7 +157,7 @@ class  Rapijkpunten extends MY_Controller{
 		if (!$this->userid) die;
 		$targetid	= $this->uri->segment(4);// orgid
 		$module 	= $this->session->userdata('module');
-        $label  = $this->Labels_model->get_label_by_id($module, '1');
+
         
 		// get de lijst van scholen onder de target
 		$idlijst = $this->Organisaties_model->getscholenondertarget2($targetid);
@@ -171,8 +171,7 @@ class  Rapijkpunten extends MY_Controller{
 						foreach ($versies as $versie) {
 								$versie->scoreomschrijving = $this->Antwoordtypes_model->gettype($versie->scoretype);
 						}
-						echo json_encode(['versies' =>$versies,
-                                                     'label' =>$label]);
+						echo json_encode($versies);
 				}
 				else{
 						echo json_encode(false);

application/controllers/monpas/Rapmatrix.php

@@ -29,7 +29,10 @@ class  Rapmatrix extends MY_Controller
     function checkinzage(){
         if (!$this->userid) die;
         $rol = $this->userrole;
-        echo json_encode($rol);
+        $module 	= $this->session->userdata('module');
+        $label  = $this->Labels_model->get_label_by_id($module, '1');
+        echo json_encode(['rol'=>$rol,
+            'label'=>$label]);
     }
 
     function checkowner(){