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

Merge branch 'feature/alleInstrumenteninCompactSop' into develop

Browse Source
This commit is contained in:
Monique
2022-05-27 18:46:33 +02:00
parent e5ccf831ec c5eb1df6e9
commit da1a0a9cc0
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/ijkpunten/Lijsten.php
+1 -1
View File
@@ -502,7 +502,7 @@ class Lijsten
$toevoeging = '';
$versie = ', schoolversie';
if(intval($this->lijst->vorm) == 2) {
$versie = ', individuele versie';
$versie = ', ind. versie';
$metingen =' metingen';
if(intval($this->lijst->metingen) == 1) $metingen = ' meting';
$toevoeging = ', '. $this->lijst->metingen. $metingen;
application/models/monpas/Scores_model.php
+1 -1
View File
@@ -718,7 +718,7 @@ class Scores_model extends MY_Model{
JOIN tb_scorekleuren SK ON SK.scoretype = SC.scoretype
WHERE SC.filledversion_id IN ({$gevuldeversies})
AND SK.disabled = Y.disabled
GROUP BY SC.ijkpunt_id, SK.id
GROUP BY SC.ijkpunt_id
ORDER BY Y.nummer ) AS Q
HAVING Q.ondergrens <= gem AND Q.bovengrens > gem ";
}