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(){

public/js/monpas/models/matrixmodel.js

@@ -241,7 +241,8 @@ $(function () {
 					var self = ls.MatrixModel;
 					$.post("index.php/monpas/rapmatrix/checkinzage/", function (data) {
 						if (data) {
-							self.inzage(data);
+							self.inzage(data.rol);
+							self.ijknummer(data.label)
 						}
 					}, 'json');
 				},
@@ -269,9 +270,7 @@ $(function () {
 						self.orgversions.removeAll();
 
 						if (data) {
-							self.ijknummer(data.label);
-							$.each(data.versies, function (i, p) {
-
+							$.each(data, function (i, p) {
 								self.orgversions.push(new fAddOrgversion(p));
 							})
 							if(versieid != null ){

public/js/monpas/models/ontwikkelmodel.js

@@ -304,7 +304,7 @@ ls.initOntwikkelModel = function(){
                     self.wijzigRecht(false);
 					self.bezig(true);
 					if (data){
-						$.each(data.versies,function(i,p){
+						$.each(data,function(i,p){
 							self.orgversions.push(new fAddOrgversion(p));
 						})
 					}