Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/labels' into develop

Browse Source
This commit is contained in:
Monique
2023-07-03 13:10:34 +02:00
parent b2d015dab8 d3a369cb8e
commit b1bcf7220a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Rapijkpunten.php
+2 -3
View File
@@ -157,7 +157,7 @@ class Rapijkpunten extends MY_Controller{
if (!$this->userid) die; if (!$this->userid) die;
$targetid = $this->uri->segment(4);// orgid $targetid = $this->uri->segment(4);// orgid
$module = $this->session->userdata('module'); $module = $this->session->userdata('module');
$label = $this->Labels_model->get_label_by_id($module, '1');
// get de lijst van scholen onder de target // get de lijst van scholen onder de target
$idlijst = $this->Organisaties_model->getscholenondertarget2($targetid); $idlijst = $this->Organisaties_model->getscholenondertarget2($targetid);
@@ -171,8 +171,7 @@ class Rapijkpunten extends MY_Controller{
foreach ($versies as $versie) { foreach ($versies as $versie) {
$versie->scoreomschrijving = $this->Antwoordtypes_model->gettype($versie->scoretype); $versie->scoreomschrijving = $this->Antwoordtypes_model->gettype($versie->scoretype);
} }
echo json_encode(['versies' =>$versies, echo json_encode($versies);
'label' =>$label]);
} }
else{ else{
echo json_encode(false); echo json_encode(false);
application/controllers/monpas/Rapmatrix.php
+4 -1
View File
@@ -29,7 +29,10 @@ class Rapmatrix extends MY_Controller
function checkinzage(){ function checkinzage(){
if (!$this->userid) die; if (!$this->userid) die;
$rol = $this->userrole; $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(){ function checkowner(){
public/js/monpas/models/matrixmodel.js
+3 -4
View File
@@ -241,7 +241,8 @@ $(function () {
var self = ls.MatrixModel; var self = ls.MatrixModel;
$.post("index.php/monpas/rapmatrix/checkinzage/", function (data) { $.post("index.php/monpas/rapmatrix/checkinzage/", function (data) {
if (data) { if (data) {
self.inzage(data); self.inzage(data.rol);
self.ijknummer(data.label)
} }
}, 'json'); }, 'json');
}, },
@@ -269,9 +270,7 @@ $(function () {
self.orgversions.removeAll(); self.orgversions.removeAll();
if (data) { if (data) {
self.ijknummer(data.label); $.each(data, function (i, p) {
$.each(data.versies, function (i, p) {
self.orgversions.push(new fAddOrgversion(p)); self.orgversions.push(new fAddOrgversion(p));
}) })
if(versieid != null ){ if(versieid != null ){
public/js/monpas/models/ontwikkelmodel.js
+1 -1
View File
@@ -304,7 +304,7 @@ ls.initOntwikkelModel = function(){
self.wijzigRecht(false); self.wijzigRecht(false);
self.bezig(true); self.bezig(true);
if (data){ if (data){
$.each(data.versies,function(i,p){ $.each(data,function(i,p){
self.orgversions.push(new fAddOrgversion(p)); self.orgversions.push(new fAddOrgversion(p));
}) })
} }