From 74e064557889be77dc10057c647a60bdab704d90 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Tue, 10 Oct 2023 15:01:59 +0200 Subject: [PATCH 1/3] wensid was uitgezet --- public/js/monpas/models/ontwikkelmodel.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/monpas/models/ontwikkelmodel.js b/public/js/monpas/models/ontwikkelmodel.js index fa4cac3..6339ffe 100644 --- a/public/js/monpas/models/ontwikkelmodel.js +++ b/public/js/monpas/models/ontwikkelmodel.js @@ -92,7 +92,7 @@ ls.initOntwikkelModel = function(){ this.ijkpuntid = p.ijkpunt_id; this.wensid = 0; - // if (p.gewenstid) { this.wensid = p.gewenstid; } + if (p.gewenstid) { this.wensid = p.gewenstid; } this.scoretype = p.scoretype; this.disabled = p.disabled; this.disablentv = p.disablenvt; @@ -438,9 +438,9 @@ ls.initOntwikkelModel = function(){ } var wensarray = []; $.each(self.results() , function(i,p){ - wensarray[i]={ 'ijkpuntid' : p.ijkpuntid, - 'wensid' : p.wensid, - 'gewenst' : p.gewenst() }; + wensarray[i]={ 'ijkpuntid' : p.ijkpuntid, + 'wensid' : p.wensid, + 'gewenst' : p.gewenst() }; }); From 78e454b0f83cc481ba558623e4eb89a9433bac02 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Tue, 10 Oct 2023 15:13:17 +0200 Subject: [PATCH 2/3] versie --- application/core/MY_Controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index c2dc485..0ff370b 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -86,7 +86,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.04';// monfin met budgetten update // public $version = '1.20.07';// monfin met budgetten update hogere kalenderjaren // public $version = '1.20.11';// stappenplan - public $version = '1.20.12';// monfin dubbeltellingen +// public $version = '1.20.12';// monfin dubbeltellingen + public $version = '1.20.13';// wensid was foutief uitgesterd public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in From a7ac439f6892467a63b910315e979f6853c310e7 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 2 Nov 2023 12:12:38 +0100 Subject: [PATCH 3/3] kleurV ipv kleur --- application/core/MY_Controller.php | 3 ++- public/js/monpas/models/ijkpuntenmodel.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 0ff370b..2a8f4b4 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -87,7 +87,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.07';// monfin met budgetten update hogere kalenderjaren // public $version = '1.20.11';// stappenplan // public $version = '1.20.12';// monfin dubbeltellingen - public $version = '1.20.13';// wensid was foutief uitgesterd +// public $version = '1.20.13';// wensid was foutief uitgesterd + public $version = '1.20.14';// spelfout in ijkpunten (kleur ipv kleurV) public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in diff --git a/public/js/monpas/models/ijkpuntenmodel.js b/public/js/monpas/models/ijkpuntenmodel.js index 46a37a9..2319520 100644 --- a/public/js/monpas/models/ijkpuntenmodel.js +++ b/public/js/monpas/models/ijkpuntenmodel.js @@ -182,7 +182,7 @@ ls.initIJkpuntenModel = function(){ this.gem = s.disablenvt ==='T'? 'nvt' : s.disabled ==='T' ?'uitgezet': s.gem; this.gemV = s.disablenvt ==='T'? 'nvt' : s.disabledV ==='T' ? 'uitgezet' : s.gemV; this.kleur = s.disabled === 'F' && s.disablenvt === 'F'? s.kleur : 'lightgray'; - this.kleurV = s.disabledV === 'F' && s.disablenvtV === 'F'? s.kleur : 'lightgray'; + this.kleurV = s.disabledV === 'F' && s.disablenvtV === 'F'? s.kleurV : 'lightgray'; }