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

grafieken

Browse Source
This commit is contained in:
Monique
2022-05-03 16:12:05 +02:00
parent a24d9b486f
commit 41f283e8f0
27 changed files with 377 additions and 3048 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Compactsoponderdelen_model.php
+17 -16
View File
@@ -30,19 +30,20 @@ class compactsoponderdelen_model extends MY_Model{
// return $this->get_query_result();
// }
function getOnderdelen($orgid){
$this->sql =" SELECT M.sysnr as modulenr, M.naam AS instrument, M.instrument_type, COALESCE(C.naam, 'geen') AS cluster,
function getOnderdelen($orgid, $soort){
$this->sql =" SELECT M.sysnr as modulenr, M.naam AS instrument, M.instrument_type AS 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
JOIN tb_licenties L ON M.sysnr = L.modulenr
JOIN tb_organisaties O ON L.orgid = O.id
LEFT JOIN tb_cluster C ON M.cluster_id = C.id
WHERE L.orgid = {$orgid}
AND SOP.in_sop = 'T'
AND ((M.instrument_type <> 'FIN' && M.instrument_type <> 'DIV') || O.soort = 4 )
ORDER BY ordening, instrument";
return $this->get_query_result();
}
@@ -58,18 +59,18 @@ class compactsoponderdelen_model extends MY_Model{
function getModuleMetLicentie($orgid, $onderdeelnummer, $orgsoort){
$this->sql = "SELECT L.modulenr
FROM tb_compactsoponderdelen CO
JOIN tb_sop_piv_modules SM ON CO.nummer = SM.onderdeel_nr
JOIN tb_licenties L ON SM.modulenr = L.modulenr
JOIN tb_compactonderdeel_piv_orgsoort S ON CO.id = S.onderdeel_id
WHERE L.orgid = {$orgid}
AND CO.nummer = {$onderdeelnummer}
AND S.org_soort = {$orgsoort}
GROUP BY CO.nummer ";
return $this->get_query_row("modulenr");
}
//function getModuleMetLicentie($orgid, $onderdeelnummer, $orgsoort){
// $this->sql = "SELECT L.modulenr
// FROM tb_compactsoponderdelen CO
// JOIN tb_sop_piv_modules SM ON CO.nummer = SM.onderdeel_nr
// JOIN tb_licenties L ON SM.modulenr = L.modulenr
// JOIN tb_compactonderdeel_piv_orgsoort S ON CO.id = S.onderdeel_id
// WHERE L.orgid = {$orgid}
// AND CO.nummer = {$onderdeelnummer}
// AND S.org_soort = {$orgsoort}
// GROUP BY CO.nummer ";
// return $this->get_query_row("modulenr");
//}