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

kamerversies bij swv en scholen

Browse Source
This commit is contained in:
Monique
2022-12-05 12:52:06 +01:00
parent 8f5449e80d
commit 962d91cf71
6 changed files with 351 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Ambities_model.php
+39 -12
View File
@@ -103,18 +103,20 @@ class Ambities_model extends MY_Model{
return $ambitie;
}
function mh_get_ambities($moduleid, $ambitieorgs, $toporgs){
function mh_get_ambities($moduleid, $ambitieorgs, $orgversieid = FALSE){
$this->sql = " SELECT A.id AS ambitieID,
A.gem_score AS gemscore,
A.x_ijkpunten AS xijkpunten,
A.z_procent AS zprocent,
OV.id AS orgversie_id,
OV.id AS orgversieID,
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
OV.periodenummer, V.naam,
O.soort AS soort,
concat_ws(' ', O.brin, O.naamkort) AS organisatie,
O.id AS orgID,
O2.naamkort AS versievan,
CASE WHEN O.soort = 1 THEN
'swv'
WHEN O.soort = 2 THEN
@@ -123,17 +125,21 @@ function mh_get_ambities($moduleid, $ambitieorgs, $toporgs){
'bestuur'
WHEN O.soort = 4 THEN
'school'
END AS ambitievan
END AS ambitievan
FROM tb_orgversies OV
JOIN tb_versies V ON OV.versie_id = V.id
JOIN tb_versies V ON OV.versie_id = V.id
JOIN tb_ambities A ON A.orgversie_id = OV.id
JOIN tb_organisaties O ON A.organisatie_id = O.id
JOIN tb_organisaties O2 ON OV.organisatie_id = O2.id
WHERE A.organisatie_id IN ({$ambitieorgs})
AND OV.organisatie_id IN ({$toporgs})
AND V.modulenr = {$moduleid}
AND OV.actief = 1
ORDER BY soort DESC ";
AND OV.actief = 1 ";
if($orgversieid) {
$this->sql .= " AND OV.id = {$orgversieid} ";
}
$this->sql.= " ORDER BY O.soort DESC ";
return $this->get_query_result();
}
@@ -142,17 +148,38 @@ function mh_get_ambitie_orgversie($orgversieid, $ambitieorgs, $toporgs){
A.gem_score AS gemscore,
A.x_ijkpunten AS xijkpunten,
A.z_procent AS zprocent,
O.naam AS ambitievan
O.naamkort AS ambitievan,
OV.id AS orgversieID,
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
OV.periodenummer, V.naam,
O.soort AS soort,
concat_ws(' ', O.brin, O.naamkort) AS organisatie,
O.id AS orgID,
O2.naamkort AS versievan,
CASE WHEN O.soort = 1 THEN
'swv'
WHEN O.soort = 2 THEN
'regio'
WHEN O.soort = 3 THEN
'bestuur'
WHEN O.soort = 4 THEN
'school'
END AS ambitievan
FROM tb_orgversies OV
JOIN tb_versies V ON OV.versie_id = V.id
JOIN tb_ijkpunten Y ON V.id = Y.versie_id
JOIN tb_versies V ON OV.versie_id = V.id
JOIN tb_ambities A ON A.orgversie_id = OV.id
JOIN tb_organisaties O ON A.organisatie_id = O.id
JOIN tb_organisaties O2 ON OV.organisatie_id = O2.id
WHERE A.organisatie_id IN ({$ambitieorgs})
AND OV.organisatie_id IN ({$toporgs})
AND OV.id = {$orgversieid}
AND Y.disabled = 'F'
ORDER BY soort DESC
LIMIT 1 ";
return $this->get_query_row();
application/models/monpas/Orgversies_model.php
+28 -5
View File
@@ -265,20 +265,43 @@ class Orgversies_model extends MY_Model{
return $this->get_query_result();
}
function getAmbitieVersie($toporgs, $moduleid){
function getAmbitieVersie( $orgversieid){
$this->sql = "SELECT
OV.id AS orgversie_id,
OV.id AS orgversie_id,
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
OV.periodenummer, V.naam
OV.periodenummer, V.naam,
O.naamkort AS versievan
FROM tb_orgversies OV
JOIN tb_versies V ON OV.versie_id = V.id
WHERE OV.organisatie_id IN ({$toporgs})
AND V.modulenr = {$moduleid}
JOIN tb_organisaties O ON O.id = OV.organisatie_id
WHERE OV.id = {$orgversieid}
AND OV.actief = 1 ";
return $this->get_query_row();
}
function getOrgversie($orgid, $module){
$this->sql = "SELECT OV.id AS orgversieID,
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
OV.periodenummer, V.naam,
O.naamkort AS versievan,
O.id AS orgID
FROM tb_orgversies OV
JOIN tb_organisaties O ON OV.organisatie_id = O.id
JOIN tb_versies V ON OV.versie_id = V.id
WHERE OV.actief = 1
AND V.modulenr = {$module}
AND OV.organisatie_id = ({$orgid}) ";
return $this->get_query_row();
}
}