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

tussenstand

Browse Source
This commit is contained in:
Monique
2022-11-18 15:47:13 +01:00
parent a7bc12a254
commit 50459e9ffd
11 changed files with 372 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Ambities_model.php
+21 -25
View File
@@ -103,21 +103,19 @@ class Ambities_model extends MY_Model{
return $ambitie;
}
function mh_get_ambitie($moduleid, $ambitieorgs, $toporgs, $aantalY){
$this->sql = " SELECT COALESCE(A.id, 0) AS ambitieID,
COALESCE(A.gem_score, 80) AS gemscore,
COALESCE(A.x_ijkpunten, ROUND({$aantalY} * 0.8)) AS xijkpunten,
{$aantalY} AS aantalY,
COALESCE(A.z_procent, 60) AS zprocent,
function mh_get_ambities($moduleid, $ambitieorgs, $toporgs){
$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,
DATE_FORMAT( OV.geldigvanaf, '%d-%m-%Y') as geldigvanaf,
DATE_FORMAT( OV.geldigtm, '%d-%m-%Y') as geldigtm,
OV.periodenummer, V.naam,
COALESCE(O.soort, 0) AS soort,
O.soort AS soort,
concat_ws(' ', O.brin, O.naamkort) AS organisatie,
O.id AS orgID,
CASE WHEN O.soort IS NULL THEN
'standaard'
WHEN O.soort = 1 THEN
CASE WHEN O.soort = 1 THEN
'swv'
WHEN O.soort = 2 THEN
'regio'
@@ -129,34 +127,32 @@ function mh_get_ambitie($moduleid, $ambitieorgs, $toporgs, $aantalY){
FROM tb_orgversies OV
JOIN tb_versies V ON OV.versie_id = V.id
LEFT JOIN tb_ambities A ON A.orgversie_id = OV.id
LEFT JOIN tb_organisaties O ON A.organisatie_id = O.id
WHERE (A.organisatie_id IN ({$ambitieorgs}) OR A.id IS NULL)
JOIN tb_ambities A ON A.orgversie_id = OV.id
JOIN tb_organisaties O ON A.organisatie_id = O.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
LIMIT 1 ";
return $this->get_query_row();
ORDER BY soort DESC ";
return $this->get_query_result();
}
function mh_get_ambitie_orgversie($orgversieid, $ambitieorgs, $toporgs){
$this->sql = " SELECT COALESCE(A.id, 0) AS ambitieID,
COALESCE(A.gem_score, 80) AS gemscore,
$this->sql = " SELECT A.id AS ambitieID,
A.gem_score AS gemscore,
COUNT(Y.id) AS aantalY,
COALESCE(A.x_ijkpunten, ROUND(COUNT(Y.id) * 0.8)) AS xijkpunten,
COALESCE(A.z_procent, 60) AS zprocent,
COALESCE(O.naam, 'standaard') AS ambitievan
A.x_ijkpunten AS xijkpunten,
A.z_procent AS zprocent,
O.naam 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
LEFT JOIN tb_ambities A ON A.orgversie_id = OV.id
LEFT JOIN tb_organisaties O ON A.organisatie_id = O.id
WHERE (A.organisatie_id IN ({$ambitieorgs}) OR A.id IS NULL)
JOIN tb_ambities A ON A.orgversie_id = OV.id
JOIN tb_organisaties O ON A.organisatie_id = O.id
WHERE A.organisatie_id IN ({$ambitieorgs})
AND OV.organisatie_id IN ({$toporgs})
AND OV.id = {$orgversieid}
AND OV.actief = 1
AND Y.disabled = 'F'
ORDER BY soort
LIMIT 1 ";
application/models/monpas/Orgversies_model.php
+14
View File
@@ -265,6 +265,20 @@ class Orgversies_model extends MY_Model{
return $this->get_query_result();
}
function getAmbitieVersie($toporgs, $moduleid){
$this->sql = "SELECT
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
FROM tb_orgversies OV
JOIN tb_versies V ON OV.versie_id = V.id
WHERE OV.organisatie_id IN ({$toporgs})
AND V.modulenr = {$moduleid}
AND OV.actief = 1 ";
return $this->get_query_row();
}
}