Merge branch 'feature/streefcijfersperorg' into develop
# Conflicts: # application/core/MY_Controller.php # application/libraries/monpas/Schoolafbeeldingen.php
This commit is contained in:
Monique
@@ -1,7 +1,8 @@
|
||||
<div class="col-sm-12 mainpagina submenupage" id ="pagcompactsop">
|
||||
<h2 data-bind="text: 'Compact ' + label()"></h2>
|
||||
|
||||
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/knoppenbalk"); ?>
|
||||
|
||||
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/knoppenbalk"); ?>
|
||||
|
||||
<div class="row" style="margin-left: 10px;" data-bind="visible: toonOnderdelen()">
|
||||
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/kiesonderdelen"); ?>
|
||||
|
||||
@@ -194,28 +194,22 @@
|
||||
</button>
|
||||
|
||||
|
||||
<div id="hc-chart1" style="min-width: 310px; height: 475px; margin: 0 auto" >
|
||||
<div id="hc-chart1" style="min-width: 310px; height: 525px; margin: 0 auto" >
|
||||
</div>
|
||||
|
||||
<canvas style="display: none" id="ijkpuntencanvas">
|
||||
</canvas>
|
||||
<div data-bind="with: selectedSerie()" style="margin-left: 50px;">
|
||||
<span style="font-weight: bold; "
|
||||
data-bind="text: 'Versie: ' + naam + ', scoretype: ' + scoreomschrijving ">
|
||||
</span>
|
||||
</div>
|
||||
<table style="margin-top: 5px; margin-left: 50px; " data-bind="foreach: lijsten" >
|
||||
<tr data-bind="visible: erzijnscores() == true">
|
||||
<td style="width: 30px; font-weight: bold" data-bind=" text: periodenummer"></td>
|
||||
<td style="padding-left:10px; "data-bind="text: ': ' + vantm + ', ' + wijik"></td>
|
||||
</tr>
|
||||
</table>
|
||||
<table style="margin-left: 50px; margin-bottom: 20px">
|
||||
<tr >
|
||||
<td style=" width: 30px; "><div style="border-bottom: 3px solid #404040; margin-bottom: 1px;"></div></td>
|
||||
<td style="padding-left:10px;">: ambitie</td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- <div data-bind="with: selectedSerie()" style="margin-left: 50px;">-->
|
||||
<!-- <span style="font-weight: bold; "-->
|
||||
<!-- data-bind="text: 'Versie: ' + naam + ', scoretype: ' + scoreomschrijving ">-->
|
||||
<!-- </span>-->
|
||||
<!-- </div>-->
|
||||
<!-- <table style="margin-top: 5px; margin-left: 50px; " data-bind="foreach: lijsten" >-->
|
||||
<!-- <tr data-bind="visible: erzijnscores() == true">-->
|
||||
<!-- <td style="width: 30px; font-weight: bold" data-bind=" text: periodenummer"></td>-->
|
||||
<!-- <td style="padding-left:10px; "data-bind="text: ': ' + vantm + ', ' + wijik"></td>-->
|
||||
<!-- </tr>-->
|
||||
<!-- </table>-->
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 ">
|
||||
@@ -446,14 +440,26 @@
|
||||
<div class="col-xs-12 "data-bind="visible: erzijnlijsten() == true">
|
||||
<div class="col-xs-5">
|
||||
<h4 style="margin-top: 30px; margin-left: 10px;">Ambities</h4>
|
||||
|
||||
<div data-bind="foreach: lijsten" style="margin: 5px">
|
||||
<div class="col-xs-11" style="background-color:#f5f0f2; padding: 5px; padding-left: 10px;border-radius: 2px" data-bind="visible: ambities() == true">
|
||||
<p style="font-weight: bold; margin-bottom: 10px" data-bind="text: vantm + ':'"></p>
|
||||
<p style="margin-bottom: 10px"data-bind="text: 'gemiddelde score ' + gemscore + '%' "></p>
|
||||
<p style="margin-bottom: 10px"data-bind="text: 'minimaal ' + ijkpunten + ' ' + label + ' op ' + zprocent + ' % of hoger' ">
|
||||
</p>
|
||||
|
||||
<!--ko if: $parent.eigenambitie() || $index() == 0 -->
|
||||
<div class="col-xs-11" style="background-color:#f5f0f2; padding: 5px; padding-left: 10px;border-radius: 2px">
|
||||
<!--ko if: $parent.eigenambitie() -->
|
||||
<span style="font-weight: bold; margin-bottom: 10px" data-bind="text: vantm + ':'"></span>
|
||||
<br>
|
||||
<!--/ko-->
|
||||
<span data-bind="text: 'gemiddelde score ' + gemscore + '%' "></span>
|
||||
<br>
|
||||
<span data-bind="text: 'minimaal ' + ijkpunten + ' ' + label + ' op ' + zprocent + ' % of hoger' ">
|
||||
</span>
|
||||
<br>
|
||||
|
||||
<span data-bind="text: ambitievan "></span>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
<!-- /ko-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,86 +1,131 @@
|
||||
<div class="col-sm-12 mainpagina" id ="pagstreefcijfers">
|
||||
<div class="row" >
|
||||
<div class="col-sm-12 col-md-3">
|
||||
<h3>Selecteer een organisatieniveau</h3>
|
||||
<table style="width:100%">
|
||||
<tbody data-bind="foreach: swv">
|
||||
<tr class="swv" data-bind=" css: {'selected' : $parent.selectedOrganisatie().id ==id},
|
||||
click:$parent.fSetSelected ">
|
||||
|
||||
<td style="width:100%"
|
||||
data-bind="text: naam"></td>
|
||||
|
||||
</tr>
|
||||
<tr data-bind="visible: kamers() !== undefined">
|
||||
|
||||
<td >
|
||||
<table style="width: 100%">
|
||||
<tbody data-bind="foreach: kamers">
|
||||
<tr class="kamer selectable"
|
||||
data-bind="css: {'selected' : $root.selectedOrganisatie().id ==id},
|
||||
click: $root.fSetSelected">
|
||||
<td style="width:5%"></td>
|
||||
<td style="width: 95%" data-bind="text: naam"></td>
|
||||
|
||||
</tr>
|
||||
<tr data-bind="visible: bgs() !== undefined ">
|
||||
<td></td>
|
||||
<td >
|
||||
<table style="width: 100%">
|
||||
<tbody data-bind="foreach: bgs">
|
||||
<tr class= "selectable"
|
||||
data-bind="css: {'selected' : $root.selectedOrganisatie().id ==id},
|
||||
click: $root.fSetSelected">
|
||||
|
||||
<td style="width: 100%" data-bind="text: naam"></td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-9" data-bind="visible: selectedOrganisatie().id !=0">
|
||||
<h4> Criteria voor scholen onder organisatie:
|
||||
<span data-bind="text: selectedOrganisatie().naam"></span>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-sm-12 " style="margin-bottom: 20px; margin-left: 50px;" >
|
||||
<h4 data-bind="text: instrument ? 'Streefcijfers voor de actieve lijst van het instrument ' + instrument() : ' ' ">
|
||||
</h4>
|
||||
<table style="width: 100%;">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:20px">nr</th>
|
||||
<th >versie</th>
|
||||
<th style="width:95px">van</th>
|
||||
<th style ="width:95px">t/m</th>
|
||||
<th style="width:100px"> gem.<br/>score</th>
|
||||
<th style="width:280px">minimum <?=$labels['ijkpunten']?> </th>
|
||||
<th style="width: 20px">D</th>
|
||||
<th style="width: 3%; vertical-align: text-top">nr</th>
|
||||
<th style="width: 15%; vertical-align: text-top">versie</th>
|
||||
<th style="width: 10%; vertical-align: text-top">van</th>
|
||||
<th style="width: 10%; vertical-align: text-top">t/m</th>
|
||||
<th style="width: 9%; vertical-align: text-top"> gem. score</th>
|
||||
<th style="width: 30%; vertical-align: text-top">minimum</th>
|
||||
<th style="width: 20%; vertical-align: text-top">criteria van</th>
|
||||
<th style="width: 3%; vertical-align: text-top"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody data-bind="foreach: versieambities">
|
||||
<tbody >
|
||||
<!-- ko foreach: ambities -->
|
||||
<tr>
|
||||
<td data-bind="text: periodenummer"></td>
|
||||
<td data-bind="text:naam"></td>
|
||||
<td data-bind="text: geldigvanaf"></td>
|
||||
<td data-bind="text: geldigtm"></td>
|
||||
<td><input class="integer"
|
||||
data-bind="textInput: gemscore, event:{input: $root.fUpdateAmbitie}, enable: wijzigok" />%</td>
|
||||
<td><input class="integer"
|
||||
data-bind="textInput: xijkpunten, event:{input: $root.fUpdateAmbitie},enable:wijzigok" /> ijkpunten
|
||||
op <input class="integer"
|
||||
data-bind="textInput: zprocent, event:{input: $root.fUpdateAmbitie}, enable:wijzigok" />% of hoger
|
||||
|
||||
<td>
|
||||
<!-- ko if: $index() == 0 -->
|
||||
<span data-bind="text: $parent.periodenummer() "></span>
|
||||
<!-- /ko -->
|
||||
</td>
|
||||
<td> <!-- ko if: $index() == 0 -->
|
||||
<span data-bind="text: $parent.naam() "></span>
|
||||
<!-- /ko -->
|
||||
</td>
|
||||
<td> <!-- ko if: $index() == 0 -->
|
||||
<span data-bind="text: $parent.geldigvanaf() "></span>
|
||||
<!-- /ko -->
|
||||
</td>
|
||||
<td> <!-- ko if: $index() == 0 -->
|
||||
<span data-bind="text: $parent.geldigtm() "></span>
|
||||
<!-- /ko -->
|
||||
</td>
|
||||
<td><input class="integer" type="number" min="0" max="100" step="5"
|
||||
data-bind="textInput: gemscore,
|
||||
event: {input: $parent.fUpdateAmbitie},
|
||||
enable: $parent.manage() == 'T' && $parent.orgsoort() == soort " />%</td>
|
||||
<td><input class="integer" type="number" min="0" step="1"
|
||||
data-bind="textInput: xijkpunten,
|
||||
event: {input: $parent.fUpdateAmbitie},
|
||||
attr: {'max': $parent.aantalY},
|
||||
enable: $parent.manage() =='T' && $parent.orgsoort() == soort " /> ijkpunten
|
||||
op <input class="integer" type="number" min="0" max="100" step="5"
|
||||
data-bind="textInput: zprocent,
|
||||
event: {input: $parent.fUpdateAmbitie},
|
||||
enable: $parent.manage() =='T' && $parent.orgsoort() == soort " />
|
||||
<span > % of hoger</span>
|
||||
</td>
|
||||
<td class="glyphicon glyphicon-trash" data-bind="click:$root.fDelete"></td>
|
||||
</tr>
|
||||
<td data-bind="text: organisatie + ' (' + ambitievan() + ')' " ></td>
|
||||
|
||||
<td style="text-align: right">
|
||||
<span class="glyphicon glyphicon-trash"
|
||||
data-bind="visible: $parent.manage() =='T' && $parent.orgsoort() == soort ,
|
||||
click:$root.fDelete ">
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<!--/ko-->
|
||||
|
||||
<!-- ko if: insert() == false -->
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<button style="background-color: #A28A29; color: white; box-shadow: 1px 1px 2px #faf7eb;
|
||||
font-weight: bold; margin-top; 20px;"
|
||||
data-bind="click: fNew,
|
||||
visible: manage() =='T' && eigenAmbitie() == false ">nieuw
|
||||
</button>
|
||||
</td>
|
||||
<td colspan="6"></td>
|
||||
|
||||
|
||||
</tr>
|
||||
<!--/ko -->
|
||||
|
||||
</tbody>
|
||||
<tbody>
|
||||
<!-- ko if: insert() -->
|
||||
<tr>
|
||||
<td data-bind="text: periodenummer() "></td>
|
||||
<td data-bind="text: naam() "></td>
|
||||
<td data-bind="text: geldigvanaf() "></td>
|
||||
<td data-bind="text: geldigtm()"></td>
|
||||
<td><input type="number" min="0" max="100" step="5" class="integer"
|
||||
data-bind="textInput: scoreNieuw "/>%</td>
|
||||
<td><input type="number" min="0" class="integer"
|
||||
data-bind="textInput: ijkNieuw,
|
||||
attr: {'max': aantalY} " /> ijkpunten
|
||||
op <input type="number" min="0" max="100" step="5" class="integer"
|
||||
data-bind="textInput: procentNieuw" />% of hoger
|
||||
</td>
|
||||
<td data-bind="text: soortNaam() " ></td>
|
||||
|
||||
<td >
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<button style="background-color: #A28A29; color: white; box-shadow: 1px 1px 2px #faf7eb;
|
||||
font-weight: bold; margin-top; 20px;"
|
||||
data-bind="click: fOpslaan ">opslaan
|
||||
</button>
|
||||
<button style="background-color: #f1f1f1; box-shadow: 1px 1px 2px ghostwhite;
|
||||
font-weight: bold; margin-top; 20px;"
|
||||
data-bind="click: fAnnuleer ">annuleer
|
||||
</button>
|
||||
|
||||
</td>
|
||||
<td colspan="4"></td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
<!--/ko -->
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
</div> <!-- rechts -->
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user