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

Merge branch 'feature/alleInstrumenteninCompactSop' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-05-24 21:34:16 +02:00
parent 8f54333a55 a08028d5b6
commit e5ccf831ec
7 changed files with 1845 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+1 -2
View File
@@ -71,8 +71,7 @@ class MY_Controller extends CI_Controller{
// public $version = '1.17.95';// verbeteringen invullijst, fout omvang // public $version = '1.17.95';// verbeteringen invullijst, fout omvang
// public $version = '1.17.96';// nieuwe handleidingen // public $version = '1.17.96';// nieuwe handleidingen
// public $version = '1.17.97';// omvang geen grafiek bij 0 resultaten // public $version = '1.17.97';// omvang geen grafiek bij 0 resultaten
// public $version = '1.17.98';// instrumenten voor ouders public $version = '1.18.00';// alle instrumenten in compact sop
public $version = '1.17.99';// instrumenten ook voor leerlingen
application/libraries/monpas/compactsop/Compacteversies.php
-4
View File
@@ -194,10 +194,6 @@ class Compacteversies
private function setBudgetten($index){ private function setBudgetten($index){
if($this->onderdeel->type != "FIN") return; if($this->onderdeel->type != "FIN") return;
if($this->schooljaarnr < 8 && $this->onderdeel->modulenr == 30) {
$this-> indexFin = $index;
return;
}
$this->onderdeel->budgetversies = []; $this->onderdeel->budgetversies = [];
$this->budgetten = $this->CI->Finbestemmingen_model->getTotaalSchoolBestedingen($this->CI->globorgid, $this->jaarnr1); $this->budgetten = $this->CI->Finbestemmingen_model->getTotaalSchoolBestedingen($this->CI->globorgid, $this->jaarnr1);
application/models/monpas/Compactsoponderdelen_model.php
+1 -1
View File
@@ -44,7 +44,7 @@ class compactsoponderdelen_model extends MY_Model{
WHERE L.orgid = {$orgid} WHERE L.orgid = {$orgid}
AND SOP.in_sop = 'T' AND SOP.in_sop = 'T'
AND ((M.instrument_type <> 'FIN' && M.instrument_type <> 'DIV') || O.soort = 4 ) AND ((M.instrument_type <> 'FIN' && M.instrument_type <> 'DIV') || O.soort = 4 )
ORDER BY ordening, instrument"; ORDER BY naam ";
return $this->get_query_result(); return $this->get_query_result();
} }
function getOnderdeel($nummer, $orgsoort){ function getOnderdeel($nummer, $orgsoort){
application/views/monpas/compactsop/ijktabelbreed.php
+1
View File
@@ -171,6 +171,7 @@
yAxis: { yAxis: {
min:0, min:0,
max: 100, max: 100,
y: 20,
title: false, title: false,
labels:{ labels:{
skew3d: true, skew3d: true,
application/views/monpas/compactsop/ijktabelcompact.php
+1
View File
@@ -160,6 +160,7 @@
xAxis: { xAxis: {
type: 'category', type: 'category',
categories: xas, categories: xas,
y: 20,
labels:{ labels:{
skew3d: true, skew3d: true,
style:{ style:{
application/views/monpas/compactsop/omvangcompact.php
+16 -20
View File
@@ -6,7 +6,7 @@
<!--voor scholen--> <!--voor scholen-->
<?php if($orgsoort == 'School'): ?> <?php if($orgsoort == 'School'): ?>
<div class="sopOnderdeelBlok"> <div class="sopOnderdeelBlok">
<div class="sopTitelHolder " > <div class="sopTitelHolder " >
<?php if($naam): ?> <?php if($naam): ?>
<p class="sopTitel"><?php echo $naam ?></p> <p class="sopTitel"><?php echo $naam ?></p>
<?php endif ?> <?php endif ?>
@@ -28,10 +28,7 @@
?></span> ?></span>
</div> </div>
<?php endif ?> <?php endif ?>
</div> </div>
<div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;"> <div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
<?php if ((!$data[0]->tlvs && !isset($data[1] ))|| (!$data[0]->tlvs && isset($data[1]) && !$data[1]->tlvs )):?> <?php if ((!$data[0]->tlvs && !isset($data[1] ))|| (!$data[0]->tlvs && isset($data[1]) && !$data[1]->tlvs )):?>
@@ -43,7 +40,6 @@
<span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span> <span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span>
</div> </div>
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
<div id="<?= $chartid. 'tlvs' ?>" style="width: 300px; height: 145px;"> <div id="<?= $chartid. 'tlvs' ?>" style="width: 300px; height: 145px;">
</div> </div>
</div> </div>
@@ -53,7 +49,7 @@
</div> </div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[0]->tlvs) : ?> <?php if($data[0]->tlvs) : ?>
<div id="<?= $chartid. 'tlvs' ?>" style="width: 175px; height: 145px; margin: 0 auto; padding: 0"> <div id="<?= $chartid. 'tlvs' ?>" style="width: 175px; height: 130px; margin: 0 auto; padding: 0">
</div> </div>
<?php else : ?> <?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div> <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
@@ -61,7 +57,7 @@
</div> </div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[1]->tlvs) : ?> <?php if($data[1]->tlvs) : ?>
<div id="<?= $chartid. 'tlvsII' ?>" style="width: 175px; height: 145px; margin: 0 auto;padding: 0"> <div id="<?= $chartid. 'tlvsII' ?>" style="width: 175px; height: 130px; margin: 0 auto;padding: 0">
</div> </div>
<?php else : ?> <?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div> <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
@@ -78,7 +74,7 @@
<span class="subTitel2" style="padding: 0">Leerlingen per arrangement</span> <span class="subTitel2" style="padding: 0">Leerlingen per arrangement</span>
</div> </div>
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0 auto ; padding: 0"> <div class="col-xs-12" style="border: 1px #ff0000; margin: 0 auto ; padding: 0">
<div id="<?= $chartid. 'arrs' ?>" style="width: 300px; height: 145px;"> <div id="<?= $chartid. 'arrs' ?>" style="width: 300px; height: 130px;">
</div> </div>
</div> </div>
<?php else: ?> <?php else: ?>
@@ -87,7 +83,7 @@
</div> </div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[0]->arrangementen) : ?> <?php if($data[0]->arrangementen) : ?>
<div id="<?= $chartid. 'arrs' ?>" style="width: 175px; height: 145px; margin: 0 auto; padding: 0"> <div id="<?= $chartid. 'arrs' ?>" style="width: 175px; height: 130px; margin: 0 auto; padding: 0">
</div> </div>
<?php else : ?> <?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen arrangementen</div> <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen arrangementen</div>
@@ -95,10 +91,11 @@
</div> </div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0 auto; padding: 0"> <div class="col-xs-6" style="border: 1px #ff0000; margin: 0 auto; padding: 0">
<?php if($data[1]->arrangementen) : ?> <?php if($data[1]->arrangementen) : ?>
<div id="<?= $chartid. 'arrsII' ?>" style="width: 175px; height: 145px; margin: 0 auto; padding: 0"> <div id="<?= $chartid. 'arrsII' ?>" style="width: 175px; height: 130px; margin: 0 auto; padding: 0">
</div> </div>
<?php else : ?> <?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen arrangementen</div> <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen arrangementen
</div>
<?php endif ?> <?php endif ?>
</div> </div>
<?php endif ?> <?php endif ?>
@@ -267,6 +264,8 @@
backgroundColor: 'transparent', backgroundColor: 'transparent',
plotBorderWidth: null, plotBorderWidth: null,
plotShadow: false, plotShadow: false,
height: 120,
width: 290,
type: 'pie', type: 'pie',
margin: [0,-10, 0, -80], margin: [0,-10, 0, -80],
options3d: { options3d: {
@@ -321,11 +320,10 @@
} }
</script> </script>
</div> </div>
<?php endif ?> <?php endif ?>
<!--end scholen--> <!--end scholen-->
<!--voor besturen,kamers en swv--> <!--voor besturen,kamers en swv-->
<?php if($orgsoort != 'School'): ?> <?php if($orgsoort != 'School'): ?>
<div class="sopOnderdeelBlok"> <div class="sopOnderdeelBlok">
@@ -354,7 +352,7 @@
<div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;"> <div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
<div id="<?= $chartid. 'omvangchart' ?>" style="height:150px;"></div> <div id="<?= $chartid. 'omvangchart' ?>" style="height:145px;"></div>
</div> </div>
</div> </div>
<div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;"> <div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
@@ -369,7 +367,7 @@
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
<div id="<?= $chartid. 'tlvs' ?>" <div id="<?= $chartid. 'tlvs' ?>"
style=" height: 150px;"> style=" height: 145px;">
</div> </div>
</div> </div>
<?php else: ?> <?php else: ?>
@@ -378,7 +376,7 @@
</div> </div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[0]->tlvs) : ?> <?php if($data[0]->tlvs) : ?>
<div id="<?= $chartid. 'tlvs' ?>" style="width: 175px; height: 150px; margin: 0 auto; padding: 0"> <div id="<?= $chartid. 'tlvs' ?>" style="width: 175px; height: 145px; margin: 0 auto; padding: 0">
</div> </div>
<?php else : ?> <?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div> <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
@@ -386,7 +384,7 @@
</div> </div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0"> <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[1]->tlvs) : ?> <?php if($data[1]->tlvs) : ?>
<div id="<?= $chartid. 'tlvsII' ?>" style="width: 175px; height: 150px; margin: 0 auto;padding: 0"> <div id="<?= $chartid. 'tlvsII' ?>" style="width: 175px; height: 145px; margin: 0 auto;padding: 0">
</div> </div>
<?php else : ?> <?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div> <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
@@ -748,9 +746,7 @@
}); });
} }
}); });
<?php endif; ?>
</script> </script>
</div> </div>
<?php endif; ?>
<!--end besturen, kamers en swv--> <!--end besturen, kamers en swv-->
application/views/monpas/compactsop/tijdelijk.php
+1825
View File
File diff suppressed because it is too large Load Diff