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-08 16:41:14 +01:00
parent 05d22502d5 0a9bf59d51
commit dfb4d3579f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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.18.08';// kleurenfout
// public $version = '1.19.00';// ambities per org // public $version = '1.19.00';// ambities per org
// public $version = '1.19.01';// compactdiv met orgid ipv globorg // public $version = '1.19.01';// compactdiv met orgid ipv globorg
public $version = '1.19.03';// ambities per org incl kamerversies public $version = '1.19.04';// ambities per org incl kamerversies
public $partituurid; public $partituurid;
public $globProfielVersieID = 1; public $globProfielVersieID = 1;
public $userid; //id of the user that is logged in public $userid; //id of the user that is logged in
application/libraries/monpas/ijkpunten/Lijsten.php
+2 -2
View File
@@ -189,13 +189,13 @@ class Lijsten
$standaard->zprocent = 60; $standaard->zprocent = 60;
if($this->results && $this->results['ambities'] && $this->results['ambities']->gemscore > 0) $this->lijst->ambities = $this->results['ambities']; if($this->results && $this->results['ambities'] && $this->results['ambities']->gemscore >= 0) $this->lijst->ambities = $this->results['ambities'];
else $this->lijst->ambities = $standaard; else $this->lijst->ambities = $standaard;
if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return; if(!isset($this->vergelijkingen) || !$this->vergelijkingen) return;
if($this->vergelijkingen['ambities'] && $this->vergelijkingen['ambities']->gemscore > 0 ) $ambitiesV = $this->vergelijkingen['ambities']; if($this->vergelijkingen['ambities'] && $this->vergelijkingen['ambities']->gemscore >= 0 ) $ambitiesV = $this->vergelijkingen['ambities'];
else $ambitiesV = $standaard; else $ambitiesV = $standaard;
if($ambitiesV->ambitievan != $this->lijst->ambities->ambitievan) $this->lijst->ambitiesV = $ambitiesV; if($ambitiesV->ambitievan != $this->lijst->ambities->ambitievan) $this->lijst->ambitiesV = $ambitiesV;
application/models/monpas/Ambities_model.php
+1 -1
View File
@@ -148,7 +148,7 @@ function mh_get_ambitie_orgversie($orgversieid, $ambitieorgs, $toporgs){
A.gem_score AS gemscore, A.gem_score AS gemscore,
A.x_ijkpunten AS xijkpunten, A.x_ijkpunten AS xijkpunten,
A.z_procent AS zprocent, A.z_procent AS zprocent,
O.naamkort AS ambitievan, O.naamkort AS ambitievanorg,
OV.id AS orgversieID, OV.id AS orgversieID,
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf, DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm, DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
public/js/monpas/models/streefcijfersmodel.js
+3 -2
View File
@@ -16,7 +16,8 @@ ls.initStreefcijfersModel = function(){
this.gemscore = ko.observable(p.gemscore); this.gemscore = ko.observable(p.gemscore);
this.zprocent = ko.observable(p.zprocent); this.zprocent = ko.observable(p.zprocent);
this.xijkpunten = ko.observable(p.xijkpunten); this.xijkpunten = ko.observable(p.xijkpunten);
this.ambitievan = ko.observable(p.ambitievan); this.ambitievan = ko.observable(p.ambitievanorg);
this.ambitievansoort = ko.observable(p.ambitievan);
this.versievan = ko.observable(p.versievan); this.versievan = ko.observable(p.versievan);
this.organisatie = p.organisatie ? p.organisatie : ''; this.organisatie = p.organisatie ? p.organisatie : '';
this.soort = p.soort; this.soort = p.soort;
@@ -150,7 +151,7 @@ ls.initStreefcijfersModel = function(){
self.bezig(true); self.bezig(true);
var submitData={ "id" : dit.id, var submitData={ "id" : dit.id,
"orgversie_id" : self.orgversieID, "orgversie_id" : self.orgversieID,
"gemscore" : dit.gemscore(), "gemscore" : dit.gemscore(),
"xijkpunten" : dit.xijkpunten(), "xijkpunten" : dit.xijkpunten(),
"zprocent" : dit.zprocent()} "zprocent" : dit.zprocent()}
$.post("index.php/monpas/streefcijfers/updateambitie", submitData, function(newid){ $.post("index.php/monpas/streefcijfers/updateambitie", submitData, function(newid){