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

Merge branch 'fouten/kamerversiesbijambities' into develop

Browse Source
This commit is contained in:
Monique
2022-12-09 16:31:57 +01:00
parent dfb4d3579f 600de45445
commit fb6ef95d39
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">
public/js/monpas/models/streefcijfersmodel.js
+2 -4
View File
@@ -16,10 +16,9 @@ ls.initStreefcijfersModel = function(){
this.gemscore = ko.observable(p.gemscore);
this.zprocent = ko.observable(p.zprocent);
this.xijkpunten = ko.observable(p.xijkpunten);
this.ambitievan = ko.observable(p.ambitievanorg);
this.ambitievansoort = ko.observable(p.ambitievan);
this.versievan = ko.observable(p.versievan);
this.organisatie = p.organisatie ? p.organisatie : '';
this.organisatie = p.organisatie ? p.organisatie : 'standaard';
this.soort = p.soort;
this.aantalY = p.xijkpunten;
this.periodenummer = p.periodenummer;
@@ -162,7 +161,6 @@ ls.initStreefcijfersModel = function(){
},
fNew: function(){
var self = ls.StreefcijfersModel;
console.log(self, "self")
self.insert(true);
self.gemscoreNew(100);
self.aantalYNew();
@@ -185,7 +183,7 @@ ls.initStreefcijfersModel = function(){
"xijkpunten" : self.aantalYNew(),
"zprocent" : self.zprocentNew(),
}
console.log(submitData, "sd")
$.post("index.php/monpas/streefcijfers/saveAmbitie", submitData, function(newid){