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

tussenopslag

Browse Source
This commit is contained in:
Monique
2022-04-28 20:47:54 +02:00
parent d26974e69f
commit 573332e28a
16 changed files with 306 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/compactsop/diversiteitcompact.php
+3 -3
View File
@@ -91,14 +91,14 @@
</tbody>
</table>
</div>
<?php if ($data['groepen']){
<?php if ($data['groepen'] && $chartid){
$width = 600;
$aantal = count($data['groepen']);
if($aantal < 9) $width = 300;
}?>
<div class=" sopDivKaderGrafiek" style="margin-top: 25px; height: 230px;">
<div class="highcharts-background" id="dqGroep" style="height:230px; width: <?php echo $width.'px'?>; "></div>
<div class="highcharts-background" id="<?= $chartid ?>" style="height:230px; width: <?php echo $width.'px'?>; "></div>
</div>
</div>
@@ -114,7 +114,7 @@
yas.push(<?=$groep->dq?>);
<?php } ?>
Highcharts.chart('dqGroep', {
Highcharts.chart('<?= $chartid ?>', {
chart: {
type: 'column',
animation: false,
application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php
+7 -9
View File
@@ -1,24 +1,22 @@
<!--class="soponderdeel"-->
<div class="panel panel-default"
data-bind=" css{randinactief: geenLicentie(), geenrand: selected} ">
data-bind=" css{ geenrand: selected} ">
<!-- class="naamvak"-->
<div class="panel-heading"
style="height: 60px;"
data-bind="css: {inactiefsop: geenLicentie(),
lichtsop: geenGegevens() && !geenLicentie(),
witsop: selected() }">
<h4 data-bind="text: toonnummer + '. '+ naam,
data-bind="css: {lichtsop: geenGegevens(), witsop: selected() }">
<h4 data-bind="text: toonnummer + '. ' + naam(),
click: $root.fSelecteerOnderdeel">
</h4>
</div>
<!-- class ="versievak"-->
<div class="panel-body"
style="height: 75px;"
data-bind =" text: infotekst() && ! selected() ? infotekst: '',
style: {color: (geenGegevens() || geenLicentie()) ? '#949494' : '#333333'} ">
data-bind =" text: infotekst() && ! selected() ? infotekst(): '',
style: {color: (geenGegevens() ? '#949494' : '#333333'} ">
</div>
<!-- ko if : nummer == 3 -->
<!-- ko if : type == "OMVANG" -->
<div data-bind="visible: omvangschooljaren() && omvangschooljaren().length > 1 && !selected()" >
@@ -90,7 +88,7 @@
<!-- data-bind="visible: !erZijnArrangementen(),-->
<!-- style: {color: selected()? 'white' : 'black'}">geen arrangementen ingevoerd-->
<!-- </p>-->
<!-- /ko --> <!-- if nummer == 3 -->
<!-- /ko --> <!-- if type == "OMVANG" -->
<div data-bind="visible: orgversies() && orgversies().length > 1 && !selected()" >
<div data-bind="visible: versies()">
application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+4 -6
View File
@@ -11,8 +11,7 @@
<div class="col-xs-4" >
<div class="panel-group" data-bind="foreach: onderdelen ">
<!-- ko if: (toonnummer <= 5 && $parent.orgsoortnummer() == 4) ||
(toonnummer <= 3 && $parent.orgsoortnummer() != 4) -->
<!-- ko if: $index() < $root.onderdelen().length/2 -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko -->
</div>
@@ -21,8 +20,7 @@
<div class="col-xs-4"
style="border-right: 1px solid lightgrey">
<div class="panel-group" data-bind="foreach: onderdelen ">
<!-- ko if: (toonnummer > 5 && $parent.orgsoortnummer() == 4) ||
(toonnummer > 3 && $parent.orgsoortnummer() != 4) -->
<!-- ko if: $index() >= $root.onderdelen().length/2 -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko -->
</div>
@@ -37,7 +35,7 @@
color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small;"
data-bind="text: naamkort2() ">
data-bind="text: toonnummer + '. ' + naamkort() ">
</label>
</div>
<!-- /ko -->
@@ -47,7 +45,7 @@
style="background-color:#930f50; color: white;
margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small;"
data-bind="text: naamkort2() ">
data-bind="text: toonnummer + '. ' + naamkort() ">
</label>
</div>
<!-- /ko -->
application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+67 -10
View File
@@ -3,6 +3,7 @@
<div class="row">
<!-- ko foreach: paginas -->
<!-- ko if: paginanummer < 4-->
<div class= "col-xs-4">
<div style="margin-top: 20px;
border: 1px solid grey;
@@ -22,7 +23,7 @@
</div>
<div data-bind="visible: gevuld()">
<div style="color: white; font-size: small " data-bind="text: naamkort2()">
<div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">
</div>
</div>
</div>
@@ -39,7 +40,7 @@
</div>
</div>
<div data-bind="visible: gevuld()">
<div style="color: white; font-size: small " data-bind="text: naamkort2()">
<div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">
</div>
</div>
</div>
@@ -51,9 +52,65 @@
</div>
</div>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</div> <!-- class= row -->
</div> <!-- class= row -->
<div class="row">
<!-- ko foreach: paginas -->
<!-- ko if: paginanummer >= 4 && paginanummer < 7 -->
<div class= "col-xs-4">
<div style="margin-top: 20px;
border: 1px solid grey;
height: 385px; position: relative">
<div data-bind="foreach: $data.blokjes ">
<!-- ko if: ! isBreedBlok() && ! verborgen() -->
<div class="col-xs-5 "
data-bind=" style: {marginTop : bovenmarge(),
marginLeft : linkermarge(),
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">
<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; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">
</div>
</div>
</div>
<!-- /ko -->
<!-- ko if: isBreedBlok() && ! verborgen()-->
<div class="col-xs-10"
data-bind=" style : {marginTop : bovenmarge(),
backgroundColor : kleur() },
attr : {title : naam},
click : $root.fHiernaartoe"
style="margin-bottom: 5px; margin-left: 20px; 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; font-size: small; word-break: break-word " data-bind="text: toonnummer + '. ' + naamkort()">
</div>
</div>
</div>
<!-- /ko -->
</div>
<div class=col-xs-12 >
<p style="color: grey; float: right" data-bind="text: $index() + 1"></p>
</div>
</div>
</div>
<!-- /ko -->
<!-- /ko -->
</div> <!-- class= row -->
</div>
<div class="col-xs-3" >
@@ -65,11 +122,11 @@
<div class =" col-xs-5"
data-bind =" click: $root.fSelectVoorPlaatsing,
attr: {title : naam},
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'}"
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'}"
style =" color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small"
data-bind="text: naamkort2() ">
<label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word"
data-bind="text: toonnummer + '. ' + naamkort() ">
</label>
</div>
<!-- /ko -->
@@ -77,11 +134,11 @@
<div class="col-xs-11"
data-bind="click: $root.fSelectVoorPlaatsing,
attr: {title : naam},
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer ? '#69970f' : '#930f50'},"
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'},"
style="color: white;
margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small"
data-bind="text: naamkort2() ">
<label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word ;"
data-bind="text: toonnummer + '. ' + naamkort() ">
</label>
</div>
<!-- /ko -->
application/views/monpas/pages/instrumentencp.php
+4 -4
View File
@@ -7,8 +7,8 @@
<tr>
<th style="width: 15%; vertical-align: text-top">cluster</th>
<th style="width: 25%; vertical-align: text-top">instrument</th>
<th style="width: 30%; vertical-align: text-top">naam in Compact SOP (max. 50 lettertekens)</th>
<th style="width: 20%; vertical-align: text-top">korte naam op gekozen blokje (max. 25 lettertekens)</th>
<th style="width: 30%; vertical-align: text-top">naam in Compact SOP (max. 36 lettertekens)</th>
<th style="width: 20%; vertical-align: text-top">korte naam op gekozen blokje (max. 20 lettertekens)</th>
<th style="width: 10%; text-align: right;padding-right: 5px; vertical-align: text-top">in Compact SOP</th>
</tr>
</thead>
@@ -24,12 +24,12 @@
<td style="vertical-align: top" ><input style="width:100%"
type="text"
maxlength="50"
maxlength="36"
data-bind="textInput: sopnaam, event:{input: $root.fSaveSopnaam} "/>
</td>
<td style="vertical-align: top" ><input style="width:100%"
type="text"
maxlength="24"
maxlength="20"
data-bind="textInput: blokjesnaam, event:{input: $root.fSaveBlokjesnaam}"/>
</td>
<td style="text-align: right; padding-right: 5px;padding-top: 0; vertical-align: top; margin: 0">