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

Merge branch 'fouten/verkeerdekleurijkpunten' into develop

Browse Source 
# Conflicts:
#	public/js/monpas/models/ontwikkelmodel.js
This commit is contained in:
Monique
2023-11-02 12:18:15 +01:00
parent 4934f35619 a7ac439f68
commit a45f80f5a4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+3 -1
View File
@@ -86,7 +86,9 @@ 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 $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
public/js/monpas/models/ijkpuntenmodel.js
+1 -1
View File
@@ -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';
}