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

overzetten naar nieuwe versie

Browse Source
This commit is contained in:
Monique
2021-07-13 14:58:26 +02:00
parent 444829340a
commit 4db6e1bc4d
32 changed files with 1130 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Arrangementen_model.php
+4 -4
View File
@@ -86,18 +86,18 @@ class arrangementen_model extends MY_Model{
return $this->get_query_row();
}
function getAantalLeerlingenMetArrangement($schooljaarnr, $orgids){
$this->sql= "SELECT SUM(APA.aantal) as aantal
function getAantalLeerlingenMetArrangement($schooljaarnr, $orglist){
$this->sql= "SELECT SUM(APA.aantal) as aantal, COUNT(DISTINCT(ARR.organisatie_id)) AS orgsmetarrs
FROM tb_arrangementen_piv_aantal APA
JOIN tb_arrangementen ARR ON APA.arrangement_id = ARR.id
JOIN tb_aantalleerlingen A ON ARR.organisatie_id = A.organisatie_id
WHERE APA.schooljaarnr = {$schooljaarnr}
AND ARR.organisatie_id IN ({$orgids})
AND ARR.organisatie_id IN ({$orglist})
AND A.schooljaarnr = {$schooljaarnr}
AND A.meetellen = 'T'
GROUP BY APA.schooljaarnr ";
return $this->get_query_row('aantal');
return $this->get_query_row();
}
application/models/monpas/Compactsoponderdelen_model.php
+19 -10
View File
@@ -1,7 +1,6 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/** Sop_model juli 2019 */
class compactsoponderdelen_model extends MY_Model{
@@ -13,26 +12,36 @@ class compactsoponderdelen_model extends MY_Model{
$this->load->model($models);
}
function getOnderdelen(){
$this->sql = "SELECT *
FROM tb_compactsoponderdelen
ORDER BY nummer ";
function getOnderdelen($orgsoort){
$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}
ORDER BY S.toon_nummer ";
return $this->get_query_result();
}
function getOnderdeel($nummer, $orgsoort){
$this->sql = "SELECT C.naam, C.naamkort, S.pad, S.blokid, S.toon_nummer
FROM tb_compactsoponderdelen C
JOIN tb_compactonderdeel_piv_orgsoort S ON C.id = S.onderdeel_id
WHERE S.org_soort = {$orgsoort}
AND C.nummer = {$nummer} ";
return $this->get_query_row();
}
function getModuleMetLicentie($orgid, $onderdeelnummer){
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 CO.nummer = {$onderdeelnummer}
AND S.org_soort = {$orgsoort}
GROUP BY CO.nummer ";
return $this->get_query_row("modulenr");
}
}
application/models/monpas/Filledversions_model.php
+19 -2
View File
@@ -62,8 +62,7 @@ class Filledversions_model extends MY_Model{
function getfilledversionsperorg($orgid, $modulenr)
{
function getfilledversionsperorg($orgid, $modulenr){
// om de ingevulde lijsten per school op te halen
$this->sql = "SELECT DISTINCT(FV.orgversie_id) as id, OV.organisatie_id, periodenummer, OV.actief, versie_id, V.naam,
OV.vorm, OV.scoretype, OV.score_omschrijving,
@@ -82,6 +81,24 @@ class Filledversions_model extends MY_Model{
}
function getfilledversions_bij_orglist($orglist, $modulenr){
$this->sql = "SELECT DISTINCT(FV.orgversie_id) as id, OV.organisatie_id, periodenummer, OV.actief, versie_id, V.naam,
OV.vorm, OV.scoretype, OV.score_omschrijving,
DATE_FORMAT(geldigvanaf, '%d-%m-%Y') AS geldigvanaf,
DATE_FORMAT(geldigtm, '%d-%m-%Y') AS geldigtm,
DATE_FORMAT(invullentm, '%d-%m-%Y') AS invullentm,
V.naam
FROM tb_filledversions FV
JOIN tb_orgversies OV ON OV.id = FV.orgversie_id
JOIN tb_versies V ON V.id =OV.versie_id
WHERE FV.organisatie_id IN ({$orglist})
AND V.modulenr = {$modulenr}
ORDER BY OV.actief DESC, OV.periodenummer DESC ";
return $this->get_query_result();
}
function gettevergelijkenschoolversies($orgids, $modulenr){
// om de ingevulde lijsten per school op te halen
$this->sql =" SELECT DISTINCT (FV.orgversie_id) AS orgversieid, vorm, scoretype, (OV.versie_id) AS versieid, naam, A.omschrijving
application/models/monpas/Scores_model.php
+16 -1
View File
@@ -434,6 +434,21 @@ class Scores_model extends MY_Model{
return $lijst;
}
function fTelGevuldeVersiesBijOrglist($orgversieid, $orglist){
$this->sql =" SELECT COUNT(DISTINCT(Q.filledversion_id)) AS aantalFV, COUNT(DISTINCT(Q.organisatie_id)) AS aantalorgs
FROM(
SELECT S.filledversion_id, FV.organisatie_id
FROM tb_scores S
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
WHERE FV.orgversie_id = {$orgversieid}
AND FV.organisatie_id IN ({$orglist})
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5) AS Q ";
return $this->get_query_row();
}
function fCountGevuldeBestuurVersies($orgversieid, $bgid){
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal
FROM tb_scores S
@@ -445,7 +460,7 @@ class Scores_model extends MY_Model{
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5";
return $this->get_query_result('aantal');
return $this->get_query_row('aantal');
}
application/models/monpas/Sopinhouden_model.php
+1 -1
View File
@@ -164,7 +164,7 @@ class Sopinhouden_model extends MY_Model{
// $content = '';
$versie = "";
$result = $this->getOntwikkelagenda($profielid, 4,$targetversieid);
if($result ) {
if($result) {
$versie = $result['targetversie'];
}
$imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test', FALSE, FALSE, array(650, 300));
application/models/monpas/Tlvs_model.php
+4 -4
View File
@@ -39,16 +39,16 @@ class tlvs_model extends MY_Model{
return $this->get_query_result();
}
function getAantalTLVsSop($schooljaarnr, $orgid){
$this->sql = "SELECT SUM(COALESCE(T.aantal, 0)) as aantal
function getAantalTLVsSop($schooljaarnr, $orglist){
$this->sql = "SELECT SUM(COALESCE(T.aantal, 0)) as aantal, COUNT(DISTINCT(T.organisatie_id)) AS orgsmettlvs
FROM tb_tlvs T
JOIN tb_schooljaren S ON T.schooljaarnr = S.schooljaarnr
JOIN tb_aantalleerlingen A ON T.organisatie_id = A.organisatie_id
WHERE T.organisatie_id = {$orgid}
WHERE T.organisatie_id IN ({$orglist})
AND T.schooljaarnr = {$schooljaarnr}
AND A.schooljaarnr = {$schooljaarnr}
AND A.meetellen = 'T' ";
return $this->get_query_row('aantal');
return $this->get_query_row();
}
application/models/shared/Aantalleerlingen_model.php
+5 -3
View File
@@ -42,20 +42,22 @@ class aantalleerlingen_model extends MY_Model{
return $this->get_query_result();
}
function get_gevuldeschooljaren_Sop($schooljaarnr, $schoolid){
$this->sql= " SELECT A.schooljaarnr, S.naam
function get_gevuldeschooljaren_Sop($schooljaarnr, $orglist){
$this->sql= " SELECT A.schooljaarnr, S.naam, COUNT(A.organisatie_id) AS orgsmetlln
FROM tb_schooljaren S
JOIN tb_aantalleerlingen A ON S.schooljaarnr = A.schooljaarnr
WHERE A.organisatie_id = {$schoolid}
WHERE A.organisatie_id IN ({$orglist})
AND A.aantal > 0
AND A.schooljaarnr <= {$schooljaarnr}
AND A.meetellen = 'T'
GROUP BY A.schooljaarnr
ORDER BY A.schooljaarnr DESC";
return $this->get_query_result();
}
function get_omvang($schooljaarnr, $orgs){
$this->sql=" SELECT A.schooljaarnr, S.naam, SUM(A.aantal) as aantal
FROM tb_schooljaren S