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

namen compact sop + layoutverbeteringen

Browse Source
This commit is contained in:
Monique
2025-01-06 14:39:02 +01:00
parent d0886d7275
commit 0b6fbaaf3a
7 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+2 -1
View File
@@ -98,7 +98,8 @@ class MY_Controller extends CI_Controller{
// public $version = '1.20.26';//gebudgetterde bedragen ipv toegekende budgtten in overzicht monfin, analoog aan bestemmingen // public $version = '1.20.26';//gebudgetterde bedragen ipv toegekende budgtten in overzicht monfin, analoog aan bestemmingen
// public $version = '1.20.27';//dingen // public $version = '1.20.27';//dingen
// public $version = '1.21.00';//2factor // public $version = '1.21.00';//2factor
public $version = '1.21.00L'; //2factor -twee // public $version = '1.21.00L'; //2factor -twee
public $version = '1.21.01M'; //verbeteringen compact sop
application/views/monpas/compactsop/ijktabelcompact.php
+5 -4
View File
@@ -269,11 +269,12 @@
</tr> </tr>
<?php ;} ; ?> <?php ;} ; ?>
</tbody> </tbody>
<tr > <!-- <tr >-->
<td colspan="8" <!-- <td colspan="8"-->
class="inforegel">Scores in procenten</td> <!-- class="inforegel">Scores in procenten</td>-->
</tr> <!-- </tr>-->
</table> </table>
<span>scores in procenten</span>
<?php }; ?> <!-- if lijst[0]->scores --> <?php }; ?> <!-- if lijst[0]->scores -->
</div> </div>
</div> </div>
application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php
+1 -1
View File
@@ -3,7 +3,7 @@
data-bind=" css{ geenrand: selected} "> data-bind=" css{ geenrand: selected} ">
<!-- class="naamvak"--> <!-- class="naamvak"-->
<div class="panel-heading" <div class="panel-heading"
style="height: 60px;" style="height: 60px; padding-top: 0"
data-bind="css: {lichtsop: geenGegevens(), witsop: selected() }"> data-bind="css: {lichtsop: geenGegevens(), witsop: selected() }">
<h4 data-bind="text: toonnummer + '. ' + naam, <h4 data-bind="text: toonnummer + '. ' + naam,
click: $root.fSelecteerOnderdeel"> click: $root.fSelecteerOnderdeel">
application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+19 -6
View File
@@ -34,9 +34,16 @@
style="background-color:#930f50; style="background-color:#930f50;
color: white; padding: 10px; margin: 5px; color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; "> margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small;" <!-- <label style="padding-top: 15px; width: 50px; font-size: small;"-->
data-bind="text: toonnummer + '. ' + naamkort "> <!-- data-bind="text: toonnummer + '. ' + naamkort ">-->
</label> <!-- </label>-->
<table style="width: 100%">
<tr>
<td style="width: 18%; vertical-align: text-top; font-size: small" data-bind="text: toonnummer + '.' "></td>
<td style="width: 82%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal"
data-bind=" text: naamkort == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort "></td>
</tr>
</table>
</div> </div>
<!-- /ko --> <!-- /ko -->
<!-- ko if : isBreedBlok() --> <!-- ko if : isBreedBlok() -->
@@ -44,9 +51,15 @@
data-bind="click: $root.fAnnuleerOnderdeel" data-bind="click: $root.fAnnuleerOnderdeel"
style="background-color:#930f50; color: white; style="background-color:#930f50; color: white;
margin: 5px; padding: 10px; height: 150px; "> margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small;" <!-- <label style="padding-top: 15px; width: 50px; font-size: small;"-->
data-bind="text: toonnummer + '. ' + naamkort "> <!-- data-bind="text: toonnummer + '. ' + naamkort ">-->
</label> <!-- </label>-->
<table style="width: 100%">
<tr>
<td style="width: 9%; font-size: small; vertical-align: text-top" data-bind="text: toonnummer"></td>
<td style="width: 91%; font-size: small; vertical-align: text-top; word-break: break-word; white-space: normal" data-bind=" text: naamkort"></td>
</tr>
</table>
</div> </div>
<!-- /ko --> <!-- /ko -->
</div><!-- for each onderdelen --> </div><!-- for each onderdelen -->
application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+38 -10
View File
@@ -23,8 +23,16 @@
</div> </div>
<div data-bind="visible: gevuld()"> <div data-bind="visible: gevuld()">
<div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()"> <!-- <div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">-->
</div> <!-- </div>-->
<table style="width: 100%">
<tr>
<td style="width: 18%; vertical-align: text-top; font-size: small; color: white" data-bind="text: toonnummer() + '.' "></td>
<td style="width: 82%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal; color: white"
data-bind=" text: naamkort() == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort() == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort() "></td>
</tr>
</table>
</div> </div>
</div> </div>
<!-- /ko --> <!-- /ko -->
@@ -78,8 +86,15 @@
</div> </div>
<div data-bind="visible: gevuld()"> <div data-bind="visible: gevuld()">
<div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()"> <!-- <div style="color: white; font-size: small; word-break: break-word " data-bind="text: toonnummer() + '. ' + naamkort()">-->
</div> <!-- </div>-->
<table style="width: 100%">
<tr>
<td style="width: 9%; vertical-align: text-top; font-size: small; color: white" data-bind="text: toonnummer() + '.' "></td>
<td style="width: 91%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal; color: white"
data-bind=" text: naamkort() == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort() == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort() "></td>
</tr>
</table>
</div> </div>
</div> </div>
<!-- /ko --> <!-- /ko -->
@@ -125,9 +140,16 @@
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'}" style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'}"
style =" color: white; padding: 10px; margin: 5px; style =" color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; "> margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word" <!-- <label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word"-->
data-bind="text: toonnummer + '. ' + naamkort "> <!-- data-bind="text: toonnummer + '. ' + naamkort ">-->
</label> <!-- </label>-->
<table style="width: 100%">
<tr>
<td style="width: 18%; vertical-align: text-top; font-size: small" data-bind="text: toonnummer + '.' "></td>
<td style="width: 82%; vertical-align: text-top; font-size: small; word-break: break-word; white-space: normal"
data-bind=" text: naamkort == 'Basisondersteuning' ? 'Basisonder- steuning' : naamkort == 'Tevredenheid school' ? 'Tevreden- heid school' : naamkort "></td>
</tr>
</table>
</div> </div>
<!-- /ko --> <!-- /ko -->
<!-- ko if : isBreedBlok() --> <!-- ko if : isBreedBlok() -->
@@ -137,9 +159,15 @@
style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'}," style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'},"
style="color: white; style="color: white;
margin: 5px; padding: 10px; height: 150px; "> margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word ;" <!-- <label style="padding-top: 15px; width: 50px; font-size: small; word-break: break-word ;"-->
data-bind="text: toonnummer + '. ' + naamkort "> <!-- data-bind="text: toonnummer + '. ' + naamkort ">-->
</label> <!-- </label>-->
<table style="width: 100%">
<tr>
<td style="width: 9%; font-size: small; vertical-align: text-top" data-bind="text: toonnummer"></td>
<td style="width: 91%; font-size: small; vertical-align: text-top; word-break: break-word; white-space: normal" data-bind=" text: naamkort"></td>
</tr>
</table>
</div> </div>
<!-- /ko --> <!-- /ko -->
</div><!-- for each onderdelen --> </div><!-- for each onderdelen -->
public/css/monpas/main.css
+1 -1
View File
@@ -1280,7 +1280,7 @@ z-index: 50;
/*.randinactief{*/ /*.randinactief{*/
/* border: 1px solid #bfbfbf;*/ /* border: 1px solid #bfbfbf;*/
/*}*/ /*}*/
.geenrand{ .vergeenrand{
border: none; border: none;
box-shadow: none; box-shadow: none;
} }
public/js/monpas/models/compactsopmodel.js
+9 -1
View File
@@ -361,7 +361,13 @@ mh.initCompactSopModel = function(){
});//each });//each
if (self.schooljaren() ) self.selectedSchooljaar(self.schooljaren()[0]); if (self.schooljaren() ) self.selectedSchooljaar(self.schooljaren()[0]);
self.organisaties(data.organisaties); self.organisaties(data.organisaties);
self.selectedOrganisatie(self.organisaties()[0]); if(self.organisaties().length === 1)self.selectedOrganisatie(self.organisaties()[0])
else{
$.each(self.organisaties(), function(i,o){
if(o.soort === self.toporgnr())
self.selectedOrganisatie(self.organisaties()[i])
})
}
} // if } // if
self.druk(false); self.druk(false);
if (typeof callback == "function") callback() if (typeof callback == "function") callback()
@@ -374,6 +380,8 @@ mh.initCompactSopModel = function(){
if(self.selectedSchooljaar() === undefined || self.selectedOrganisatie === undefined){ if(self.selectedSchooljaar() === undefined || self.selectedOrganisatie === undefined){
return; return;
} }
console.log(self.selectedOrganisatie().soort, 'orgsoort')
switch(self.selectedOrganisatie().soort){ switch(self.selectedOrganisatie().soort){
case '1': case '1':