Merge branch 'feature/robbobswop' into develop
This commit is contained in:
@@ -14,19 +14,19 @@ class compactsoponderdelen_model extends MY_Model{
|
||||
|
||||
function getOnderdelen($orgsoort, $swvID, $schooljaarnr){
|
||||
$this->sql = "SELECT C.naam, C.naamkort, C.ijkpunten, C.vergelijking, S.pad, S.blokid, C.nummer,
|
||||
S.toon_nummer
|
||||
S.toon_nummer
|
||||
FROM tb_compactsoponderdelen C
|
||||
JOIN tb_compactonderdeel_piv_orgsoort S ON C.id = S.onderdeel_id
|
||||
WHERE S.org_soort = {$orgsoort} ";
|
||||
|
||||
if($swvID == 150 && $schooljaarnr > 8){
|
||||
$this->sql .= "AND C.nummer <> 1 ";
|
||||
}
|
||||
else{
|
||||
$this->sql .= "AND C.nummer <> 10 ";
|
||||
}
|
||||
if($swvID == 150 && $schooljaarnr > 8){
|
||||
$this->sql .= "AND C.nummer <> 1 ";
|
||||
}
|
||||
else {
|
||||
$this->sql .= "AND C.nummer <> 10 ";
|
||||
}
|
||||
|
||||
$this->sql .= " ORDER BY S.toon_nummer ";
|
||||
$this->sql .= " ORDER BY S.toon_nummer ";
|
||||
return $this->get_query_result();
|
||||
}
|
||||
function getOnderdeel($nummer, $orgsoort){
|
||||
|
||||
Reference in New Issue
Block a user