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 12:19:39 +02:00
parent 42fc2a64a2 d76bf98cf2
commit b2d015dab8
10 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monfin2/Bestemmingen.php
+5 -4
View File
@@ -87,9 +87,10 @@ class Bestemmingen extends MY_Controller{
$bestemmingID = $this->clean_input("id");
$targetjaar = $this->Toewijzingen_model->getNextJaar($this->globorgid);
$bestemmingjaar = $this->Finbestemmingen_model->get(['id'=>$bestemmingID], 'kalenderjaar', true);
if ($targetjaar >= $bestemmingjaar){
// if ($targetjaar >= $bestemmingjaar){
$this->Finbestemmingen_model->update_record(['bedrag'=>$this->clean_input('bedrag')], $bestemmingID);
}
// }
$record = $this->Finbestemmingen_model->get_record_by_id($bestemmingID);
json_encode(['record'=>$record]);
}
@@ -99,9 +100,9 @@ class Bestemmingen extends MY_Controller{
$bestemmingID = $this->clean_input("id");
$targetjaar = $this->Toewijzingen_model->getNextJaar($this->globorgid);
$bestemmingjaar = $this->Finbestemmingen_model->get(['id'=>$bestemmingID], 'kalenderjaar', true);
if ($targetjaar >= $bestemmingjaar) {
// if ($targetjaar >= $bestemmingjaar) {
$this->Finbestemmingen_model->update_record(['budget' => $this->clean_input('budget')], $bestemmingID);
}
// }
}
application/controllers/monpas/Rapijkpunten.php
+4 -1
View File
@@ -157,6 +157,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) {
@@ -169,7 +171,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);
application/controllers/monpas/Rapontwikkel.php
+1 -1
View File
@@ -83,7 +83,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;
application/core/MY_Controller.php
+1 -1
View File
@@ -84,7 +84,7 @@ class MY_Controller extends CI_Controller{
// public $version = '1.19.06';// monfin met budgetten
// public $version = '1.20.03';// monfin met budgetten
// public $version = '1.20.04';// monfin met budgetten update
public $version = '1.20.05';// monfin met budgetten update
public $version = '1.20.07';// monfin met budgetten update hogere kalenderjaren
public $partituurid;
public $globProfielVersieID = 1;
public $userid; //id of the user that is logged in
application/models/monpas/Labels_model.php
+47 -30
View File
@@ -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");
}
}
application/views/monpas/pages/matrix.php
+1 -1
View File
@@ -180,7 +180,7 @@
<div style="overflow-y:scroll" data-bind="visible: erzijnscores()"> <!-- anders valt de header niet over de onderliggende table -->
<span style="padding-left: 3px;padding-bottom: 10px;">Klik op een ijkpuntnummer voor toelichting.</span>
<span style="padding-left: 3px;padding-bottom: 10px;">Klik op een </span><span data-bind="text : ijknummer"></span><span>nummer voor toelichting.</span>
<table style="table-layout:fixed; font-size:0.8em; margin-top: 5px; max-height: 800px; overflow-y: scroll">
<thead >
<tr >