From c00ffa6600a503b687a50e58a0f860c8d36fe861 Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Thu, 10 Mar 2022 15:36:54 +0100
Subject: [PATCH] Verbetraanpak $ Scan Zorg in compacsop

---
 .../monpas/compactsop/Compacteonderdelen.php  |  6 ++++-
 .../monpas/compactsop/ijktabelcompact.php     | 10 ++++---
 .../maaksoponderdelen/kiesonderdelen.php      | 14 +++-------
 .../maaksoponderdelen/maaklayout.php          | 16 ++++--------
 .../views/monpas/compactsop/paginacompact.php |  9 +++----
 public/js/monpas/models/compactsopmodel.js    | 26 +++++++++----------
 6 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/application/libraries/monpas/compactsop/Compacteonderdelen.php b/application/libraries/monpas/compactsop/Compacteonderdelen.php
index c0d36ed..372d3c4 100644
--- a/application/libraries/monpas/compactsop/Compacteonderdelen.php
+++ b/application/libraries/monpas/compactsop/Compacteonderdelen.php
@@ -193,6 +193,9 @@ class Compacteonderdelen
             case 10:
                 $this->setDiversiteit();
                 break;
+            case 11:
+            case 12:   $this->setIJkpunten();
+                break;
         }
     }
 
@@ -435,7 +438,8 @@ class Compacteonderdelen
         if($this->data){
             $this->onderdeel['data'] =
             ['data' =>$this->data,
-             'naam' =>$result->naam ];
+             'naam' =>$result->naam,
+             'chartid'=>$result->blokid];
         }
 
     }
diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php
index 9e104da..2d116ed 100644
--- a/application/views/monpas/compactsop/ijktabelcompact.php
+++ b/application/views/monpas/compactsop/ijktabelcompact.php
@@ -16,10 +16,12 @@
             <?php }; ?>
         <?php }; ?>
     </div>
