From 9f086fedd5bccbb8f704d713fc3be76a529e9b20 Mon Sep 17 00:00:00 2001
From: Monique Hansma <m.hansma@pensare.nl>
Date: Thu, 25 Jan 2024 13:49:39 +0100
Subject: [PATCH] tussenstand

---
 application/core/MY_Controller.php           |   2 +-
 application/views/monpas/pages/ijkpunten.php | 156 +++++++++++--------
 public/css/monpas/main.css                   |   9 ++
 3 files changed, 99 insertions(+), 68 deletions(-)

diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 05eb7b0..c8eb24c 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -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.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.19';// tussenstand vormgeving ijkpunten
+    public $version = '1.20.21';// tussenstand vormgeving ijkpunten
 
     public $partituurid;
 	public $globProfielVersieID = 1;
diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php
index a5abb03..8b7141f 100644
--- a/application/views/monpas/pages/ijkpunten.php
+++ b/application/views/monpas/pages/ijkpunten.php
@@ -218,14 +218,14 @@
 
                 <table class="tabelitem1pdf">
                     <thead>
-                        <tr style="height: 130px;" class="headpdf">
-                            <th
-                                style="border-right: 1px solid white;  padding: 3px; padding-left: 10px;vertical-align: text-top;  border-bottom: none">
-                                nr
+                        <tr  class="headpdf">
+                            <th class="ijkpuntth"
+                                style="border-right: 1px solid white;  border-bottom: 1px solid #a07b8e; padding-left: 4px;">
+                                <div style="height: 140px; ">nr</div>
+
                             </th>
-                            <th
-                                style="border-right: 1px solid white;  padding: 3px; padding-left: 4px;vertical-align: text-top; border-bottom: none" data-bind="text: label"
-                                >
+                            <th class="ijkpuntth"
+                                style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;padding-left: 4px;"><div style="height: 130px; " data-bind="text: label"></div>
                             </th>
 
                         </tr>
@@ -233,11 +233,13 @@
                     <tbody  >
 
                     <!--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 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>
 
                         </tr>
@@ -262,29 +264,39 @@
 <!--                    Nieuwste meting + ijkpunten van school, bestuur en kamer-->
                 <table class="tabelitem"  data-bind="visible: $root.isSWV()==false && tooninfo() == true">
                     <thead>
-                        <tr class="headpdf " style="height: 50px; overflow-y:hidden;">
-                            <th colspan="2"
-                                style="border-right: 1px solid white; width: 100px; font-size: 10px; border-bottom: 1px solid #a07b8e; padding: 2px; vertical-align: text-top"
-                                data-bind="text: vantm ">
+                        <tr class="headpdf " >
+                            <th colspan="2" class="ijkpuntth"
+                                style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;">
+                                <div class="ijkpuntthdiv"
+                                     data-bind="text: vantm">
+                                </div>
                             </th>
                         </tr>
-                        <tr class="headpdf " style="height: 50px; overflow-y:hidden;">
-                            <th colspan="1"
-                                style="border-right: 1px solid #a07b8e; overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px;padding: 2px; padding-left: 3px;"
-                                data-bind=" text: $root.selectedUser() ? $root.selectedUser().naam : orgnaam">
+                        <tr class="headpdf" >
+                            <th  class="ijkpuntth"
+                                 style="border-right: 1px solid #a07b8e;  vertical-align: top; ">
+                                 <div  data-bind=" text: $root.selectedUser() ? $root.selectedUser().naam : orgnaam"
+                                        class="ijkpuntthdiv">
+                                 </div>
                             </th>
 
-                            <th colspan="1"
-                                style=" text-overflow: ellipsis; font-size: 10px;vertical-align: text-top; border-right: 1px solid white;padding: 2px; padding-left: 3px;"
-                                data-bind=" text: naamV">
+                            <th class="ijkpuntth" style=" border-right: 1px solid white;">
+                                <div class="ijkpuntthdiv"
+                                     data-bind=" text: naamV">
+                                </div>
                             </th>
                         </tr>
-                        <tr class="headpdf" style="height: 30px; overflow-y:hidden;">
-                            <th colspan="1" style="font-size: 10px; border-right: 1px solid #a07b8e; vertical-align: text-top; padding: 2px; padding-left: 3px;"
-                                data-bind="text: 'metingen: ' + metingen " >
+                        <tr class="headpdf" >
+                            <th class="ijkpuntth" style="border-right: 1px solid #a07b8e">
+                                <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 colspan="1" style="font-size: 10px; border-right: 1px solid white; padding-left: 3px;"
-                                data-bind="text: 'metingen: ' + metingenV"></th>
                         </tr>
                     </thead>
                     <tbody data-bind="foreach: scores">
@@ -305,37 +317,41 @@
 
                 <table class="tabelitem" data-bind="visible: tooninfo() == false && $root.isSWV() == false && erzijnscores()== true; ">
                     <thead>
-                    <tr class="headpdf" style="height: 50px; border-bottom: none; overflow-y:hidden;">
-                        <th colspan="2"
-                            style="border-right: 1px solid white; font-size: 10px; border-bottom: 1px solid #a07b8e; vertical-align: text-top; padding: 2px;"
-                            data-bind="text: vantm ">
+                    <tr class="headpdf" >
+                        <th class="ijkpuntth" colspan="2"
+                            style="border-right: 1px solid white;  border-bottom: 1px solid #a07b8e; ">
+                            <div class="ijkpuntthdiv" data-bind="text: vantm ">
+                            </div>
                         </th>
                     </tr>
