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

tussenstand

Browse Source
This commit is contained in:
Monique
2024-01-25 13:49:39 +01:00
parent eacf820fc9
commit 9f086fedd5
3 changed files with 99 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+1 -1
View File
@@ -92,7 +92,7 @@ class MY_Controller extends CI_Controller{
// public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor // public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor
// public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen // public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen
// public $version = '1.20.17';// verversen bestemmingen ging niet goed // public $version = '1.20.17';// verversen bestemmingen ging niet goed
public $version = '1.20.19';// tussenstand vormgeving ijkpunten public $version = '1.20.21';// tussenstand vormgeving ijkpunten
public $partituurid; public $partituurid;
public $globProfielVersieID = 1; public $globProfielVersieID = 1;
application/views/monpas/pages/ijkpunten.php
+89 -67
View File
@@ -218,14 +218,14 @@
<table class="tabelitem1pdf"> <table class="tabelitem1pdf">
<thead> <thead>
<tr style="height: 130px;" class="headpdf"> <tr class="headpdf">
<th <th class="ijkpuntth"
style="border-right: 1px solid white; padding: 3px; padding-left: 10px;vertical-align: text-top; border-bottom: none"> style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e; padding-left: 4px;">
nr <div style="height: 140px; ">nr</div>
</th> </th>
<th <th class="ijkpuntth"
style="border-right: 1px solid white; padding: 3px; padding-left: 4px;vertical-align: text-top; border-bottom: none" data-bind="text: label" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;padding-left: 4px;"><div style="height: 130px; " data-bind="text: label"></div>
>
</th> </th>
</tr> </tr>
@@ -233,11 +233,13 @@
<tbody > <tbody >
<!--ko foreach: ijkpunten --> <!--ko foreach: ijkpunten -->
<tr class="clickable" style="border-bottom: 1px solid #ebebeb; max-height: 30px;" data-bind="click: $root.fToonToelichting;"> <tr class="clickable" style="border-bottom: 1px solid #ebebeb " data-bind="click: $root.fToonToelichting;">
<td style="vertical-align:top; padding-left: 4px; " data-bind="text: nummer">
<td style="vertical-align:top; padding-left: 10px;height: 20px;" data-bind="text: nummer">
</td> </td>
<td style="vertical-align:top; padding-left: 4px; max-height: 20px !important; text-overflow: ellipsis" data-bind="text: omschrijving "> <td style="vertical-align:top; padding-left: 4px; " >
<div style="max-height: 20px; overflow-y: hidden" data-bind="text: omschrijving "></div>
</td> </td>
</tr> </tr>
@@ -262,29 +264,39 @@
<!-- Nieuwste meting + ijkpunten van school, bestuur en kamer--> <!-- Nieuwste meting + ijkpunten van school, bestuur en kamer-->
<table class="tabelitem" data-bind="visible: $root.isSWV()==false && tooninfo() == true"> <table class="tabelitem" data-bind="visible: $root.isSWV()==false && tooninfo() == true">
<thead> <thead>
<tr class="headpdf " style="height: 50px; overflow-y:hidden;"> <tr class="headpdf " >
<th colspan="2" <th colspan="2" class="ijkpuntth"
style="border-right: 1px solid white; width: 100px; font-size: 10px; border-bottom: 1px solid #a07b8e; padding: 2px; vertical-align: text-top" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;">
data-bind="text: vantm "> <div class="ijkpuntthdiv"
data-bind="text: vantm">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf " style="height: 50px; overflow-y:hidden;"> <tr class="headpdf" >
<th colspan="1" <th class="ijkpuntth"
style="border-right: 1px solid #a07b8e; overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px;padding: 2px; padding-left: 3px;" style="border-right: 1px solid #a07b8e; vertical-align: top; ">
data-bind=" text: $root.selectedUser() ? $root.selectedUser().naam : orgnaam"> <div data-bind=" text: $root.selectedUser() ? $root.selectedUser().naam : orgnaam"
class="ijkpuntthdiv">
</div>
</th> </th>
<th colspan="1" <th class="ijkpuntth" style=" border-right: 1px solid white;">
style=" text-overflow: ellipsis; font-size: 10px;vertical-align: text-top; border-right: 1px solid white;padding: 2px; padding-left: 3px;" <div class="ijkpuntthdiv"
data-bind=" text: naamV"> data-bind=" text: naamV">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 30px; overflow-y:hidden;"> <tr class="headpdf" >
<th colspan="1" style="font-size: 10px; border-right: 1px solid #a07b8e; vertical-align: text-top; padding: 2px; padding-left: 3px;" <th class="ijkpuntth" style="border-right: 1px solid #a07b8e">
data-bind="text: 'metingen: ' + metingen " > <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingen ">
</div>
</th>
<th class="ijkpuntth" style="border-right: 1px solid white;">
<div class="ijkpuntthdiv"
style="height: 30px;"
data-bind="text: 'metingen: ' + metingenV">
</div>
</th> </th>
<th colspan="1" style="font-size: 10px; border-right: 1px solid white; padding-left: 3px;"
data-bind="text: 'metingen: ' + metingenV"></th>
</tr> </tr>
</thead> </thead>
<tbody data-bind="foreach: scores"> <tbody data-bind="foreach: scores">
@@ -305,37 +317,41 @@
<table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == false && erzijnscores()== true; "> <table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == false && erzijnscores()== true; ">
<thead> <thead>
<tr class="headpdf" style="height: 50px; border-bottom: none; overflow-y:hidden;"> <tr class="headpdf" >
<th colspan="2" <th class="ijkpuntth" colspan="2"
style="border-right: 1px solid white; font-size: 10px; border-bottom: 1px solid #a07b8e; vertical-align: text-top; padding: 2px;" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e; ">
data-bind="text: vantm "> <div class="ijkpuntthdiv" data-bind="text: vantm ">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 50px; overflow-y:hidden;"> <tr class="headpdf" >
<th colspan="1" <th class="ijkpuntth"
style="border-right: 1px solid #a07b8e; overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px;padding; 2px; padding-left: 3px;" style="border-right: 1px solid #a07b8e;">
data-bind=" text: orgnaam"> <div class="ijkpuntthdiv" data-bind=" text: orgnaam">
</div>
</th> </th>
<th colspan="1" <th class="ijkpuntth"
style="overflow: hidden; text-overflow: ellipsis; font-size: 10px; vertical-align: text-toptop; border-right: 1px solid white; padding: 2px; padding-left: 3px;" style=" border-right: 1px solid white; ">
data-bind=" text: naamV" > <div class="ijkpuntthdiv" data-bind=" text: naamV" >
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 30px; overflow-y:hidden;"> <tr class="headpdf" >
<th colspan="1" <th class="ijkpuntth"
style="font-size: 10px; border-right: 1px solid #a07b8e;padding: 2px; vertical-align: text-top padding-left: 3px;" style="border-right: 1px solid #a07b8e;">
data-bind="text: 'metingen: ' + metingen " > <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingen ">
</div>
</th> </th>
<th colspan="1" <th class="ijkpuntth"
style="font-size: 10px; border-right: 1px solid white; padding: 2px; vertical-align: text-top padding-left: 3px;" style="border-right: 1px solid white;">
data-bind="text: 'metingen: ' + metingenV " > <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingenV " >
</div>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody data-bind="foreach: scores"> <tbody data-bind="foreach: scores">
<tr style="border-bottom: 1px solid #ebebeb; max-height: 30px;"> <tr style="border-bottom: 1px solid #ebebeb; max-height: 30px;">
<td colspan="1" <td style="text-align:right; vertical-align:top; padding-right: 5px; color:#ffffff;"
style="text-align:right; vertical-align:top; padding-right: 5px; color:#ffffff;"
data-bind="text: gem, data-bind="text: gem,
style: {backgroundColor: kleur}"> style: {backgroundColor: kleur}">
</td> </td>
@@ -351,24 +367,27 @@
<!-- Nieuwste meting + ijkpunten van swv--> <!-- Nieuwste meting + ijkpunten van swv-->
<table class="tabelitem" data-bind="visible: tooninfo()== true && $root.isSWV() == true "> <table class="tabelitem" data-bind="visible: tooninfo()== true && $root.isSWV() == true ">
<thead> <thead>
<tr class="headpdf" style="height: 50px; overflow-y: hidden " > <tr class="headpdf" >
<th style= "border-right: 1px solid white; vertical-align: text-top; width: 100px; padding: 2px; font-size: 10px; height: 50px; border-bottom: 1px solid #a07b8e;" <th class="ijkpuntth" style="border-bottom: 1px solid #a07b8e;">
data-bind="text: vantm "> <div class="ijkpuntthdiv" data-bind="text: vantm ">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 50px;overflow-y: hidden "> <tr class="headpdf" >
<th style=" overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px; height: 40px;padding: 2px; padding-left: 3px;" <th class="ijkpuntth">
data-bind=" text: orgnaam"> <div class="ijkpuntthdiv" data-bind=" text: orgnaam">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 30px;overflow-y: hidden "> <tr class="headpdf" >
<th style="font-size: 10px; height: 20px; vertical-align: text-top; padding: 2px; padding-left: 3px;" <th class="ijkpuntth">
data-bind="text: 'metingen: ' + metingen " > <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingen ">
</div>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody data-bind="foreach: scores"> <tbody data-bind="foreach: scores">
<tr style="border-bottom: 1px solid #ebebeb; max-height: 30px; vertical-align: text-top; padding: 2px;"> <tr style="border-bottom: 1px solid #ebebeb; vertical-align: text-top; padding: 2px;">
<td style="text-align:right; vertical-align:top; padding-right: 5px; color:#ffffff;" <td style="text-align:right; vertical-align:top; padding-right: 5px; color:#ffffff;"
data-bind="text: gem, data-bind="text: gem,
style: {backgroundColor: kleur}"> style: {backgroundColor: kleur}">
@@ -378,22 +397,25 @@
</table> </table>
<!-- Metingen ter vergelijking van swv--> <!-- Metingen ter vergelijking van swv-->
<table class="tabelitem"data-bind="visible: tooninfo() == false && $root.isSWV() == true"> <table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == true">
<thead> <thead>
<tr class="headpdf" style="height: 50px; overflow-y: hidden border-bottom: none"> <tr class="headpdf" style=" border-bottom: none">
<th style="border-right: 1px solid white; font-size: 10px; height: 40px;border-bottom: 1px solid #a07b8e;vertical-align: text-top; padding: 2px;" <th class="ijkpuntth" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;"
data-bind="text: vantm "> ><div class="ijkpuntthdiv" data-bind="text: vantm ">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 50px; overflow-y: hidden"> <tr class="headpdf" >
<th <th class="ijkpuntth"
style="border-right: 1px solid white; height: 40px; overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px; padding: 2px; padding-left: 3px;" style="border-right: 1px solid white; "
data-bind=" text: orgnaam"> ><div class="ijkpuntthdiv" data-bind=" text: orgnaam">
</div>
</th> </th>
</tr> </tr>
<tr class="headpdf" style="height: 30px;overflow-y: hidden"> <tr class="headpdf" >
<th style="font-size: 10px; border-right: 1px solid white; padding: 2px; padding-left: 3px; height: 20px; vertical-align: text-top" <th style=" border-right: 1px solid white; "
data-bind="text: 'metingen: ' + metingen " > ><div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingen " >
</div>
</th> </th>
</tr> </tr>
</thead> </thead>
public/css/monpas/main.css
+9
View File
@@ -1327,3 +1327,12 @@ z-index: 50;
.h4koppdf{ .h4koppdf{
} }
.ijkpuntthdiv{
height: 50px;
overflow:hidden;
font-size: 10px;
}
.ijkpuntth {
vertical-align:top;
padding: 2px;
}