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

Merge branch 'feature/streefcijfersperorg' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
#	application/views/monpas/pages/streefcijfers.php
This commit is contained in:
Monique
2022-11-28 23:51:46 +01:00
parent cee7fb8a64 ec74532c9d
commit 169c50dc69
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+1 -1
View File
@@ -78,7 +78,7 @@ class MY_Controller extends CI_Controller{
// public $version = '1.18.04';// invul status
// public $version = '1.18.05';// fout schoolgegevens compactsop
// public $version = '1.18.08';// kleurenfout
public $version = '1.18.12';// ambities per org
public $version = '1.19.00';// ambities per org
application/views/monpas/pages/streefcijfers.php
+3 -3
View File
@@ -54,7 +54,8 @@
data-bind="textInput: zprocent,
event: {input: $parent.fUpdateAmbitie},
enable: $parent.manage() =='T' && $parent.orgsoort() == soort " />
<span > % of hoger</span>
<span >%</span><span data-bind="text: ' of hoger', visible: zprocent() != '100' "></span>
</td>
<td data-bind="text: organisatie + ' (' + ambitievan() + ')' " ></td>
@@ -97,8 +98,7 @@
attr: {'max': aantalY} " /> ijkpunten
op <input type="number" min="0" max="100" step="5" class="integer"
data-bind="textInput: procentNieuw" />
<span data-bind="text: procentNieuw() == '100' ? '%' : '% of hoger' " ></span>
<span >%</span><span data-bind="text: ' of hoger', visible: procentNieuw() != '100' "></span>
</td>
<td data-bind="text: soortNaam() " ></td>