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

fouten grafieken omvang + ruimere layout lijst

Browse Source
This commit is contained in:
Monique
2022-03-28 13:42:36 +02:00
parent 8140d01a53
commit 4a4275f485
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+3 -1
View File
@@ -67,7 +67,9 @@ class MY_Controller extends CI_Controller{
// public $version = '1.17.90'; // sops ordenen per eigen criterium // public $version = '1.17.90'; // sops ordenen per eigen criterium
// public $version = '1.17.91'; // grafieken in 3d // public $version = '1.17.91'; // grafieken in 3d
// public $version = '1.17.92'; // Scan en Verbeteraanpak Pa.O.in Compact Sop // public $version = '1.17.92'; // Scan en Verbeteraanpak Pa.O.in Compact Sop
public $version = '1.17.93';// stuur bijlage bij new wachtwoord // public $version = '1.17.93';// stuur bijlage bij new wachtwoord
public $version = '1.17.94';// verbeteringen invullijst, fout omvang
public $partituurid; public $partituurid;
public $globProfielVersieID = 1; public $globProfielVersieID = 1;
application/views/monpas/pages/monitor.php
+33 -29
View File
@@ -48,52 +48,55 @@
<tr > <tr >
<td colspan = 2> <td colspan = 2>
<!-- ko if: $parent.selectedOrgversion() && $parent.selectedOrgversion().toonOmschrijving()== false --> <!-- ko if: $parent.selectedOrgversion() && $parent.selectedOrgversion().toonOmschrijving()== false -->
<table style="width:100%"> <table style="width:100%" data-bind="foreach: indicatorscores">
<tr> <thead data-bind="visible: $index() == 0">
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right" <tr>
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> nr <th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
</th> data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'} "> nr
<th class="header2" style="width: 50%;padding-left: 2px" </th>
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}">indicator <th class="header2" style="padding-left: 2px"
</th> data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
<th class="header2" style="width: 40%;padding-left: 2px;text-align:left" attr: {width: scoretype > 5 ? '65%': '72%' } ">
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> score </th>
</th> <th class="header2" style="padding-left: 2px;text-align:left"
</tr> data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
<tbody data-bind="foreach: indicatorscores"> attr: {width: scoretype > 5 ? '32%': '22%'} "> score
<tr style="border-bottom: 1px solid #ebebeb"> </th>
<td style="text-align:right;vertical-align:top" data-bind="text: nummer, </tr>
</thead>
<tbody >
<tr style="border-bottom: 1px solid #ebebeb; ">
<td style="text-align:right;vertical-align:top; padding-top: 5px;" data-bind="text: nummer,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }"> style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }">
</td> </td>
<td data-bind="text: omschrijving, <td data-bind="text: omschrijving,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top"> style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top; padding-top: 5px;">
</td> </td>
<td> <td style="vertical-align:top; padding-top: 5px;" >
<div class="nietVoorPdf">
<span data-bind="visible: scoretype==1"> <span class="nietVoorPdf" data-bind="visible: scoretype==1">
<input class="rapport" <input class="rapport"
data-bind="textInput: score, data-bind="textInput: score,
event:{input: $root.fUpdateScoretype12}, event:{input: $root.fUpdateScoretype12},
enable: $root.editok() && $parent.disabled() == false, enable: $root.editok() && $parent.disabled() == false,
attr:{'id' : $index}" /> attr:{'id' : $index}" />
</span> </span>
</div>
<div class="alleenVoorPdf"> <span class="alleenVoorPdf" data-bind="visible: scoretype==1 || scoretype == 2,
<span data-bind="visible: scoretype==1 || scoretype == 2,
text: score"> text: score">
</span> </span>
</div>
<div class="nietVoorPdf">
<span data-bind="visible: scoretype == 2"> <span class="nietVoorPdf"data-bind="visible: scoretype == 2">
<input class="integer" <input class="integer"
data-bind="textInput: score, data-bind="textInput: score,
event:{input: $root.fUpdateScoretype12}, event:{input: $root.fUpdateScoretype12},
visible: scoretype==2, visible: scoretype==2,
enable: $root.editok() && $parent.disabled() == false" /> % enable: $root.editok() && $parent.disabled() == false" /> %
</span> </span>
</div>
<div data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 || scoretype==7 ">
<span data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 || scoretype==7 ">
<!-- ko if: $parent.disabled() == false --> <!-- ko if: $parent.disabled() == false -->
<!-- ko foreach: $root.scoreopties --> <!-- ko foreach: $root.scoreopties -->
<!-- ko if: $parent.scoretype == type --> <!-- ko if: $parent.scoretype == type -->
@@ -103,7 +106,7 @@
event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)}, event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)},
attr: {'name': $parent.id , 'value': value, 'checked': value == $parent.score()}, attr: {'name': $parent.id , 'value': value, 'checked': value == $parent.score()},
enable: $root.editok() " /> enable: $root.editok() " />
<span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span> <span style="vertical-align:top; display: inline-block; margin-left:5px;margin-right: 20px;" data-bind="text: optie"> </span>
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
@@ -113,10 +116,11 @@
<input type='radio' <input type='radio'
data-bind="checked: $parent.score(), data-bind="checked: $parent.score(),
enable: false " /> enable: false " />
<span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span> <span style="vertical-align:top; display: inline-block; margin-left:5px; margin-right: 20px;" data-bind="text: optie"> </span>
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
public/js/monpas/models/omvangmodel.js
+6 -6
View File
@@ -372,8 +372,8 @@ mh.initOmvangModel = function(){
aantal.push(Number(o.aantalleerlingen)); aantal.push(Number(o.aantalleerlingen));
var aantalsbo = 0; var aantalsbo = 0;
var aantalso = 0; var aantalso = 0;
if(o.licht) aantalsbo = Number(o.licht); if(o.licht()) aantalsbo = Number(o.licht());
if(o.zwaar) aantalsbo = aantalsbo + Number(o.zwaar); if(o.zwaar()) aantalsbo = aantalsbo + Number(o.zwaar());
datasbo.push(Number(aantalsbo) > 0 ? Number(aantalsbo) : null); datasbo.push(Number(aantalsbo) > 0 ? Number(aantalsbo) : null);
if(o.laag()) aantalso = (Number(o.laag())); if(o.laag()) aantalso = (Number(o.laag()));
if(o.midden()) aantalso = aantalso + Number(o.midden()); if(o.midden()) aantalso = aantalso + Number(o.midden());
@@ -644,7 +644,7 @@ mh.initOmvangModel = function(){
chart: { chart: {
plotBackgroundColor: null, plotBackgroundColor: null,
plotBorderWidth: null, plotBorderWidth: null,
height: 800, height: 850,
plotShadow: false, plotShadow: false,
type: 'pie', type: 'pie',
margin: [0, 0, 0, 0], margin: [0, 0, 0, 0],
@@ -683,10 +683,10 @@ mh.initOmvangModel = function(){
padding: 0, padding: 0,
verticalAlign: 'top', verticalAlign: 'top',
floating: false, floating: false,
x: -5, x: 0,
y: 260, y: 260,
width: 350, // width: 350,
height: 500, // height: 500,
itemWidth: breedte, itemWidth: breedte,
itemDistance: 0, itemDistance: 0,