+    <?php if($chartid){ ?>
     <div    class="sopKaderGrafiek  highcharts-background"
-            id="chartCompactIJk"
+            id="<?= $chartid ?>"
             style="width: 355px; height:140px; background-color: #ffffff; text-align:center">
     </div>
+    <?php }; ?>
     <script>
         <?php if ($data['lijsten']){ ?>
         $(function(){
@@ -134,7 +136,7 @@
 
 
                 var ijkgrafiek;
-                ijkgrafiek = Highcharts.chart('chartCompactIJk', {
+                ijkgrafiek = Highcharts.chart('<?= $chartid ?>', {
                     chart:{
                         width:350,
                         animation: false,
@@ -217,11 +219,11 @@
 
     <div class="sopKaderTabel"  >
         <?php if ($data['lijsten'][0]->scores){ ?>
-            <table  class="sopTabel" >
+            <table  class="sopTabel" style="width:355px; " >
                 <thead >
                     <tr style="">
                         <th style="width: 20px;     padding-left:3px;  ">nr</th>
-                        <th style="width: 230px;    padding-left:3px; "> <?=$data['lijsten'][0]->label?></th>
+                        <th style="width: 275px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;  padding-left:3px; "> <?=$data['lijsten'][0]->label?></th>
                         <?php foreach ($data['lijsten'] as $lijst){ ?>
                             
                                 <th style=" width: 30px;     
diff --git a/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php b/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
index 47acf1f..c1fe67e 100644
--- a/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+++ b/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
@@ -11,7 +11,7 @@
 
     <div class="col-xs-4" >
         <div class="panel-group" data-bind="foreach: onderdelen ">
-            <!-- ko if:  (toonnummer <= 4 && $parent.orgsoortnummer() == 4) ||
+            <!-- ko if:  (toonnummer <= 5 && $parent.orgsoortnummer() == 4) ||
             (toonnummer <= 3 && $parent.orgsoortnummer() != 4) -->
             <?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
             <!-- /ko -->
@@ -21,7 +21,7 @@
     <div class="col-xs-4" 
          style="border-right: 1px solid lightgrey">
         <div  class="panel-group" data-bind="foreach: onderdelen ">
-            <!-- ko if:  (toonnummer > 4 && $parent.orgsoortnummer() == 4) ||
+            <!-- ko if:  (toonnummer > 5 && $parent.orgsoortnummer() == 4) ||
              (toonnummer > 3 && $parent.orgsoortnummer() != 4) -->
                  <?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
             <!-- /ko -->    
@@ -36,10 +36,7 @@
                       style="background-color:#930f50; 
                             color: white; padding: 10px; margin: 5px; 
                             margin-right: 15px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 10px; vertical-align:top"
-                           data-bind="text: toonnummer + '. ' ">
-                    </label>
-                    <label style="padding-top: 15px; width: 50px;"
+                    <label style="padding-top: 15px; width: 50px; font-size: small;"
                            data-bind="text: naamkort2() ">
                     </label>
                 </div>
@@ -49,10 +46,7 @@
                       data-bind="click: $root.fAnnuleerOnderdeel"
                       style="background-color:#930f50; color: white; 
                             margin: 5px; padding: 10px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 10px; vertical-align:top"
-                           data-bind="text: toonnummer + '. ' ">
-                    </label>
-                    <label style="padding-top: 15px; width: 50px;"
+                    <label style="padding-top: 15px; width: 50px; font-size: small;"
                            data-bind="text: naamkort2() ">
                     </label>
                 </div>
diff --git a/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php b/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
index bbbf2e8..b4046cf 100644
--- a/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+++ b/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
@@ -15,14 +15,14 @@
                                                             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">
+                                    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;  " data-bind="text: toonnummer()+ ' '+ naamkort2()">
+                                    <div style="color: white; font-size: small " data-bind="text: naamkort2()">
                                     </div>
                                 </div>
                             </div>
@@ -39,7 +39,7 @@
                                     </div>
                                 </div>
                                 <div data-bind="visible: gevuld()">
-                                    <div style="color: white;  " data-bind="text: toonnummer() + ' '+ naamkort2()">
+                                    <div style="color: white; font-size: small " data-bind="text: naamkort2()">
                                     </div>
                                 </div>
                             </div>
@@ -68,10 +68,7 @@
                                     style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer  ? '#69970f' : '#930f50'}"
                       style     ="  color: white; padding: 10px; margin: 5px; 
                                     margin-right: 15px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 10px; vertical-align:top"
-                           data-bind="text: toonnummer + '. ' ">
-                    </label>
-                    <label style="padding-top: 15px; width: 50px;"
+                    <label style="padding-top: 15px; width: 50px; font-size: small"
                            data-bind="text: naamkort2() ">
                     </label>
                 </div>
@@ -83,10 +80,7 @@
                                  style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().nummer == nummer  ? '#69970f' : '#930f50'},"
                       style="color: white; 
                             margin: 5px; padding: 10px; height: 150px; ">
-                    <label style="padding-top: 15px; width: 10px; vertical-align:top"
-                           data-bind="text: toonnummer + '. ' ">
-                    </label>
-                    <label style="padding-top: 15px; width: 50px;"
+                    <label style="padding-top: 15px; width: 50px; font-size: small"
                            data-bind="text: naamkort2() ">
                     </label>
                 </div>
diff --git a/application/views/monpas/compactsop/paginacompact.php b/application/views/monpas/compactsop/paginacompact.php
index a428ee4..2600a7f 100644
--- a/application/views/monpas/compactsop/paginacompact.php
+++ b/application/views/monpas/compactsop/paginacompact.php
@@ -589,7 +589,7 @@
         }
 
         .sopKaderTabel {
-            width           : 100%;
+            width           : 95%;
             height          : 225px;
             font-size       : 0.65em !important; 
             font-weight     : normal;
@@ -597,14 +597,13 @@
 
         .sopTabel{
             border-collapse : collapse;
-            
             margin-top      : 0;
             margin-bottom   : 10px;
             margin-left     : auto;
             margin-right    : auto;
-           
             table-layout     : fixed;
-            overflow-y       : hidden;
+            overflow       : hidden;
+
         }
         
         .sopTabel thead tr th {
@@ -673,7 +672,7 @@
             margin-left     : 10px;
             max-height      : 95%;
             min-width:      : 70%;
-            max-width       : 100%;
+            max-width       : 95%;
             font-size         : 0.7em;
         }
 
diff --git a/public/js/monpas/models/compactsopmodel.js b/public/js/monpas/models/compactsopmodel.js
index 7e4ae4b..aa19d3e 100644
--- a/public/js/monpas/models/compactsopmodel.js
+++ b/public/js/monpas/models/compactsopmodel.js
@@ -29,18 +29,19 @@ mh.initCompactSopModel = function(){
         this.geenLicentie  = ko.observable(o.licentie == "T" ? false : true);
         this.naam          = o.naam;
         this.naamkort2     = ko.observable(o.naamkort);
-        switch(o.nummer){
-            case '1': dit.naamkort2('Diversiteit'); break;
-            case '2': dit.naamkort2('Bas.Ond.'); break;
-            case '3': dit.naamkort2('Omvang Ond.');break;
-            case '4': dit.naamkort2('Kwal. Ond.'); break;
-            case '5': dit.naamkort2('Exp.Team'); break;
-            case '6': dit.naamkort2('Tevr. School'); break;
-            case '7': dit.naamkort2('Middelen'); break;
-            case '8': dit.naamkort2('Passend Ond.'); break;
-            case '9': dit.naamkort2('Exp. SO & SBO'); break;
-            case '10': dit.naamkort2('Diversiteit'); break;
-        }
+        // switch(o.nummer){
+        //     case '1': dit.naamkort2('Diversiteit'); break;
+        //     case '2': dit.naamkort2('Bas.Ond.'); break;
+        //     case '3': dit.naamkort2('Omvang Ond.');break;
+        //     case '4': dit.naamkort2('Kwal. Ond.'); break;
+        //     case '5': dit.naamkort2('Exp.Team'); break;
+        //     case '6': dit.naamkort2('Tevr. School'); break;
+        //     case '7': dit.naamkort2('Middelen'); break;
+        //     case '8': dit.naamkort2('Passend Ond.'); break;
+        //     case '9': dit.naamkort2('Exp. SO & SBO'); break;
+        //     case '10': dit.naamkort2('Diversiteit'); break;
+        //     case
+        // }
         this.groepen         = ko.observable(o && o.groepen && o.groepen > 8 ? o.groepen : 0);
         this.schooltype      = o.schooltype;
         this.modulenr        = o.modulenr;
@@ -336,7 +337,6 @@ mh.initCompactSopModel = function(){
                         case '4': self.orgsoort('School');
                             self.label('SOP');
                             break;
-
                     }
                 }
                 self.druk(true);