From 73d41601051ce80e56a0f2d6ddd161e2ac7fb87e Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Wed, 11 May 2022 12:44:08 +0200
Subject: [PATCH] kortere subtitel op sopblokjes

---
 application/core/MY_Controller.php                      | 2 +-
 application/libraries/monpas/ijkpunten/Lijsten.php      | 8 ++++----
 application/views/monpas/compactsop/ijktabelcompact.php | 5 +++--
 application/views/monpas/pages/instrumentencp.php       | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 63ab9d5..25765ca 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -71,7 +71,7 @@ class MY_Controller extends CI_Controller{
 //    public $version = '1.17.95';// verbeteringen invullijst, fout omvang
 //    public $version = '1.17.96';// nieuwe handleidingen
 //    public $version = '1.17.97';// omvang geen grafiek bij 0 resultaten
-    public $version = '1.17.98';// alle instrumenten in compact sop
+    public $version = '1.17.99';// alle instrumenten in compact sop
 
 
 
diff --git a/application/libraries/monpas/ijkpunten/Lijsten.php b/application/libraries/monpas/ijkpunten/Lijsten.php
index 2423182..352c06b 100644
--- a/application/libraries/monpas/ijkpunten/Lijsten.php
+++ b/application/libraries/monpas/ijkpunten/Lijsten.php
@@ -500,16 +500,16 @@ class Lijsten
         $scholen = ' scholen';
        if(intval($this->lijst->aantalorgs) == 1) $scholen = ' school';
        $toevoeging = '';
-       $versie = ' , schoolversie';
+       $versie = ', schoolversie';
        if(intval($this->lijst->vorm) == 2) {
-           $versie = ' , individuele versie';
-           $metingen = ' metingen';
+           $versie = ', individuele versie';
+           $metingen =' metingen';
            if(intval($this->lijst->metingen) == 1) $metingen = ' meting';
            $toevoeging = ', '. $this->lijst->metingen.  $metingen;
 
        }
        if(intval($this->soort < 4))         $toevoeging .= ', '. $this->lijst->aantalorgs. $scholen;
-       $this->lijst->vantm         = "periode " . $this->lijst->orgversie->periodenummer . " van " .
+       $this->lijst->vantm         = "p. " . $this->lijst->orgversie->periodenummer . " van " .
            mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm) .
            $versie . $toevoeging;
    }
diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php
index f6484c7..7a3d809 100644
--- a/application/views/monpas/compactsop/ijktabelcompact.php
+++ b/application/views/monpas/compactsop/ijktabelcompact.php
@@ -12,6 +12,7 @@
                 <?php foreach($data['lijsten'] as $index => $lijst){ ?>
                     <p  class="subTitel2"><?php echo $lijst->vantm ?></p>
                 <?php }; ?>
+
             
             <?php }; ?>
         <?php }; ?>
@@ -260,8 +261,8 @@
                     <?php ;} ; ?>
                 </tbody>
                 <tr >
-                    <td colspan="8" 
-                        class="inforegel">Scores in procenten </td>
+                    <td colspan="8"
+                        class="inforegel">Scores in procenten</td>
                 </tr>
             </table>
         <?php }; ?> <!-- if lijst[0]->scores  -->
diff --git a/application/views/monpas/pages/instrumentencp.php b/application/views/monpas/pages/instrumentencp.php
index e3badbd..4efe29d 100644
--- a/application/views/monpas/pages/instrumentencp.php
+++ b/application/views/monpas/pages/instrumentencp.php
@@ -16,7 +16,7 @@
                 <tr>
                     <td style="vertical-align: top">
                         <!-- ko if: $index() == 0 || ($index() > 0 && $root.modules()[$index()-1].cluster != cluster) -->
-                        <span data-bind="text: type == 'FIN' ?  cluster + ' (alleen voor scholen)': cluster"></span>
+                        <span data-bind="text: type == 'FIN' || type== 'DIV' ?  cluster + ' (alleen voor scholen)': cluster"></span>
                         <!--/ko -->
                     </td>