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

Verbetraanpak $ Scan Zorg in compacsop

Browse Source
This commit is contained in:
Monique
2022-03-10 15:36:54 +01:00
parent 4aac5f8c25
commit c00ffa6600
6 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/compactsop/Compacteonderdelen.php
+5 -1
View File
@@ -193,6 +193,9 @@ class Compacteonderdelen
case 10: case 10:
$this->setDiversiteit(); $this->setDiversiteit();
break; break;
case 11:
case 12: $this->setIJkpunten();
break;
} }
} }
@@ -435,7 +438,8 @@ class Compacteonderdelen
if($this->data){ if($this->data){
$this->onderdeel['data'] = $this->onderdeel['data'] =
['data' =>$this->data, ['data' =>$this->data,
'naam' =>$result->naam ]; 'naam' =>$result->naam,
'chartid'=>$result->blokid];
} }
} }
application/views/monpas/compactsop/ijktabelcompact.php
+6 -4
View File
@@ -16,10 +16,12 @@
<?php }; ?> <?php }; ?>
<?php }; ?> <?php }; ?>
</div> </div>
<?php if($chartid){ ?>
<div class="sopKaderGrafiek highcharts-background" <div class="sopKaderGrafiek highcharts-background"
id="chartCompactIJk" id="<?= $chartid ?>"
style="width: 355px; height:140px; background-color: #ffffff; text-align:center"> style="width: 355px; height:140px; background-color: #ffffff; text-align:center">
</div> </div>
<?php }; ?>
<script> <script>
<?php if ($data['lijsten']){ ?> <?php if ($data['lijsten']){ ?>
$(function(){ $(function(){
@@ -134,7 +136,7 @@
var ijkgrafiek; var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartCompactIJk', { ijkgrafiek = Highcharts.chart('<?= $chartid ?>', {
chart:{ chart:{
width:350, width:350,
animation: false, animation: false,
@@ -217,11 +219,11 @@
<div class="sopKaderTabel" > <div class="sopKaderTabel" >
<?php if ($data['lijsten'][0]->scores){ ?> <?php if ($data['lijsten'][0]->scores){ ?>
<table class="sopTabel" > <table class="sopTabel" style="width:355px; " >
<thead > <thead >
<tr style=""> <tr style="">
<th style="width: 20px; padding-left:3px; ">nr</th> <th style="width: 20px; padding-left:3px; ">nr</th>
<th style="width: 230px; padding-left:3px; "> <?=$data['lijsten'][0]->label?></th> <th style="width: 275px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; padding-left:3px; "> <?=$data['lijsten'][0]->label?></th>
<?php foreach ($data['lijsten'] as $lijst){ ?> <?php foreach ($data['lijsten'] as $lijst){ ?>
<th style=" width: 30px; <th style=" width: 30px;
application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+4 -10
View File
@@ -11,7 +11,7 @@
<div class="col-xs-4" > <div class="col-xs-4" >
<div class="panel-group" data-bind="foreach: onderdelen "> <div class="panel-group" data-bind="foreach: onderdelen ">
<!-- ko if: (toonnummer <= 4 && $parent.orgsoortnummer() == 4) || <!-- ko if: (toonnummer <= 5 && $parent.orgsoortnummer() == 4) ||
(toonnummer <= 3 && $parent.orgsoortnummer() != 4) --> (toonnummer <= 3 && $parent.orgsoortnummer() != 4) -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?> <?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko --> <!-- /ko -->
@@ -21,7 +21,7 @@
<div class="col-xs-4" <div class="col-xs-4"
style="border-right: 1px solid lightgrey"> style="border-right: 1px solid lightgrey">
<div class="panel-group" data-bind="foreach: onderdelen "> <div class="panel-group" data-bind="foreach: onderdelen ">
<!-- ko if: (toonnummer > 4 && $parent.orgsoortnummer() == 4) || <!-- ko if: (toonnummer > 5 && $parent.orgsoortnummer() == 4) ||
(toonnummer > 3 && $parent.orgsoortnummer() != 4) --> (toonnummer > 3 && $parent.orgsoortnummer() != 4) -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?> <?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko --> <!-- /ko -->
@@ -36,10 +36,7 @@
style="background-color:#930f50; style="background-color:#930f50;
color: white; padding: 10px; margin: 5px; color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; "> margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top" <label style="padding-top: 15px; width: 50px; font-size: small;"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() "> data-bind="text: naamkort2() ">
</label> </label>
</div> </div>
@@ -49,10 +46,7 @@
data-bind="click: $root.fAnnuleerOnderdeel" data-bind="click: $root.fAnnuleerOnderdeel"
style="background-color:#930f50; color: white; style="background-color:#930f50; color: white;
margin: 5px; padding: 10px; height: 150px; "> margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top" <label style="padding-top: 15px; width: 50px; font-size: small;"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() "> data-bind="text: naamkort2() ">
</label> </label>
</div> </div>
application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+5 -11
View File
@@ -15,14 +15,14 @@
backgroundColor : kleur() }, backgroundColor : kleur() },
attr: {title : naam}, attr: {title : naam},
click: $root.fHiernaartoe" click: $root.fHiernaartoe"
style="margin-bottom: 5px; height: 150px; padding: 10px; border: 1px solid lightgrey; color: grey; background-color: transparent; position: relative"> style="margin-bottom: 5px; height: 150px; padding: 10px; border: 1px solid lightgrey; color: grey; background-color: transparent; position: relative">
<div data-bind="visible: !gevuld()"> <div data-bind="visible: !gevuld()">
<div style="color: grey; background-color: transparent;" data-bind="text: bloknummer()"> <div style="color: grey; background-color: transparent;" data-bind="text: bloknummer()">
</div> </div>
</div> </div>
<div data-bind="visible: gevuld()"> <div data-bind="visible: gevuld()">
<div style="color: white; " data-bind="text: toonnummer()+ ' '+ naamkort2()"> <div style="color: white; font-size: small " data-bind="text: naamkort2()">
</div> </div>
</div> </div>
</div> </div>
@@ -39,7 +39,7 @@
</div> </div>
</div> </div>
<div data-bind="visible: gevuld()"> <div data-bind="visible: gevuld()">
<div style="color: white; " data-bind="text: toonnummer() + ' '+ naamkort2()"> <div style="color: white; font-size: small " data-bind="text: naamkort2()">
</div> </div>
</div> </div>
</div> </div>
@@ -68,10 +68,7 @@
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'}" style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'}"
style =" color: white; padding: 10px; margin: 5px; style =" color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; "> margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top" <label style="padding-top: 15px; width: 50px; font-size: small"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() "> data-bind="text: naamkort2() ">
</label> </label>
</div> </div>
@@ -83,10 +80,7 @@
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'}," style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'},"
style="color: white; style="color: white;
margin: 5px; padding: 10px; height: 150px; "> margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top" <label style="padding-top: 15px; width: 50px; font-size: small"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() "> data-bind="text: naamkort2() ">
</label> </label>
</div> </div>
application/views/monpas/compactsop/paginacompact.php
+4 -5
View File
@@ -589,7 +589,7 @@
} }
.sopKaderTabel { .sopKaderTabel {
width : 100%; width : 95%;
height : 225px; height : 225px;
font-size : 0.65em !important; font-size : 0.65em !important;
font-weight : normal; font-weight : normal;
@@ -597,14 +597,13 @@
.sopTabel{ .sopTabel{
border-collapse : collapse; border-collapse : collapse;
margin-top : 0; margin-top : 0;
margin-bottom : 10px; margin-bottom : 10px;
margin-left : auto; margin-left : auto;
margin-right : auto; margin-right : auto;
table-layout : fixed; table-layout : fixed;
overflow-y : hidden; overflow : hidden;
} }
.sopTabel thead tr th { .sopTabel thead tr th {
@@ -673,7 +672,7 @@
margin-left : 10px; margin-left : 10px;
max-height : 95%; max-height : 95%;
min-width: : 70%; min-width: : 70%;
max-width : 100%; max-width : 95%;
font-size : 0.7em; font-size : 0.7em;
} }
public/js/monpas/models/compactsopmodel.js
+13 -13
View File
@@ -29,18 +29,19 @@ mh.initCompactSopModel = function(){
this.geenLicentie = ko.observable(o.licentie == "T" ? false : true); this.geenLicentie = ko.observable(o.licentie == "T" ? false : true);
this.naam = o.naam; this.naam = o.naam;
this.naamkort2 = ko.observable(o.naamkort); this.naamkort2 = ko.observable(o.naamkort);
switch(o.nummer){ // switch(o.nummer){
case '1': dit.naamkort2('Diversiteit'); break; // case '1': dit.naamkort2('Diversiteit'); break;
case '2': dit.naamkort2('Bas.Ond.'); break; // case '2': dit.naamkort2('Bas.Ond.'); break;
case '3': dit.naamkort2('Omvang Ond.');break; // case '3': dit.naamkort2('Omvang Ond.');break;
case '4': dit.naamkort2('Kwal. Ond.'); break; // case '4': dit.naamkort2('Kwal. Ond.'); break;
case '5': dit.naamkort2('Exp.Team'); break; // case '5': dit.naamkort2('Exp.Team'); break;
case '6': dit.naamkort2('Tevr. School'); break; // case '6': dit.naamkort2('Tevr. School'); break;
case '7': dit.naamkort2('Middelen'); break; // case '7': dit.naamkort2('Middelen'); break;
case '8': dit.naamkort2('Passend Ond.'); break; // case '8': dit.naamkort2('Passend Ond.'); break;
case '9': dit.naamkort2('Exp. SO & SBO'); break; // case '9': dit.naamkort2('Exp. SO & SBO'); break;
case '10': dit.naamkort2('Diversiteit'); break; // case '10': dit.naamkort2('Diversiteit'); break;
} // case
// }
this.groepen = ko.observable(o && o.groepen && o.groepen > 8 ? o.groepen : 0); this.groepen = ko.observable(o && o.groepen && o.groepen > 8 ? o.groepen : 0);
this.schooltype = o.schooltype; this.schooltype = o.schooltype;
this.modulenr = o.modulenr; this.modulenr = o.modulenr;
@@ -336,7 +337,6 @@ mh.initCompactSopModel = function(){
case '4': self.orgsoort('School'); case '4': self.orgsoort('School');
self.label('SOP'); self.label('SOP');
break; break;
} }
} }
self.druk(true); self.druk(true);