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

orgversie swv

Browse Source
This commit is contained in:
Monique
2022-12-09 16:31:45 +01:00
parent 0a9bf59d51
commit 600de45445
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Streefcijfers.php
+9 -5
View File
@@ -272,11 +272,14 @@ class Streefcijfers extends MY_Controller{
}
}
$ambitie = $this->Ambities_model->mh_get_ambities($module, $this->globorgid, $this->globorgid);
if($ambitie) $ambities = array_merge($ambities,$ambitie);
else{
$standaardSWVNodig = true;
$orgversie = $this->Orgversies_model->getOrgVersie($this->globorgid, $module);
$orgversie = $this->Orgversies_model->getOrgVersie($this->globorgid, $module);
if($orgversie) {
$ambitie = $this->Ambities_model->mh_get_ambities($module, $this->globorgid, $orgversie->orgversieID);
if ($ambitie) $ambities = array_merge($ambities, $ambitie);
else {
$standaardSWVNodig = true;
}
}
}
@@ -383,6 +386,7 @@ class Streefcijfers extends MY_Controller{
if (!$this->userid) die;
$orgversieid = $this->clean_input("orgversieid");
$id = false;
if($this->super == false) {
$result = $this->Autorisatienivos_model->checkmanage($this->userid, $this->globorgid);
application/core/MY_Controller.php
+1 -1
View File
@@ -80,7 +80,7 @@ class MY_Controller extends CI_Controller{
// public $version = '1.18.08';// kleurenfout
// public $version = '1.19.00';// ambities per org
// public $version = '1.19.01';// compactdiv met orgid ipv globorg
public $version = '1.19.04';// ambities per org incl kamerversies
public $version = '1.19.05';// ambities per org incl kamerversies
public $partituurid;
public $globProfielVersieID = 1;
public $userid; //id of the user that is logged in
application/views/monpas/pages/streefcijfers.php
+1 -1
View File
@@ -58,7 +58,7 @@
<span >%</span><span data-bind="text: ' of hoger', visible: zprocent() != '100' "></span>
</td>
<td style="vertical-align: text-top" data-bind="text: organisatie + ' (' + ambitievan() + ')' " ></td>
<td style="vertical-align: text-top" data-bind="text: organisatie" ></td>
<td style="vertical-align: text-top" data-bind="text: versievan " ></td>
<td style="text-align: right; vertical-align: text-top">