Merge branch 'feature/sopOverzichtPerCriterium'

This commit is contained in:
Monique
2022-02-10 09:17:08 +01:00
11 changed files with 401 additions and 203 deletions
@@ -1,5 +1,5 @@
<table style="border: 1px solid #A28A29; margin-top: 30px;"
<table style="border: 1px solid #A28A29; margin-top: 30px;width: 100%;"
data-bind="with: $root.selectedOrg()">
<thead>
<tr style="border-bottom:1px solid #A28A29; ">
@@ -0,0 +1,44 @@
<table style="border: 1px solid #A28A29; width: 100%; margin-top: 30px;" data-bind="with: topOrg() ? topOrg(): ''" >
<thead>
<tr style="border-bottom:1px solid #A28A29; ">
<th colspan="3" style="padding: 5px; color: white; background-color:#A28A29;">Compact SOPs per citerium</th>
</tr>
<tr style="border-bottom:1px solid #A28A29; ">
<th style="padding: 5px; color: white; background-color:#A28A29">Download</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Soort</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Organisatie</th>
</tr>
<tr style="border-bottom:1px solid #A28A29;" data-bind="visible: soort== 'BOP' ">
<th data-bind="style: {backgroundColor: achtergrond} " >
<button data-bind="visible: erIsEenSop(), click: $parent.fOpenPDF, style: {backgroundColor: kleur()} "
class="buttonCompact glyphicon glyphicon-open"
style=" height: 30px; width: 30px; padding-left: 8px; border-radius: 50%;
box-shadow: none; border: none; float: left">
</button></th>
<th style="padding: 5px;" data-bind="text: soort, style: {backgroundColor: achtergrond()} "></th>
<th style="padding: 5px;" data-bind="text: naam, style: {backgroundColor: achtergrond()} "></th>
</tr>
</thead>
<tbody data-bind="foreach: orgs">
<tr data-bind="visible: $index() == 0 || $parent.orgs()[$index()-1].label != label " style="border-bottom:1px solid #A28A29; ">
<td colspan ="3" data-bind="text: label" style="background-color: #faf7eb; text-align: center; font-weight: bold; vertical-align: text-top">
</td>
</tr>
<tr style="border-bottom:1px solid #A28A29; ">
<td data-bind="style: {backgroundColor: achtergrond} " style="border-bottom:1px solid #A28A29; ">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF, style: {backgroundColor: kleur()} "
class="buttonCompact glyphicon glyphicon-open"
style=" height: 30px; width: 30px; padding-left: 8px; border-radius: 50%;
box-shadow: none; border: none; float: left">
</button>
</td>
<td style="padding: 5px" data-bind="text: soort, style: {backgroundColor: achtergrond()} "></td>
<td style="padding: 5px" data-bind="text: naam, style: {backgroundColor: achtergrond()} ">
</td>
</tr>
</tbody>
</table>
@@ -1,7 +1,12 @@
<table style="border: 1px solid #A28A29; margin-top: 30px;"
<table style="border: 1px solid #A28A29; margin-top: 30px; width: 100%;"
data-bind="with: $root.selectedOrg()">
<thead>
<!-- ko if: $parent.topOrg()-->
<tr style="border-bottom: 1px solid white;">
<th colspan="3" style="padding: 5px; color: white; background-color:#A28A29">Compact SWOP, ROPs en BOPs </th>
</tr>
<!-- /ko -->
<tr>
<th style="padding: 5px; color: white; background-color:#A28A29">Download</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Soort</th>
@@ -33,7 +38,7 @@
style=" height: 30px; width: 30px; padding-left: 8px; background-color: #8cff1a; float: left">
</button>
</td>
<td style="padding: 5px; background-color: #f5f0f2;">ROP</td>
<td style="padding: 5px; background-color: #f5f0f2;">BOP</td>
<td style="padding: 5px; background-color: #f5f0f2;" data-bind="text: brin + ' ' + naam">
</td>
@@ -1,4 +1,4 @@
<table style="width: 500px;" data-bind="with: $root.selectedOrg()">
<table style="width: 100%;" data-bind="with: $root.selectedOrg()">
<tr>
<td style="padding: 5px">SOP</td>
<td style="padding: 5px" data-bind="text: brin + ' ' + naam">
@@ -1,6 +1,11 @@
<table style="border: 1px solid #A28A29; margin-top: 30px;"
data-bind="with: $root.selectedOrg()">
<table style="border: 1px solid #A28A29; margin-top: 30px; width: 100%;"
data-bind="with: selectedOrg() ">
<thead>
<!-- ko if: $parent.topOrg()-->
<tr style="border-bottom: 1px solid white;">
<th colspan="3" style="padding: 5px; color: white; background-color:#A28A29">Compact SWOP, ROPs en BOPs </th>
</tr>
<!-- /ko -->
<tr style="border-bottom: 1px solid white;">
<th style="padding: 5px; color: white; background-color:#A28A29">Download</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Soort</th>
+46 -15
View File
@@ -1,8 +1,8 @@
<div class="col-sm-12 mainpagina" id ="pagsopoverzicht">
<div class="row">
<div class="col-xs-2"></div>
<div class="col-xs-1"></div>
<div class="col-xs-9 " >
<div class="col-xs-11 " >
<h4 data-bind="text: titel() ? subtitel() ? titel() + ' ' + subtitel() : titel(): '' ">
</h4>
@@ -11,26 +11,57 @@
<p>Selecteer een schooljaar:</p>
<select data-bind=" options: schooljaren,
<select style="height: 25px; width: 150px;"
data-bind=" options: schooljaren,
optionsText: 'naam',
value: $root.selectedSchooljaar,
event: {change: fChangeSchooljaar}">
</select>
<!-- ko if: orgsoort() == 4 -->
<?php $this->load->view("monpas/compactsop/overzicht/_school"); ?>
<!--/ko -->
<div data-bind="visible: criteria().length > 1 && orgsoort() != 4">
<p style="margin-top : 20px;">Kies een sorteercriterium:</p>
<select style="height: 25px; width: 150px;"
data-bind=" options : criteria,
optionsText : 'naam',
value : selectedCriterium,
event : {change: fChangeCriterium}">
</select>
<!-- ko if: orgsoort() == 3 -->
<?php $this->load->view("monpas/compactsop/overzicht/_bestuur"); ?>
<!--/ko -->
</div>
<div class="row">
<!-- ko if: orgsoort() == 4 -->
<div class="col-xs-4">
<?php $this->load->view("monpas/compactsop/overzicht/_school"); ?>
</div>
<!--/ko -->
<!-- ko if: topOrg() -->
<div class="col-xs-6">
<?php $this->load->view("monpas/compactsop/overzicht/_criterium"); ?>
</div>
<!--/ko -->
<!-- ko if: orgsoort() == 3 && !topOrg() -->
<div class="col-xs-6">
<?php $this->load->view("monpas/compactsop/overzicht/_bestuur"); ?>
</div>
<!--/ko -->
<!-- ko if: orgsoort() == 2 -->
<div class="col-xs-6">
<?php $this->load->view("monpas/compactsop/overzicht/_regio"); ?>
</div>
<!--/ko -->
<!-- ko if: orgsoort() == 1 -->
<div class="col-xs-6">
<?php $this->load->view("monpas/compactsop/overzicht/_swv"); ?>
</div>
<!--/ko -->
</div>
<!-- ko if: orgsoort() == 2 -->
<?php $this->load->view("monpas/compactsop/overzicht/_regio"); ?>
<!--/ko -->
<!-- ko if: orgsoort() == 1 -->
<?php $this->load->view("monpas/compactsop/overzicht/_swv"); ?>
<!--/ko -->
</div>