sops per criterium bors,robs en swop niet

2022-02-08 12:07:21 +01:00
parent 89baf9bfd9
commit 1e88478891
9 changed files with 221 additions and 139 deletions
@@ -28,10 +28,10 @@ class Sorteerlabels_model extends MY_Model{
             return $this->get_query_row('id');
 	}

-    function orgsEnSopsPerCriterium($schooljaarnr,$criteriumID,$orglist){
+    function orgsEnSopsPerCriterium($schooljaarnr,$criteriumID,$orgid, $orglist){
        $this->sql =" SELECT O.id, O.soort, O.naamkort, O.plaats, O.brin, COALESCE(L.naam, 'niet ingedeeld') AS label,
                      COALESCE(L.naam, 'ZZZZ') AS ordening,  
-                      CASE WHEN IS NULL C.id THEN 'F'
+                      CASE WHEN C.id IS NULL THEN 'F'
                      ELSE 'T'
                      END AS sop

@@ -43,9 +43,12 @@ class Sorteerlabels_model extends MY_Model{

                      WHERE     O.id IN ({$orglist})
                      AND       (S.id = {$criteriumID} OR S.id IS NULL)
+                      AND       O.id <> {$orgid}
+                      AND       O.soort = 4  
                      AND       (C.schooljaarnummer = {$schooljaarnr} OR C.id IS NULL)
-                      
                      GROUP BY O.id  
                      ORDER BY ordening, O.soort, O.naamkort ";
+
+        return $this->get_query_result();
    }
 }