Merge branch 'fouten/omvanggrafiek' into feature/alleInstrumenteninCompactSop
This commit is contained in:
Monique
@@ -324,45 +324,47 @@
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 1"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold; margin-top: 20px;">2. Onderwijskwaliteit; Inspectie</p>
|
||||
<p style="font-weight: bold; margin-top: 20px;">2. Passend Onderwijs</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 2"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold; margin-top: 20px;">3. Basisondersteuning</p>
|
||||
<p style="font-weight: bold; margin-top: 20px;">3. Inclusief Onderwijs</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 3"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold; margin-top: 20px;">4. Extra Ondersteuning</p>
|
||||
<p style="font-weight: bold; margin-top: 20px;">4. Basisondersteuning</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 4"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold; margin-top: 20px;">5. Extra Ondersteuning</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 5"></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-6 col-xs-12">
|
||||
<p style="font-weight: bold; margin-top: 20px;">5. Expertise</p>
|
||||
|
||||
<p style="font-weight: bold;margin-top: 20px; ">6. Expertise</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 5"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold;margin-top: 20px; ">6. Tevredenheid</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 8"></li>
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 6"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold; margin-top: 20px;">7. Financiën</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 7"></li>
|
||||
</ul>
|
||||
<p style="font-weight: bold; margin-top: 20px;">Extra</p>
|
||||
<p style="font-weight: bold; margin-top: 20px;">8. Algemeen</p>
|
||||
<ul style="list-style-type: none; margin:0; padding : 0"
|
||||
data-bind="foreach: handleidingen">
|
||||
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 8"></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
<div class="row" id ="pagBindBeheer">
|
||||
<div class= "col-sm-12" >
|
||||
<!-- ko foreach: beheermenu -->
|
||||
<div class="submenuitem2"
|
||||
data-bind="click:$parent.fChangeMenu, css:{'selected': $parent.selectedMenu() && $parent.selectedMenu().id == id}">
|
||||
<div class="submenuitem2"data-bind="click:$parent.fChangeMenu, css:{'selected': $parent.selectedMenu() && $parent.selectedMenu().id == id}">
|
||||
<span data-bind="text: naam"> </span>
|
||||
</div>
|
||||
<!-- /ko -->
|
||||
|
||||
@@ -48,52 +48,55 @@
|
||||
<tr >
|
||||
<td colspan = 2>
|
||||
<!-- ko if: $parent.selectedOrgversion() && $parent.selectedOrgversion().toonOmschrijving()== false -->
|
||||
<table style="width:100%">
|
||||
<tr>
|
||||
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
|
||||
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> nr
|
||||
</th>
|
||||
<th class="header2" style="width: 50%;padding-left: 2px"
|
||||
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}">indicator
|
||||
</th>
|
||||
<th class="header2" style="width: 40%;padding-left: 2px;text-align:left"
|
||||
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> score
|
||||
</th>
|
||||
</tr>
|
||||
<tbody data-bind="foreach: indicatorscores">
|
||||
<tr style="border-bottom: 1px solid #ebebeb">
|
||||
<td style="text-align:right;vertical-align:top" data-bind="text: nummer,
|
||||
<table style="width:100%" data-bind="foreach: indicatorscores">
|
||||
<thead data-bind="visible: $index() == 0">
|
||||
<tr>
|
||||
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
|
||||
data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'} "> nr
|
||||
</th>
|
||||
<th class="header2" style="padding-left: 2px"
|
||||
data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
|
||||
attr: {width: scoretype > 5 ? '65%': '72%' } ">
|
||||
</th>
|
||||
<th class="header2" style="padding-left: 2px;text-align:left"
|
||||
data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
|
||||
attr: {width: scoretype > 5 ? '32%': '22%'} "> score
|
||||
</th>
|
||||
</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' }">
|
||||
</td>
|
||||
<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>
|
||||
<div class="nietVoorPdf">
|
||||
<span data-bind="visible: scoretype==1">
|
||||
<td style="vertical-align:top; padding-top: 5px;" >
|
||||
|
||||
<span class="nietVoorPdf" data-bind="visible: scoretype==1">
|
||||
<input class="rapport"
|
||||
data-bind="textInput: score,
|
||||
event:{input: $root.fUpdateScoretype12},
|
||||
enable: $root.editok() && $parent.disabled() == false,
|
||||
attr:{'id' : $index}" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="alleenVoorPdf">
|
||||
<span data-bind="visible: scoretype==1 || scoretype == 2,
|
||||
|
||||
<span class="alleenVoorPdf" data-bind="visible: scoretype==1 || scoretype == 2,
|
||||
text: score">
|
||||
</span>
|
||||
</div>
|
||||
<div class="nietVoorPdf">
|
||||
<span data-bind="visible: scoretype == 2">
|
||||
|
||||
|
||||
<span class="nietVoorPdf"data-bind="visible: scoretype == 2">
|
||||
<input class="integer"
|
||||
data-bind="textInput: score,
|
||||
event:{input: $root.fUpdateScoretype12},
|
||||
visible: scoretype==2,
|
||||
enable: $root.editok() && $parent.disabled() == false" /> %
|
||||
</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 foreach: $root.scoreopties -->
|
||||
<!-- ko if: $parent.scoretype == type -->
|
||||
@@ -103,7 +106,7 @@
|
||||
event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)},
|
||||
attr: {'name': $parent.id , 'value': value, 'checked': value == $parent.score()},
|
||||
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 -->
|
||||
@@ -113,10 +116,11 @@
|
||||
<input type='radio'
|
||||
data-bind="checked: $parent.score(),
|
||||
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 -->
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user