From 4a4275f48529dff541a8b5bb81b9b8c01f7661ba Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Mon, 28 Mar 2022 13:42:36 +0200
Subject: [PATCH] fouten grafieken omvang + ruimere layout lijst

---
 application/core/MY_Controller.php         |  4 +-
 application/views/monpas/pages/monitor.php | 62 ++++++++++++----------
 public/js/monpas/models/omvangmodel.js     | 12 ++---
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 9952dc9..69cd875 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -67,7 +67,9 @@ class MY_Controller extends CI_Controller{
 //      public $version = '1.17.90'; // sops ordenen per eigen criterium
 //    public $version = '1.17.91'; // grafieken in 3d
 //    public $version = '1.17.92'; // Scan en Verbeteraanpak Pa.O.in Compact Sop
-    public $version = '1.17.93';// stuur bijlage bij new wachtwoord
+//    public $version = '1.17.93';// stuur bijlage bij new wachtwoord
+    public $version = '1.17.94';// verbeteringen invullijst, fout omvang
+
     
     public $partituurid;
 	public $globProfielVersieID = 1;
diff --git a/application/views/monpas/pages/monitor.php b/application/views/monpas/pages/monitor.php
index 5bfb7a2..45b6a2e 100644
--- a/application/views/monpas/pages/monitor.php
+++ b/application/views/monpas/pages/monitor.php
@@ -48,52 +48,55 @@
                 <tr >
                     <td colspan = 2>
                         <!-- ko if: $parent.selectedOrgversion() && $parent.selectedOrgversion().toonOmschrijving()== false -->
-                        <table style="width:100%">
-                            <tr>
-                                <th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
-                                    data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> nr
-                                </th>
-                                <th class="header2" style="width: 50%;padding-left: 2px"
-                                    data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}">indicator
-                                </th>
-                                <th class="header2" style="width: 40%;padding-left: 2px;text-align:left"
-                                    data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> score
-                                </th>
-                            </tr>
-                            <tbody data-bind="foreach: indicatorscores">
-                            <tr style="border-bottom: 1px solid #ebebeb">
-                                <td style="text-align:right;vertical-align:top" data-bind="text: nummer,
+                        <table style="width:100%" data-bind="foreach: indicatorscores">
+                            <thead data-bind="visible: $index() == 0">
+                                <tr>
+                                    <th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
+                                        data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'} "> nr
+                                    </th>
+                                    <th class="header2" style="padding-left: 2px"
+                                        data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
+                                                   attr: {width: scoretype > 5 ?  '65%': '72%'  } ">
+                                    </th>
+                                    <th class="header2" style="padding-left: 2px;text-align:left"
+                                        data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
+                                                   attr: {width: scoretype  > 5 ?  '32%': '22%'} "> score
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody >
+                            <tr style="border-bottom: 1px solid #ebebeb; ">
+                                <td style="text-align:right;vertical-align:top; padding-top: 5px;" data-bind="text: nummer,
                                                                                        style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }">
                                 </td>
                                 <td data-bind="text: omschrijving,
-                                           style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top">
+                                           style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top; padding-top: 5px;">
                                 </td>
-                                <td>
-                                <div class="nietVoorPdf">
-                                    <span data-bind="visible: scoretype==1">
+                                <td style="vertical-align:top; padding-top: 5px;" >
+
+                                    <span class="nietVoorPdf" data-bind="visible: scoretype==1">
                                         <input class="rapport"
                                                data-bind="textInput: score,
                                                           event:{input: $root.fUpdateScoretype12},
                                                           enable: $root.editok() && $parent.disabled() == false,
                                                           attr:{'id' : $index}" />
                                    </span>
-                                </div>
-                                <div class="alleenVoorPdf">
-                                    <span data-bind="visible: scoretype==1 || scoretype == 2,
+
+                                    <span class="alleenVoorPdf" data-bind="visible: scoretype==1 || scoretype == 2,
                                                      text: score">
                                     </span>
-                                </div>
-                                <div class="nietVoorPdf">
-                                    <span data-bind="visible: scoretype == 2">
+
+
+                                    <span class="nietVoorPdf"data-bind="visible: scoretype == 2">
                                          <input class="integer"
                                           data-bind="textInput: score,
                                                       event:{input: $root.fUpdateScoretype12},
                                                        visible: scoretype==2,
                                                         enable: $root.editok() && $parent.disabled() == false" /> %
                                     </span>
-                                </div>
 
-                                    <div data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 ||  scoretype==7 ">
+
+                                    <span data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 ||  scoretype==7 ">
                                         <!-- ko if: $parent.disabled() == false -->
                                         <!-- ko foreach:  $root.scoreopties -->
                                         <!-- ko if: $parent.scoretype == type -->
@@ -103,7 +106,7 @@
                                                       event:{click: $root.fUpdateScoretypeVanaf3.bind($data, $parent.id)},
                                                       attr: {'name': $parent.id , 'value': value, 'checked': value == $parent.score()},
                                                       enable: $root.editok() " />
-                                        <span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span>
+                                        <span style="vertical-align:top; display: inline-block; margin-left:5px;margin-right: 20px;" data-bind="text: optie"> </span>
                                         <!-- /ko -->
                                         <!-- /ko -->
                                         <!-- /ko -->
@@ -113,10 +116,11 @@
                                         <input type='radio'
                                                data-bind="checked: $parent.score(),
                                                       enable: false " />
-                                        <span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span>
+                                        <span style="vertical-align:top; display: inline-block; margin-left:5px; margin-right: 20px;" data-bind="text: optie"> </span>
                                         <!-- /ko -->
                                         <!-- /ko -->
                                         <!-- /ko -->
+                                    </span>
                                 </td>
                             </tr>
                             </tbody>
diff --git a/public/js/monpas/models/omvangmodel.js b/public/js/monpas/models/omvangmodel.js
index 8090ab1..5310359 100644
--- a/public/js/monpas/models/omvangmodel.js
+++ b/public/js/monpas/models/omvangmodel.js
@@ -372,8 +372,8 @@ mh.initOmvangModel = function(){
 					aantal.push(Number(o.aantalleerlingen));
 					var aantalsbo = 0;
 					var aantalso = 0;
-					if(o.licht) aantalsbo = Number(o.licht);
-					if(o.zwaar) aantalsbo = aantalsbo + Number(o.zwaar);
+					if(o.licht()) aantalsbo = Number(o.licht());
+					if(o.zwaar()) aantalsbo = aantalsbo + Number(o.zwaar());
 					datasbo.push(Number(aantalsbo) > 0 ? Number(aantalsbo) : null);
 					if(o.laag())  aantalso = (Number(o.laag()));
 					if(o.midden())  aantalso = aantalso + Number(o.midden());
@@ -644,7 +644,7 @@ mh.initOmvangModel = function(){
 					chart: {
 						plotBackgroundColor: null,
 						plotBorderWidth: null,
-						height: 800,
+						height: 850,
 						plotShadow: false,
 						type: 'pie',
 						margin: [0, 0, 0, 0],
@@ -683,10 +683,10 @@ mh.initOmvangModel = function(){
 						padding: 0,
 						verticalAlign: 'top',
 						floating: false,
-						x: -5,
+						x: 0,
 						y: 260,
-						width: 350,
-						height: 500,
+						// width: 350,
+						// height: 500,
 						itemWidth: breedte,
 						itemDistance: 0,