From 4c1536e8b375ebea22e9947b26dfa1fd2498ef54 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Mon, 3 Jul 2023 12:08:17 +0200 Subject: [PATCH] stappenplanBAO --- .../controllers/monpas/Rapijkpunten.php | 5 +- .../controllers/monpas/Rapontwikkel.php | 2 +- application/models/monpas/Labels_model.php | 77 +++++++++++-------- application/views/monpas/pages/matrix.php | 2 +- public/js/monpas/models/matrixmodel.js | 5 +- public/js/monpas/models/ontwikkelmodel.js | 3 +- 6 files changed, 59 insertions(+), 35 deletions(-) diff --git a/application/controllers/monpas/Rapijkpunten.php b/application/controllers/monpas/Rapijkpunten.php index 7fe639d..a5c3719 100644 --- a/application/controllers/monpas/Rapijkpunten.php +++ b/application/controllers/monpas/Rapijkpunten.php @@ -154,6 +154,8 @@ 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); if($idlijst) { @@ -166,7 +168,8 @@ class Rapijkpunten extends MY_Controller{ foreach ($versies as $versie) { $versie->scoreomschrijving = $this->Antwoordtypes_model->gettype($versie->scoretype); } - echo json_encode($versies); + echo json_encode(['versies' =>$versies, + 'label' =>$label]); } else{ echo json_encode(false); diff --git a/application/controllers/monpas/Rapontwikkel.php b/application/controllers/monpas/Rapontwikkel.php index 4735447..6c1fbb6 100644 --- a/application/controllers/monpas/Rapontwikkel.php +++ b/application/controllers/monpas/Rapontwikkel.php @@ -77,7 +77,7 @@ class Rapontwikkel extends MY_Controller { $scores = NULL; $gewenst = NULL; $orgversie = $this->Orgversies_model->get_record_by_id($orgversieid); - if($orgversie->scoretype == 7){ + if($orgversie && $orgversie->scoretype == 7){ $grens1 = 33; $grens2 = 66; $grens3 = 100; diff --git a/application/models/monpas/Labels_model.php b/application/models/monpas/Labels_model.php index 84163c0..e7032de 100644 --- a/application/models/monpas/Labels_model.php +++ b/application/models/monpas/Labels_model.php @@ -2,60 +2,68 @@ /** Labels_model januari 2015 */ -class Labels_model extends MY_Model{ +class Labels_model extends MY_Model +{ - protected $tablename = 'tb_labels'; - - function __construct(){ - parent::__construct(); - $models = array(); - $this->load->model($models); - } + protected $tablename = 'tb_labels'; - function getLabel($sysnr){ - $this->sql="SELECT waarde + function __construct() + { + parent::__construct(); + $models = array(); + $this->load->model($models); + } + + function getLabel($sysnr) + { + $this->sql = "SELECT waarde FROM tb_translate WHERE modulenr = {$sysnr} "; return $this->get_query_row("waarde"); } - function getLabels($module){ - $this->sql="SELECT * + function getLabels($module) + { + $this->sql = "SELECT * FROM tb_translate WHERE modulenr = {$module} "; - return $this->get_query_result(); + return $this->get_query_result(); } - function getalllabels($module = false){ - if (! $module) $module = $this->session->userdata('module'); - $this->sql="SELECT L.omschrijving, T.waarde + function getalllabels($module = false) + { + if (!$module) $module = $this->session->userdata('module'); + $this->sql = "SELECT L.omschrijving, T.waarde FROM tb_translate T JOIN tb_labels L on L.id = T.labelid - WHERE modulenr = {$module}"; - $labels = $this->get_query_result(); - $lbl = array(); - if ($labels){ - foreach($labels as $label){ - $lbl[$label->omschrijving]=$label->waarde; - };// foreach - } - return $lbl; - } + WHERE modulenr = {$module}"; + $labels = $this->get_query_result(); + $lbl = array(); + if ($labels) { + foreach ($labels as $label) { + $lbl[$label->omschrijving] = $label->waarde; + };// foreach + } + return $lbl; + } - function gettabellabel($modulenr){ - $this->sql="SELECT waarde + function gettabellabel($modulenr) + { + $this->sql = "SELECT waarde FROM tb_translate T WHERE modulenr = {$modulenr} AND labelid = 2 "; return $this->get_query_row("waarde"); } - function getresultaatlabel($modulenr){ - $this->sql="SELECT waarde + + function getresultaatlabel($modulenr) + { + $this->sql = "SELECT waarde FROM tb_translate T WHERE modulenr = {$modulenr} AND labelid = 1 "; @@ -63,4 +71,13 @@ class Labels_model extends MY_Model{ } + function get_label_by_id($module, $id) + { + $this->sql = "SELECT waarde + FROM tb_translate T + WHERE modulenr = {$module} + AND labelid = {$id} "; + return $this->get_query_row("waarde"); + } } + diff --git a/application/views/monpas/pages/matrix.php b/application/views/monpas/pages/matrix.php index c2fb544..54062f5 100644 --- a/application/views/monpas/pages/matrix.php +++ b/application/views/monpas/pages/matrix.php @@ -180,7 +180,7 @@
- Klik op een ijkpuntnummer voor toelichting. + Klik op een nummer voor toelichting. diff --git a/public/js/monpas/models/matrixmodel.js b/public/js/monpas/models/matrixmodel.js index 124cb57..f29122e 100644 --- a/public/js/monpas/models/matrixmodel.js +++ b/public/js/monpas/models/matrixmodel.js @@ -169,6 +169,7 @@ $(function () { bezig : ko.observable(false), druk : ko.observable(false), data : ko.observable(false), + ijknummer :ko.observable('ijkpuntnummer'), kolombreedte : ko.pureComputed(function(){ var row = 708; var orgbreedte = 250 @@ -268,7 +269,9 @@ $(function () { self.orgversions.removeAll(); if (data) { - $.each(data, function (i, p) { + self.ijknummer(data.label); + $.each(data.versies, function (i, p) { + self.orgversions.push(new fAddOrgversion(p)); }) if(versieid != null ){ diff --git a/public/js/monpas/models/ontwikkelmodel.js b/public/js/monpas/models/ontwikkelmodel.js index 2ecf3f5..ed6f4ad 100644 --- a/public/js/monpas/models/ontwikkelmodel.js +++ b/public/js/monpas/models/ontwikkelmodel.js @@ -147,6 +147,7 @@ ls.initOntwikkelModel = function(){ }, initModel: function() { var self = ls.OntwikkelModel; + console.log('nu hier') $.post("index.php/monpas/rapijkpunten/checkLevel", function(data){ if(data){ @@ -242,7 +243,7 @@ ls.initOntwikkelModel = function(){ self.wijzigRecht(false); self.bezig(true); if (data){ - $.each(data,function(i,p){ + $.each(data.versies,function(i,p){ self.orgversions.push(new fAddOrgversion(p)); }) }