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-10-25 13:43:24 +02:00
parent ab9a53542e
commit 5dfba96fc6
8 changed files with 308 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Ambities_model.php
+33 -22
View File
@@ -103,31 +103,42 @@ class Ambities_model extends MY_Model{
return $ambitie;
}
function get_ambities_orgversie($orgversieid, $ambitieorgs, $toporgs)
{
$this->sql = "
SELECT A.id,
A.gem_score AS gemscore,
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, OV.actief, V.naam,
O.soort
function mh_get_ambitie($moduleid, $ambitieorgs, $toporgs){
$this->sql = " SELECT COALESCE(A.id, 0) AS ambitieID,
COALESCE(A.gem_score, 80) 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,
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.id AS orgID,
CASE WHEN O.soort IS NULL THEN
'standaard'
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_ambities A ON A.orgversie_id = OV.id
JOIN tb_organisaties O ON A.organisatie_id = O.id
WHERE A.organisatie_id IN ({$ambitieorgs})
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)
AND OV.organisatie_id IN ({$toporgs})
AND OV.id = {$orgversieid}
AND V.modulenr = {$moduleid}
AND OV.actief = 1
AND Y.disabled = 'F'
ORDER BY soort DESC
LIMIT 1;
";
LIMIT 1 ";
return $this->get_query_result();
}
application/models/monpas/Orgversies_model.php
-23
View File
@@ -43,29 +43,6 @@ class Orgversies_model extends MY_Model{
return $this->get_query_result();
}
function getorgversies($toporgs, $module){
$this->sql="SELECT OV.id,
periodenummer,
OV.actief,
DATE_FORMAT(geldigvanaf,'%d-%m-%Y') as geldigvanaf,
DATE_FORMAT(geldigtm,'%d-%m-%Y') as geldigtm,
V.naam,
COUNT(Y.id) AS aantalY
FROM tb_orgversies OV
JOIN tb_versies V ON V.id = versie_id
JOIN tb_ijkpunten Y ON V.id = Y.versie_id
WHERE OV.organisatie_id IN ({$toporgs})
AND V.modulenr = {$module}
AND Y.disabled = 'F' ";
$this->sql .=" GROUP BY OV.id
ORDER BY periodenummer DESC";
return $this->get_query_result();
}
function getVersieinfo($orgversieid){
$this->sql="SELECT OV.id AS orgversieid,
OV.organisatie_id,
application/models/shared/Autorisatienivos_model.php
+12
View File
@@ -50,5 +50,17 @@ class Autorisatienivos_model extends MY_Model{
return $this->get_query_row('nivo');
}
function checkmanage($userid, $orgid){
$this->sql=" SELECT nivo
FROM tb_autorisatienivos AN
JOIN tb_autorisaties A ON A.nivo_id = AN.id
JOIN tb_orgusers OU ON OU.id = A.orguser_id
WHERE OU.user_id = {$userid}
AND OU.organisatie_id = {$orgid}
AND AN.nivo IN (1, 4, 16, 64, 256) ";
return $this->get_query_row('nivo');
}
}