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

tussenopslag

Browse Source
This commit is contained in:
Monique
2022-04-28 20:47:54 +02:00
parent d26974e69f
commit 573332e28a
16 changed files with 306 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Compactsoponderdelen_model.php
+35 -14
View File
@@ -12,21 +12,38 @@ class compactsoponderdelen_model extends MY_Model{
$this->load->model($models);
}
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
FROM tb_compactsoponderdelen C
JOIN tb_compactonderdeel_piv_orgsoort S ON C.id = S.onderdeel_id
WHERE S.org_soort = {$orgsoort} ";
// 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
// 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 ";
// }
//
// $this->sql .= " ORDER BY S.toon_nummer ";
// return $this->get_query_result();
// }
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 ";
function getOnderdelen($orgid){
$this->sql =" SELECT M.sysnr as modulenr, M.naam AS instrument, M.instrument_type, COALESCE(C.naam, 'geen') AS cluster,
COALESCE(C.naam, 'aaaa') AS ordening, SOP.id,
SOP.sopnaam AS naam, SOP.blokjesnaam AS naamkort
FROM tb_modules M
JOIN tb_compactsoponderdelen SOP on M.sysnr = SOP.module_nr
JOIN tb_licenties L ON M.sysnr = L.modulenr
LEFT JOIN tb_cluster C ON M.cluster_id = C.id
WHERE L.orgid = {$orgid}
AND SOP.in_sop = 'T'
ORDER BY ordening, instrument";
return $this->get_query_result();
}
function getOnderdeel($nummer, $orgsoort){
@@ -39,6 +56,8 @@ class compactsoponderdelen_model extends MY_Model{
}
function getModuleMetLicentie($orgid, $onderdeelnummer, $orgsoort){
$this->sql = "SELECT L.modulenr
FROM tb_compactsoponderdelen CO
@@ -52,4 +71,6 @@ function getModuleMetLicentie($orgid, $onderdeelnummer, $orgsoort){
return $this->get_query_row("modulenr");
}
}
application/models/monpas/Modules_model.php
+8
View File
@@ -117,6 +117,14 @@ class Modules_model extends MY_Model{
return $this->get_query_result();
}
function getPad($modulenr){
$this->sql = "SELECT pad
FROM tb_compactsoppaden P
JOIN tb_modules M ON p.instrument_type = M.instrument_type
WHERE M.sysnr = {$modulenr} ";
return $this->get_query_row("pad");
}
application/models/monpas/Orgversies_model.php
+15 -1
View File
@@ -186,5 +186,19 @@ class Orgversies_model extends MY_Model{
ORDER BY UPPER(omschrijving) DESC";
return $this->get_query_result();
}
function getOrgVersiesBijSop($swvid, $modulenr){
$this->sql = "SELECT OV.id,V.naam
FROM tb_orgversies OV
JOIN tb_versies V ON V.id =OV.versie_id
JOIN tb_organisaties O ON OV.organisatie_id = O.id
WHERE (O.id = {$swvid} OR O.valtonder_id = {$swvid})
AND V.modulenr = {$modulenr}
";
return $this->get_query_result();
}
}