-                    <tr class="headpdf" style="height: 50px; overflow-y:hidden;">
-                        <th colspan="1"
-                            style="border-right: 1px solid #a07b8e; overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px;padding; 2px; padding-left: 3px;"
-                            data-bind=" text: orgnaam">
+                    <tr class="headpdf" >
+                        <th class="ijkpuntth"
+                            style="border-right: 1px solid #a07b8e;">
+                            <div class="ijkpuntthdiv"  data-bind=" text: orgnaam">
+                            </div>
                         </th>
-                        <th colspan="1"
-                            style="overflow: hidden; text-overflow: ellipsis; font-size: 10px; vertical-align: text-toptop; border-right: 1px solid white; padding: 2px; padding-left: 3px;"
-                            data-bind=" text: naamV"    >
+                        <th class="ijkpuntth"
+                            style=" border-right: 1px solid white; ">
+                            <div class="ijkpuntthdiv" data-bind=" text: naamV"  >
+                            </div>
                         </th>
                     </tr>
-                    <tr class="headpdf" style="height: 30px; overflow-y:hidden;">
-                        <th colspan="1"
-                            style="font-size: 10px; border-right: 1px solid #a07b8e;padding: 2px; vertical-align: text-top padding-left: 3px;"
-                            data-bind="text: 'metingen: ' + metingen " >
+                    <tr class="headpdf" >
+                        <th class="ijkpuntth"
+                            style="border-right: 1px solid #a07b8e;">
+                            <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingen ">
+                            </div>
                         </th>
-                        <th colspan="1"
-                            style="font-size: 10px; border-right: 1px solid white; padding: 2px; vertical-align: text-top padding-left: 3px;"
-                            data-bind="text: 'metingen: ' + metingenV " >
+                        <th class="ijkpuntth"
+                            style="border-right: 1px solid white;">
+                            <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingenV " >
+                            </div>
                         </th>
                     </tr>
                     </thead>
                     <tbody data-bind="foreach: scores">
                     <tr style="border-bottom: 1px solid #ebebeb; max-height: 30px;">
-                        <td colspan="1"
-                            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,
                                        style: {backgroundColor: kleur}">
                         </td>
@@ -351,24 +367,27 @@
 <!--                    Nieuwste meting + ijkpunten van swv-->
                 <table  class="tabelitem" data-bind="visible: tooninfo()== true && $root.isSWV() == true ">
                         <thead>
-                        <tr class="headpdf" style="height: 50px; overflow-y: hidden "  >
-                            <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;"
-                                data-bind="text: vantm ">
+                        <tr class="headpdf"  >
+                            <th class="ijkpuntth" style="border-bottom: 1px solid #a07b8e;">
+                                <div class="ijkpuntthdiv"  data-bind="text: vantm ">
+                                </div>
                             </th>
                         </tr>
-                        <tr class="headpdf" style="height: 50px;overflow-y: hidden ">
-                            <th style=" overflow: hidden; text-overflow: ellipsis; vertical-align: text-top; font-size: 10px; height: 40px;padding: 2px;  padding-left: 3px;"
-                                data-bind=" text: orgnaam">
+                        <tr class="headpdf" >
+                            <th class="ijkpuntth">
+                                <div class="ijkpuntthdiv" data-bind=" text: orgnaam">
+                                </div>
                             </th>
                         </tr>
-                        <tr class="headpdf" style="height: 30px;overflow-y: hidden ">
-                            <th style="font-size: 10px; height: 20px; vertical-align: text-top; padding: 2px; padding-left: 3px;"
-                                data-bind="text: 'metingen: ' + metingen " >
+                        <tr class="headpdf" >
+                            <th class="ijkpuntth">
+                                <div class="ijkpuntthdiv" style="height: 30px;" data-bind="text: 'metingen: ' + metingen ">
+                                </div>
                             </th>
                         </tr>
                         </thead>
                         <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;"
                                 data-bind="text: gem,
                                                  style: {backgroundColor: kleur}">
@@ -378,22 +397,25 @@
                     </table>
 
 <!--                    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>
-                        <tr class="headpdf" style="height: 50px; overflow-y: hidden 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;"
-                                data-bind="text: vantm ">
+                        <tr class="headpdf" style=" border-bottom: none">
+                            <th class="ijkpuntth" style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;"
+                               ><div class="ijkpuntthdiv"  data-bind="text: vantm ">
+                                </div>
                             </th>
                         </tr>
-                        <tr class="headpdf" style="height: 50px; overflow-y: hidden">
-                            <th
-                                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;"
-                                data-bind=" text: orgnaam">
+                        <tr class="headpdf" >
+                            <th class="ijkpuntth"
+                                style="border-right: 1px solid white;  "
+                                ><div class="ijkpuntthdiv" data-bind=" text: orgnaam">
+                                </div>
                             </th>
                         </tr>
-                        <tr class="headpdf" style="height: 30px;overflow-y: hidden">
-                            <th style="font-size: 10px; border-right: 1px solid white; padding: 2px; padding-left: 3px; height: 20px; vertical-align: text-top"
-                                data-bind="text: 'metingen: ' + metingen " >
+                        <tr class="headpdf" >
+                            <th style=" border-right: 1px solid white; "
+                               ><div class="ijkpuntthdiv"  style="height: 30px;" data-bind="text: 'metingen: ' + metingen " >
+                                </div>
                             </th>
                         </tr>
                         </thead>
diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css
index 278443b..994b0f3 100644
--- a/public/css/monpas/main.css
+++ b/public/css/monpas/main.css
@@ -1327,3 +1327,12 @@ z-index: 50;
 .h4koppdf{
 
 }
+.ijkpuntthdiv{
+	height: 50px;
+	overflow:hidden;
+	font-size: 10px;
+}
+.ijkpuntth {
+	vertical-align:top;
+	padding: 2px;
+}
\ No newline at end of file