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

Merge branch 'terugdraaienDatumbeperkingCS' into develop

Browse Source
This commit is contained in:
Monique
2025-01-27 11:45:35 +01:00
parent e31c562639 b834f841bf
commit 6ea531473c
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/compactsop/Compacteversies.php
+2 -2
View File
@@ -213,7 +213,7 @@ class Compacteversies
if($this->onderdeel->type != "LIJST" && $this->onderdeel->type != "LIJSTBREED") return;
$this->onderdeel->erZijnOrgVersies = 'F';
$this->onderdeel->gegevens = 'F';
$orgversies = $this->CI->Orgversies_model->getOrgversiesBijSOP($this->swvID, $this->onderdeel->modulenr, $this->schooljaar->eind);
$orgversies = $this->CI->Orgversies_model->getOrgversiesBijSOP($this->swvID, $this->onderdeel->modulenr);
if($orgversies){
$this->onderdeel->erZijnOrgVersies = 'T';
@@ -223,7 +223,7 @@ class Compacteversies
private function setGeopendeVersies(){
if($this->onderdeel->type != "LIJST" && $this->onderdeel->type != "LIJSTBREED") return;
$this->onderdeel->geopendeversies = $this->CI->Filledversions_model->getfilledversions_bij_orglist(
$this->orglist, $this->onderdeel->modulenr, $this->schooljaar->eind);
$this->orglist, $this->onderdeel->modulenr);
}
private function loopGeopendeVersies(){
application/models/monpas/Filledversions_model.php
+1 -3
View File
@@ -81,7 +81,7 @@ class Filledversions_model extends MY_Model{
}
function getfilledversions_bij_orglist($orglist, $modulenr, $schooljaareind){
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,
@@ -93,8 +93,6 @@ class Filledversions_model extends MY_Model{
JOIN tb_versies V ON V.id =OV.versie_id
WHERE FV.organisatie_id IN ({$orglist})
AND V.modulenr = {$modulenr}
AND OV.invullentm <= '{$schooljaareind}'
ORDER BY OV.actief DESC, OV.periodenummer DESC ";
return $this->get_query_result();
application/models/monpas/Orgversies_model.php
+1 -3
View File
@@ -187,15 +187,13 @@ class Orgversies_model extends MY_Model{
return $this->get_query_result();
}
function getOrgVersiesBijSop($swvid, $modulenr, $schooljaareind){
function getOrgVersiesBijSop($swvid, $modulenr){
$this->sql = "SELECT OV.id,V.naam
FROM tb_orgversies OV
JOIN tb_versies V ON V.id =OV.versie_id
JOIN tb_organisaties O ON OV.organisatie_id = O.id
WHERE (O.id = {$swvid} OR O.valtonder_id = {$swvid})
AND V.modulenr = {$modulenr}
AND OV.invullentm <='{$schooljaareind}'
";
return $this->get_query_result();
application/views/monpas/compactsop/ijktabelcompact.php
+2 -2
View File
@@ -171,7 +171,7 @@
min:0,
max: 100,
y: 20,
title: false,
title: ' ',
labels:{
skew3d: true,
style:{
@@ -230,7 +230,7 @@
<div class="sopKaderTabel" >
<?php if ($data['lijsten'][0]->scores){ ?>
<table class="sopTabel" style="width:355px; " >
<table class="sopTabel" style="width:355px; margin-bottom: 0 " >
<thead >
<tr style="">
<th style="width: 20px; padding-left:3px; ">nr</th>