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

Merge branch 'feature/compact9en10'

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-03-15 12:10:24 +01:00
parent 54b90d23eb c00ffa6600
commit e104faa9a0
8 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+9 -6
View File
@@ -59,12 +59,15 @@ class MY_Controller extends CI_Controller{
// public $version = '1.17.76'; // cluster scans passend onderwijs
// public $version = '1.17.79'; // fout matrixfunctie
// public $version = '1.17.83'; // sophomepage
// public $version = '1.17.84'; // scan passend onderwijs in compact sop.
// public $version = '1.17.85'; // printfunctie bij in te vullen lijsten
public $version = '1.17.86'; // 3dgrafieken
// public $version = '1.17.84'; // zichtbaarheid paginas afhankelijk van orgsoort
// public $version = '1.17.85'; // fouten divmeter po 2203 in compact
// public $version = '1.17.86'; // titels en headers sop
// public $version = '1.17.88'; // sopfout
// public $version = '1.17.89'; // printformulier
// public $version = '1.17.90'; // sops ordenen per eigen criterium
public $version = '1.17.91'; // grafieken in 3d
public $partituurid;
public $globProfielVersieID = 1;
public $userid; //id of the user that is logged in
application/libraries/monpas/compactsop/Compacteonderdelen.php
+5 -1
View File
@@ -193,6 +193,9 @@ class Compacteonderdelen
case 10:
$this->setDiversiteit();
break;
case 11:
case 12: $this->setIJkpunten();
break;
}
}
@@ -435,7 +438,8 @@ class Compacteonderdelen
if($this->data){
$this->onderdeel['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 }; ?>
</div>
<?php if($chartid){ ?>
<div class="sopKaderGrafiek highcharts-background"
id="chartCompactIJk"
id="<?= $chartid ?>"
style="width: 355px; height:140px; background-color: #ffffff; text-align:center">
</div>
<?php }; ?>
<script>
<?php if ($data['lijsten']){ ?>
$(function(){
@@ -134,7 +136,7 @@
var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartCompactIJk', {
ijkgrafiek = Highcharts.chart('<?= $chartid ?>', {
chart:{
width:350,
animation: false,
@@ -217,11 +219,11 @@
<div class="sopKaderTabel" >
<?php if ($data['lijsten'][0]->scores){ ?>
<table class="sopTabel" >
<table class="sopTabel" style="width:355px; " >
<thead >
<tr style="">
<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){ ?>
<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="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) -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko -->
@@ -21,7 +21,7 @@
<div class="col-xs-4"
style="border-right: 1px solid lightgrey">
<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) -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko -->
@@ -36,10 +36,7 @@
style="background-color:#930f50;
color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
<label style="padding-top: 15px; width: 50px; font-size: small;"
data-bind="text: naamkort2() ">
</label>
</div>
@@ -49,10 +46,7 @@
data-bind="click: $root.fAnnuleerOnderdeel"
style="background-color:#930f50; color: white;
margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
<label style="padding-top: 15px; width: 50px; font-size: small;"
data-bind="text: naamkort2() ">
</label>
</div>
application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+5 -11
View File
@@ -15,14 +15,14 @@
backgroundColor : kleur() },
attr: {title : naam},
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 style="color: grey; background-color: transparent;" data-bind="text: bloknummer()">
</div>
</div>
<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>
@@ -39,7 +39,7 @@
</div>
</div>
<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>
@@ -68,10 +68,7 @@
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'}"
style =" color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
<label style="padding-top: 15px; width: 50px; font-size: small"
data-bind="text: naamkort2() ">
</label>
</div>
@@ -83,10 +80,7 @@
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'},"
style="color: white;
margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
<label style="padding-top: 15px; width: 50px; font-size: small"
data-bind="text: naamkort2() ">
</label>
</div>
application/views/monpas/compactsop/paginacompact.php
+4 -5
View File
@@ -589,7 +589,7 @@
}
.sopKaderTabel {
width : 100%;
width : 95%;
height : 225px;
font-size : 0.65em !important;
font-weight : normal;
@@ -597,14 +597,13 @@
.sopTabel{
border-collapse : collapse;
margin-top : 0;
margin-bottom : 10px;
margin-left : auto;
margin-right : auto;
table-layout : fixed;
overflow-y : hidden;
overflow : hidden;
}
.sopTabel thead tr th {
@@ -673,7 +672,7 @@
margin-left : 10px;
max-height : 95%;
min-width: : 70%;
max-width : 100%;
max-width : 95%;
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.naam = o.naam;
this.naamkort2 = ko.observable(o.naamkort);
switch(o.nummer){
case '1': dit.naamkort2('Diversiteit'); break;
case '2': dit.naamkort2('Bas.Ond.'); break;
case '3': dit.naamkort2('Omvang Ond.');break;
case '4': dit.naamkort2('Kwal. Ond.'); break;
case '5': dit.naamkort2('Exp.Team'); break;
case '6': dit.naamkort2('Tevr. School'); break;
case '7': dit.naamkort2('Middelen'); break;
case '8': dit.naamkort2('Passend Ond.'); break;
case '9': dit.naamkort2('Exp. SO & SBO'); break;
case '10': dit.naamkort2('Diversiteit'); break;
}
// switch(o.nummer){
// case '1': dit.naamkort2('Diversiteit'); break;
// case '2': dit.naamkort2('Bas.Ond.'); break;
// case '3': dit.naamkort2('Omvang Ond.');break;
// case '4': dit.naamkort2('Kwal. Ond.'); break;
// case '5': dit.naamkort2('Exp.Team'); break;
// case '6': dit.naamkort2('Tevr. School'); break;
// case '7': dit.naamkort2('Middelen'); break;
// case '8': dit.naamkort2('Passend Ond.'); break;
// case '9': dit.naamkort2('Exp. SO & SBO'); break;
// case '10': dit.naamkort2('Diversiteit'); break;
// case
// }
this.groepen = ko.observable(o && o.groepen && o.groepen > 8 ? o.groepen : 0);
this.schooltype = o.schooltype;
this.modulenr = o.modulenr;
@@ -336,7 +337,6 @@ mh.initCompactSopModel = function(){
case '4': self.orgsoort('School');
self.label('SOP');
break;
}
}
self.druk(true);
public/js/monpas/models/monitormodel.js
-2
View File
@@ -312,8 +312,6 @@ $(function(){
var zichtbaar = document.getElementById("invulZichtbaar").outerHTML;
console.log( notitie, "notitie")
var sd = {
'module' : module,
'info' : info,