From a24d9b486f20e0ecf563832411d241b424649995 Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 29 Apr 2022 10:31:51 +0200
Subject: [PATCH] tussenopslag

---
 .../monpas/compactsop/Compacteonderdelen.php  |   3 +-
 .../monpas/compactsop/diversiteitcompact.php  | 286 ++++++------
 .../monpas/compactsop/middelencompact.php     |  20 +-
 .../views/monpas/compactsop/omvangcompact.php | 442 +++++++++++++++++-
 .../oud/diversiteitcompact2oud.php}           |   0
 .../oud/expertisecompactoud.php}              |   0
 .../oud/expertisecompactsosbooud.php}         |   0
 .../oud/extracompactoud.php}                  |   4 +-
 .../oud/inspectiecompactoud.php}              |   0
 .../{ => overzicht/oud}/omvangcompactbrs.php  |   0
 .../{ => overzicht/oud}/paginacompact2.php    |   0
 .../{ => overzicht/oud}/passendcompact.php    |   0
 .../{ => overzicht/oud}/tevredencompact.php   |   0
 .../{ => overzicht/oud}/tijdelijk2.php        |   0
 14 files changed, 587 insertions(+), 168 deletions(-)
 rename application/views/monpas/compactsop/{diversiteitcompact2.php => overzicht/oud/diversiteitcompact2oud.php} (100%)
 rename application/views/monpas/compactsop/{expertisecompact.php => overzicht/oud/expertisecompactoud.php} (100%)
 rename application/views/monpas/compactsop/{expertisecompactsosbo.php => overzicht/oud/expertisecompactsosbooud.php} (100%)
 rename application/views/monpas/compactsop/{extracompact.php => overzicht/oud/extracompactoud.php} (99%)
 rename application/views/monpas/compactsop/{inspectiecompact.php => overzicht/oud/inspectiecompactoud.php} (100%)
 rename application/views/monpas/compactsop/{ => overzicht/oud}/omvangcompactbrs.php (100%)
 rename application/views/monpas/compactsop/{ => overzicht/oud}/paginacompact2.php (100%)
 rename application/views/monpas/compactsop/{ => overzicht/oud}/passendcompact.php (100%)
 rename application/views/monpas/compactsop/{ => overzicht/oud}/tevredencompact.php (100%)
 rename application/views/monpas/compactsop/{ => overzicht/oud}/tijdelijk2.php (100%)

diff --git a/application/libraries/monpas/compactsop/Compacteonderdelen.php b/application/libraries/monpas/compactsop/Compacteonderdelen.php
index 5248c15..2422860 100644
--- a/application/libraries/monpas/compactsop/Compacteonderdelen.php
+++ b/application/libraries/monpas/compactsop/Compacteonderdelen.php
@@ -423,7 +423,8 @@ class Compacteonderdelen
             $this->onderdeel['data'] =
             ['data' =>$this->data,
              'naam' =>$this->onderdeel['naam'],
-             'chartid'=>'blokje' . $this->onderdeel['modulenr']  ];
+             'chartid'=>'blokje' . $this->onderdeel['modulenr'],
+             'orgsoort'=> $this->orgsoort  ];
         }
 
     }
diff --git a/application/views/monpas/compactsop/diversiteitcompact.php b/application/views/monpas/compactsop/diversiteitcompact.php
index 8ffd12b..40bd7cc 100644
--- a/application/views/monpas/compactsop/diversiteitcompact.php
+++ b/application/views/monpas/compactsop/diversiteitcompact.php
@@ -1,22 +1,22 @@
 
-    <div class="sopOnderdeelBlok">
-        <div class="sopTitelHolder" >
-            <p class="sopTitel"><?php echo $naam ?></p>
-        </div>
-        <div class="sopKaderDivHolder">
-            <table  class="sopKaderDivTabel"
-                    style=" table-layout: fixed;
+<div class="sopOnderdeelBlok">
+    <div class="sopTitelHolder" >
+        <p class="sopTitel"><?php echo $naam ?></p>
+    </div>
+    <div class="sopKaderDivHolder">
+        <table  class="sopKaderDivTabel"
+                style=" table-layout: fixed;
                             width       : 99% !important;
                             font-size   : 0.65em;">
-                <thead>
-                <tr >
-                    <th  style=" width:60px "></th>
-                    <?php
-                    if ($data['groepen']){
+            <thead>
+            <tr >
+                <th  style=" width:60px "></th>
+                <?php
+                if ($data['groepen']){
 //                            $aantal = count($data['groepen']);
 //                            $breedte = (80/$aantal).'%';
-                        foreach($data['groepen'] as $groep){ ?>
-                            <th style=" padding:0;
+                    foreach($data['groepen'] as $groep){ ?>
+                        <th style=" padding:0;
                                         margin:0;
                                         color: #ffffff !important;
                                         vertical-align:text-top !important;
@@ -30,13 +30,13 @@
                                         /*writing-mode: vertical-lr !important;*/
                                         ">
 
-                                    <div style=" -webkit-transform: rotate(90deg)!important;
+                            <div style=" -webkit-transform: rotate(90deg)!important;
                                                  -webkit-transform-origin: 10% 70% !important;
                                                  color:#ffffff !important"
-                                    ><?=$groep->naam?></div>
-                            </th>
-                        <?php  };};?>
-                    <th style=" padding:0;
+                            ><?=$groep->naam?></div>
+                        </th>
+                    <?php  };};?>
+                <th style=" padding:0;
                                  margin:0;
 
                                  vertical-align:text-top !important;
@@ -47,140 +47,142 @@
                                 /*-webkit-transform: rotate(90deg)!important;*/
                                 /*-webkit-transform-origin: 50% 50% !important;*/
                                     ">
-                                <div style="-webkit-transform: rotate(90deg)!important;
+                    <div style="-webkit-transform: rotate(90deg)!important;
                                             -webkit-transform-origin: 10% 80% !important;
                                             color: #ffffff !important">
-                                    Schooltotaal</div>
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr >
-                    <td > Totaal aantal leerlingen</td>
-                    <?php  $schooltotaal = 0;
-                    if ($data['groepen']){
-                        foreach($data['groepen'] as $groep){
-                            $schooltotaal = $schooltotaal + $groep->totaantal; ?>
-                            <td style=" padding-right: 2px; text-align: right"><?=$groep->totaantal?></td>
-                        <?php };};?>
-                    <td  style="text-align: right"><?=$schooltotaal?></td>
-                </tr>
+                        Schooltotaal</div>
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr >
+                <td > Totaal aantal leerlingen</td>
+                <?php  $schooltotaal = 0;
+                if ($data['groepen']){
+                    foreach($data['groepen'] as $groep){
+                        $schooltotaal = $schooltotaal + $groep->totaantal; ?>
+                        <td style=" padding-right: 2px; text-align: right"><?=$groep->totaantal?></td>
+                    <?php };};?>
+                <td  style="text-align: right"><?=$schooltotaal?></td>
+            </tr>
 
-                <tr >
-                    <td > Totale diversiteit per groep</td>
-                    <?php
-                    if ($data['groepen']){
-                        foreach ($data['groepen'] as $groep){ ?>
-                            <td style=" text-align: right; padding-right: 2px;"><?=$groep->groepdiversiteit?></td>
-                            <?php ;};} ;
-                    ?>
-                    <td style=" text-align: right; padding-right: 2px;"><?=number_format($data['schooldiversiteit'],1)?></td>
-                </tr>
-                <tr>
-                    <td> DQs</td>
-                    <?php
-                    $gewogensom=0;
-                    if ($data['groepen']){
-                        foreach ($data['groepen'] as $groep){
-                            ?>
-                            <td style=" text-align: right; padding-right: 2px;"><?=number_format($groep->dq, 2)?></td>
-                        <?php  } ;} ;
-                    ?>
-                    <td style=" text-align: right; padding-right: 2px;"><?=number_format($data['schooldq'], 2)?></td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-        <?php if ($data['groepen'] && $chartid){
-            $width = 600;
-            $aantal = count($data['groepen']);
-            if($aantal < 9) $width = 300;
-         }?>
-
-        <div class=" sopDivKaderGrafiek" style="margin-top: 25px; height: 230px;">
-            <div class="highcharts-background" id="<?= $chartid ?>" style="height:230px; width: <?php echo $width.'px'?>; "></div>
-        </div>
+            <tr >
+                <td > Totale diversiteit per groep</td>
+                <?php
+                if ($data['groepen']){
+                    foreach ($data['groepen'] as $groep){ ?>
+                        <td style=" text-align: right; padding-right: 2px;"><?=$groep->groepdiversiteit?></td>
+                        <?php ;};} ;
+                ?>
+                <td style=" text-align: right; padding-right: 2px;"><?=number_format($data['schooldiversiteit'],1)?></td>
+            </tr>
+            <tr>
+                <td> DQs</td>
+                <?php
+                $gewogensom=0;
+                if ($data['groepen']){
+                    foreach ($data['groepen'] as $groep){
+                        ?>
+                        <td style=" text-align: right; padding-right: 2px;"><?=number_format($groep->dq, 2)?></td>
+                    <?php  } ;} ;
+                ?>
+                <td style=" text-align: right; padding-right: 2px;"><?=number_format($data['schooldq'], 2)?></td>
+            </tr>
+            </tbody>
+        </table>
     </div>
+    <?php if ($data['groepen']){
+        $width = 600;
+        $aantal = count($data['groepen']);
+        if($aantal < 9) $width = 300;
+    }?>
 
-    <script>
-        <?php if ($data['groepen']){ ?>
-        $(function(){
-            fFillGraph1=function(){
-                var xas =[];
-                var yas = [];
+    <div class=" sopDivKaderGrafiek" style="margin-top: 25px; height: 230px;">
+        <div class="highcharts-background"
+             id="<?= $chartid ?>"
+             style="height:230px; width: <?php echo $width.'px'?>; "></div>
+    </div>
+</div>
 
-                <?php foreach($data['groepen'] as $index => $groep){ ?>
-                xas.push('<?=$groep->naam ?>');
-                yas.push(<?=$groep->dq?>);
-                <?php } ?>
+<script>
+    <?php if ($data['groepen']){ ?>
+    $(function(){
+        fFillGraph1=function(){
+            var xas =[];
+            var yas = [];
+
+            <?php foreach($data['groepen'] as $index => $groep){ ?>
+            xas.push('<?=$groep->naam ?>');
+            yas.push(<?=$groep->dq?>);
+            <?php } ?>
+
+            Highcharts.chart('<?= $chartid ?>', {
+                chart: {
+                    type: 'column',
+                    animation: false,
+                    backgroundColor: '#e6e6e6',
+                    options3d: {
+                        enabled: true,
+                        alpha: 15,
+                        beta: 15,
+                        depth: 50,
+                        viewDistance: 25
+                    }
+                },
+                title: {
+                    text: 'Diversiteitsquotient per groep',
+
+                    style: {
+                        fontSize: '12px',
+
+                    }
+                },
+                credits: {
+                    enabled: false
+                },
+
+                xAxis: {
+                    categories: xas,
+                    labels:{
+                        style:{
+                            fontSize: '10px'
 
-                Highcharts.chart('<?= $chartid ?>', {
-                    chart: {
-                        type: 'column',
-                        animation: false,
-                        backgroundColor: '#e6e6e6',
-                        options3d: {
-                            enabled: true,
-                            alpha: 15,
-                            beta: 15,
-                            depth: 50,
-                            viewDistance: 25
                         }
-                    },
+                    }
+
+                },
+                yAxis: {
+                    min: 0,
+                    tickInterval: 0.2,
                     title: {
-                        text: 'Diversiteitsquotient per groep',
-
-                        style: {
-                            fontSize: 12,
+                        text: 'DQ'
+                    },
+                    labels:{
+                        style:{
+                            fontSize: '8px'
 
                         }
-                    },
-                    credits: {
-                        enabled: false
-                    },
+                    }
+                },
 
-                    xAxis: {
-                        categories: xas,
-                        labels:{
-                            style:{
-                                fontSize: '10px'
+                plotOptions: {
+                    column: {
+                        pointWidth: null,
+                        groepPadding: 0,
+                        borderWidth: 0,
+                        color: '#7f036C'
+                    }
+                },
+                series: [{
+                    showInLegend: false,
+                    animation: false,
+                    name: 'groepen',
+                    data: yas
+                } ]
+            });
 
-                            }
-                        }
+        }()
+    });
+    <?php } ?>
 
-                    },
-                    yAxis: {
-                        min: 0,
-                        tickInterval: 0.2,
-                        title: {
-                            text: 'DQ'
-                        },
-                        labels:{
-                            style:{
-                                fontSize: '8px'
-
-                            }
-                        }
-                    },
-
-                    plotOptions: {
-                        column: {
-                            pointWidth: null,
-                            groepPadding: 0,
-                            borderWidth: 0,
-                            color: '#7f036C'
-                        }
-                    },
-                    series: [{
-                        showInLegend: false,
-                        animation: false,
-                        name: 'groepen',
-                        data: yas
-                    } ]
-                });
-
-            }()
-        });
-        <?php } ?>
-
-    </script>
+</script>
diff --git a/application/views/monpas/compactsop/middelencompact.php b/application/views/monpas/compactsop/middelencompact.php
index 24ba14c..48ce243 100644
--- a/application/views/monpas/compactsop/middelencompact.php
+++ b/application/views/monpas/compactsop/middelencompact.php
@@ -42,7 +42,7 @@
                         <tr style="border: 1px solid #ffffff; background-color:#d7d8d7 !important">
                             <td style=" font-weight: normal; "><?php echo $i+1 ?></td>
                             <td style=" font-weight: normal; padding-left: 3px; border-right:1px solid #ffffff;
-                                        overflow-y:hidden, overflow-x:hidden;
+                                        overflow-y:hidden; overflow-x:hidden;
                                         text-overflow:ellipsis;
                                         white-space: nowrap"><?php echo $data['subsoorten'][$i]->subsoort?></td>
                             <td style=" font-weight: normal; text-align: right; padding-left: 3px;">€</td>
@@ -65,8 +65,8 @@
             <?php if($data['somE'] != 0){ ?>
             <!-- eerst de grafiek, daaronder de tabel -->
             <div    class="highcharts-background" 
-                    style="height: 200px; width: 160px;" 
-                    id="chartExtra">
+                    style="height: 200px; width: 160px;"
+                    id="<?= $chartid ?>"
             </div>
             <!-- tabel -->
             
@@ -91,13 +91,13 @@
                         <tr style="font-weight:normal; background-color:#d7d8d7 !important">
                             <td style="padding-right: 3px; padding-left: 3px; border-right:1px solid #ffffff"><?php echo $data['subsoorten'][$i]->subsoort?></td>
                             <td style="padding-right: 3px; text-align: right; padding-left: 3px;">€</td>
-                            <td style="padding-right: 3px; padding-right: 3px; text-align: right;"><?php echo $data['subsoorten'][$i]->bedragNL?></td>
+                            <td style="padding-right: 3px; text-align: right;"><?php echo $data['subsoorten'][$i]->bedragNL?></td>
                         </tr>
                     <?php endif;} ?>
                     <tr style=" background-color:#d7d8d7 !important">
                         <td style="font-weight:bold !important;padding-right: 3px;  padding-left: 3px; border-right:1px solid #ffffff">Totaal</td>
                         <td style="font-weight:bold !important;padding-right: 3px;  text-align: right; padding-left: 3px;">€</td>
-                        <td style="font-weight:bold !important;padding-right: 3px;  padding-right: 3px; text-align: right"><?php echo $data['somE']?></td>
+                        <td style="font-weight:bold !important;padding-right: 3px;  text-align: right"><?php echo $data['somE']?></td>
                     </tr>
                 </tbody>
             </table>
@@ -113,8 +113,8 @@
 
             <!-- idem: eerst grafiek dan tabel -->
             <div    class="highcharts-background" 
-                    style="height: 200px; width: 200px;" 
-                    id="chartUitgavetypen" >
+                    style="height: 200px; width: 200px;"
+                    id="<?= $chartid . 'A' ?>" >
             </div>
             <!-- tabel --->
            
@@ -240,7 +240,7 @@
                     yas.push(<?=$subsoort->euros?>);
                     <?php  };  ?>
 
-                    Highcharts.chart('chartExtra', {
+                    Highcharts.chart('<?= $chartid ?>', {
                         chart: {
                             type: 'column',
                             backgroundColor: '#ffffff',
@@ -337,7 +337,7 @@
                     <?php  };  ?>
 
 
-                    Highcharts.chart('chartUitgavetypen', {
+                    Highcharts.chart('<?= $chartid. 'A' ?>', {
                         chart: {
                             plotBackgroundColor: null,
                             plotBorderWidth: null,
@@ -395,6 +395,6 @@
 
         </script>
     </div> <!-- sopKaderMiddelGrafiek -->
-</div>
+
 
 
diff --git a/application/views/monpas/compactsop/omvangcompact.php b/application/views/monpas/compactsop/omvangcompact.php
index c1b8b51..33c695f 100644
--- a/application/views/monpas/compactsop/omvangcompact.php
+++ b/application/views/monpas/compactsop/omvangcompact.php
@@ -3,8 +3,8 @@
 <script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
 <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
 
-
-
+<!--voor scholen-->
+<?php if($orgsoort == 'School'): ?>
 <div class="sopOnderdeelBlok">
         <div class="sopTitelHolder " >
                 <?php if($naam): ?>
@@ -44,7 +44,7 @@
         </div>
         <div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
 
-            <div id="tlvs" style="width: 300px; height: 150px;">
+            <div id="<?= $chartid. 'tlvs' ?>" style="width: 300px; height: 150px;">
             </div>
         </div>
         <?php else: ?>
@@ -53,7 +53,7 @@
         </div>
         <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
             <?php if($data[0]->tlvs) : ?>
-                <div id="tlvs" style="width: 175px; height: 150px;  margin: 0 auto;  padding: 0">
+                <div id="<?= $chartid. 'tlvs' ?>" style="width: 175px; height: 150px;  margin: 0 auto;  padding: 0">
                 </div>
             <?php else : ?>
                 <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
@@ -61,7 +61,7 @@
         </div>
         <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
             <?php if($data[1]->tlvs) : ?>
-            <div id="tlvsII" style="width: 175px; height: 150px;  margin: 0 auto;padding: 0">
+            <div id="<?= $chartid. 'tlvsII' ?>" style="width: 175px; height: 150px;  margin: 0 auto;padding: 0">
             </div>
             <?php else : ?>
                 <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
@@ -78,7 +78,7 @@
             <span class="subTitel2" style="padding: 0">Leerlingen per arrangement</span>
         </div>
         <div class="col-xs-12" style="border: 1px #ff0000; margin: 0 auto ;  padding: 0">
-            <div id="arrs" style="width: 300px; height: 150px;">
+            <div id="<?= $chartid. 'arrs' ?>" style="width: 300px; height: 150px;">
             </div>
         </div>
         <?php else: ?>
@@ -87,7 +87,7 @@
             </div>
             <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
                 <?php if($data[0]->arrangementen) : ?>
-                <div id="arrs" style="width: 175px; height: 150px;  margin: 0 auto;   padding: 0">
+                <div id="<?= $chartid. 'arrs' ?>" style="width: 175px; height: 150px;  margin: 0 auto;   padding: 0">
                 </div>
                 <?php else : ?>
                     <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen arrangementen</div>
@@ -95,7 +95,7 @@
             </div>
             <div class="col-xs-6" style="border: 1px #ff0000; margin: 0 auto; padding: 0">
                 <?php if($data[1]->arrangementen) : ?>
-                <div id="arrsII" style="width: 175px; height: 150px;  margin: 0 auto;   padding: 0">
+                <div id="<?= $chartid. 'arrsII' ?>" style="width: 175px; height: 150px;  margin: 0 auto;   padding: 0">
                 </div>
                 <?php else : ?>
                     <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen arrangementen</div>
@@ -108,7 +108,7 @@
 
  $(function(){
      <?php if(($data[0]->tlvs)) : ?>
-     var pieID = 'tlvs';
+     var pieID = <?= $chartid. 'tlvs' ?>;
 
             var aantallen = [
             <?php foreach($data[0]->tlvs as $tlv): ?>
@@ -153,7 +153,7 @@
      <?php endif ?>
 
      <?php if(isset($data[1] ) && $data[1]->tlvs) : ?>
-     var pieID = 'tlvsII'
+     var pieID = <?= $chartid. 'tlvsII' ?>;
      var aantallen2 = [
          <?php foreach($data[1]->tlvs as $tlv): ?>
          <?php if($tlv->zwaarte == 'HOOG'): ?>
@@ -197,7 +197,7 @@
      <?php endif ?>
 
      <?php if($data[0]->arrangementen) : ?>
-     var pieID = 'arrs';
+     var pieID = <?= $chartid. 'arrs' ?>;
      var arrs = [];
      <?php $llnoverig = 0; ?>
      var overigearrs = false;
@@ -228,8 +228,7 @@
      <?php $llnoverig = 0; ?>
      var overigearrs = false;
      <?php if(isset($data[1]) && $data[1]->arrangementen) : ?>
-     var pieID = 'arrsII';
-
+     var pieID = <?= $chartid. 'arrsII' ?>;
 
 
      var arrs2 = []
@@ -323,3 +322,420 @@
 
     </script>
     </div>
+<?php endif ?>
+<!--end scholen-->
+
+
+<!--voor besturen,kamers en swv-->
+
+<div class="sopOnderdeelBlok">
+    <div class="sopTitelHolder " >
+        <?php if($naam): ?>
+            <p class="sopTitel"><?php echo $naam ?></p>
+        <?php endif ?>
+        <?php if (!isset($data[1]) ): ?>
+            <div class="col-xs-12 sopTitel" style="width: 350px;">
+                <p class=" subTitel1"  ><?php echo $data[0]->aantallen->naam?></p>
+
+                <span class="subTitel2"><?php  echo $data[0]->aantallen->totaal ?></span>
+            </div>
+        <?php else : ?>
+            <div class="col-xs-6 sopTitel" style="width: 175px;">
+                <p class="subTitel1"  ><?php echo $data[0]->aantallen->naam?></p>
+
+                <span class="subTitel2"><?php  echo $data[0]->aantallen->totaal ?></span>
+            </div>
+            <div class="col-xs-6 sopTitel" style="width: 175px; display: inline-block;  ">
+                <p class="subTitel1"><?php echo $data[1]->aantallen->naam?></p>
+                <span class="subTitel2"><?php  echo $data[1]->aantallen->totaal;
+                    ?></span>
+            </div>
+        <?php endif ?>
+
+    </div>
+
+    <div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
+        <div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
+            <div id="<?= $chartid. 'omvangchart' ?>"
+                 style="width: 350px; height: 175px;">
+            </div>
+        </div>
+
+        <?php if ((!$data[0]->tlvs && !isset($data[1] ))|| (!$data[0]->tlvs && isset($data[1]) && !$data[1]->tlvs )):?>
+            <div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
+                <span class="subTitel2" style="padding: 0">Geen TLVs</span>
+            </div>
+        <?php elseif(! isset($data[1])) : ?>
+            <div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
+                <span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span>
+            </div>
+            <div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
+
+                <div id="<?= $chartid. 'tlvs' ?>"
+                     style="width: 300px; height: 150px;">
+                </div>
+            </div>
+        <?php else: ?>
+            <div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
+                <span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span>
+            </div>
+            <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
+                <?php if($data[0]->tlvs) : ?>
+                    <div id="<?= $chartid. 'tlvs' ?>" style="width: 175px; height: 150px;  margin: 0 auto;  padding: 0">
+                    </div>
+                <?php else : ?>
+                    <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
+                <?php endif ?>
+            </div>
+            <div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
+                <?php if($data[1]->tlvs) : ?>
+                    <div id="<?= $chartid. 'tlvsII' ?>" style="width: 175px; height: 150px;  margin: 0 auto;padding: 0">
+                    </div>
+                <?php else : ?>
+                    <div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
+                <?php endif ?>
+            </div>
+        <?php endif ?>
+    </div>
+
+    <script>
+        $(function(){
+            <?php if(($data[0]->tlvs)) : ?>
+            var pieID = <?= $chartid. 'tlvs' ?>;
+
+            var aantallen = [
+                <?php foreach($data[0]->tlvs as $tlv): ?>
+                <?php if($tlv->zwaarte == 'HOOG'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') so hoog',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#4d9900'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'MIDDEN'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') so midden',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#66cc00'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'LAAG'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') so laag',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#d9ffb3'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'ZWAAR'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') sbo zwaar',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#005c99'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'LICHT'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') sbo licht',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#99d6ff'
+                },
+                <?php endif; ?>
+                <?php endforeach; ?>
+            ]
+            maakPie(pieID,  aantallen);
+            <?php endif ?>
+
+            <?php if(isset($data[1] ) && $data[1]->tlvs) : ?>
+            var pieID = <?= $chartid. 'tlvsII' ?>
+            var aantallen2 = [
+                <?php foreach($data[1]->tlvs as $tlv): ?>
+                <?php if($tlv->zwaarte == 'HOOG'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') so hoog',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#4d9900'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'MIDDEN'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') so midden',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#66cc00'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'LAAG'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') so laag',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#d9ffb3'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'ZWAAR'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') sbo zwaar',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#005c99'
+                },
+                <?php endif; ?>
+                <?php if($tlv->zwaarte == 'LICHT'): ?>
+                {
+                    name:  '(' + <?=$tlv->aantal?> + ') sbo licht',
+                    y:   <?= intval($tlv->aantal) ?>,
+                    color: '#99d6ff'
+                },
+                <?php endif; ?>
+                <?php endforeach; ?>
+            ]
+            maakPie(pieID, aantallen2);
+            <?php endif ?>
+
+            var schooljaren = [];
+            var aantallln   = [];
+            var arrangementen = [];
+            var so          = 0;
+            var sbo         = 0;
+            var so2         = 0;
+            var sbo2        = 0;
+            var aantalso    = [];
+            var aantalsbo   = [];
+            var series      = [];
+            <?php if(isset($data[0])) : ?>
+            schooljaren.push('<?=$data[0]->aantallen->naam ?>');
+            aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>)
+            <?php if($data[0]->arrangementen) : ?>
+            arrangementen.push(<?=intval($data[0]->arrangementen->aantal) ?>)
+            <?php elseif (isset($data[1])) :?>
+            arrangementen.push(0)
+            <?php endif; ?>
+            <?php if($data[0]->tlvs) : ?>
+            <?php foreach($data[0]->tlvs as $tlv) : ?>
+            <?php  if($tlv->soort == "SBO") :?>
+            sbo = sbo + (<?= intval($tlv->aantal) ?>)
+            <?php endif; ?>
+            <?php  if($tlv->soort == "SO") :?>
+            so = so + (<?= intval($tlv->aantal) ?>)
+            <?php endif; ?>
+            <?php endforeach;  ?>
+            aantalsbo.push(sbo)
+            aantalso.push(so)
+            <?php elseif (isset($data[1])) :?>
+            aantalsbo.push(0)
+            aantalso.push(0)
+
+
+            <?php endif; ?>
+
+            <?php if(isset($data[1])) : ?>
+            schooljaren.push('<?=$data[1]->aantallen->naam ?>');
+            aantallln.push(<?=intval($data[1]->aantallen->aantal) ?>)
+            <?php if($data[1]->arrangementen) : ?>
+            arrangementen.push(<?=intval($data[1]->arrangementen->aantal) ?>)
+            <?php else :?>
+            arrangementen.push(0)
+            <?php endif; ?>
+
+            <?php if($data[1]->tlvs) : ?>
+            <?php foreach($data[1]->tlvs as $tlv) : ?>
+            <?php  if($tlv->soort == "SBO") :?>
+            sbo2 = sbo2 + (<?= intval($tlv->aantal) ?>)
+            <?php endif; ?>
+
+            <?php  if($tlv->soort == "SO") :?>
+            so2 = so2 + (<?= intval($tlv->aantal) ?>)
+            <?php endif; ?>
+            <?php endforeach;  ?>
+            aantalsbo.push(sbo2)
+            aantalso.push(so2)
+            <?php else :?>
+            aantalsbo.push(0)
+            aantalso.push(0)
+            <?php endif; ?>
+            <?php else : ?>
+            schooljaren.unshift(' ');
+            schooljaren.push(' ');
+            aantallln.unshift(<?=intval($data[0]->aantallen->aantal) ?>);
+            aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>);
+            arrangementen.unshift(0);
+            arrangementen.push(0);
+            aantalsbo.unshift(0);
+            aantalsbo.push(0);
+            aantalsbo.unshift(0);
+
+            <?php endif; ?>
+
+            series.push({
+                type: 'column',
+                name: 'tlvs sbo ',
+                color: '#005c99',
+                data: aantalsbo,
+                stack: 'tlvs'
+            })
+
+
+            series.push({
+                type: 'column',
+                name: 'tlvs so ',
+                color: '#4d9900',
+                data: aantalso,
+                stack: 'tlvs'
+            })
+
+            series.push({
+                type: 'column',
+                name: 'arrangementen',
+                color: '#ffcc80',
+                data:  arrangementen,
+                stack: 'arrangementen'
+            })
+
+
+            // series.push({
+            //     type: 'spline',
+            //     name: 'totaal leerlingen',
+            //     color : '#A28A29',
+            //     data: aantallln,
+            //     marker: {
+            //         lineWidth: 2
+            //     }
+            // });
+
+
+            maakChart(schooljaren, series)
+            <?php endif; ?>
+
+
+
+
+
+
+
+
+
+        });
+
+        function maakPie(pieID, punten) {
+            Highcharts.chart(pieID, {
+                chart: {
+                    backgroundColor: 'transparent',
+                    plotBorderWidth: null,
+                    plotShadow: false,
+                    type: 'pie',
+                    margin: [0,-10, 0, -80]
+                },
+                title: {
+                    text: null,
+                    margin: 0,
+                },
+                credits: {
+                    enabled: false
+                },
+                plotOptions: {
+                    pie: {
+                        // allowPointSelect: true,
+                        size: 95,
+                        padding: 0,
+
+                        // cursor: 'pointer',
+                        dataLabels: {
+                            enabled: false,
+                        },
+                        showInLegend: true,
+
+                    },
+                },
+                legend: {
+                    itemStyle: {
+                        fontWeight: '200',
+                        fontSize: '8px',
+                    },
+                    align: 'right',
+                    symbolPadding: 1,
+                    padding: 0,
+                    verticalAlign: 'top',
+                    floating: true,
+                    x: 10,
+                    y: 0,
+                    width: 80,
+                    itemWidth: 80,
+                    itemDistance: 0,
+
+                },
+                series: [{
+                    name: 'tlvs',
+                    // colorByPoint: true,
+                    data: punten
+                }]
+            });
+        }
+
+        function maakChart(schooljaren, series){
+            Highcharts.chart('omvangchart', {
+                credits: {
+                    enabled: false
+                },
+                title: {
+                    text: null
+
+                },
+
+                xAxis: {
+                    categories: schooljaren
+                },
+
+                yAxis: {
+                    allowDecimals: false,
+                    min: 0,
+                    title: {
+                        text: 'Aantal leerlingen',
+                        style:{
+                            fontSize: '8px'
+                        },
+                    },
+                    labels:{
+                        style: {
+                            fontSize: '8px'
+                        } ,
+                    },
+
+                    stackLabels: {
+                        enabled: true,
+                        style:{
+                            fontSize: '8px',
+                            fontWeight: '200'
+                        },
+                    },
+                },
+
+                plotOptions: {
+                    column: {
+                        stacking: 'normal'
+                    }
+                },
+                legend: {
+                    itemStyle: {
+                        fontWeight: '200',
+                        fontSize: '8px',
+                    },
+                    borderWidth: 0.5,
+                    align: 'right',
+                    symbolPadding: 1,
+                    padding: 8,
+                    verticalAlign: 'top',
+                    floating: true,
+                    x: 10,
+                    y: -2,
+                    width: 100,
+                    itemWidth: 100,
+                    itemDistance: 0,
+
+                },
+
+                series: series
+            });
+        }
+
+    </script>
+
+</div>
+
+<!--end besturen, kamers en swv-->
\ No newline at end of file
diff --git a/application/views/monpas/compactsop/diversiteitcompact2.php b/application/views/monpas/compactsop/overzicht/oud/diversiteitcompact2oud.php
similarity index 100%
rename from application/views/monpas/compactsop/diversiteitcompact2.php
rename to application/views/monpas/compactsop/overzicht/oud/diversiteitcompact2oud.php
diff --git a/application/views/monpas/compactsop/expertisecompact.php b/application/views/monpas/compactsop/overzicht/oud/expertisecompactoud.php
similarity index 100%
rename from application/views/monpas/compactsop/expertisecompact.php
rename to application/views/monpas/compactsop/overzicht/oud/expertisecompactoud.php
diff --git a/application/views/monpas/compactsop/expertisecompactsosbo.php b/application/views/monpas/compactsop/overzicht/oud/expertisecompactsosbooud.php
similarity index 100%
rename from application/views/monpas/compactsop/expertisecompactsosbo.php
rename to application/views/monpas/compactsop/overzicht/oud/expertisecompactsosbooud.php
diff --git a/application/views/monpas/compactsop/extracompact.php b/application/views/monpas/compactsop/overzicht/oud/extracompactoud.php
similarity index 99%
rename from application/views/monpas/compactsop/extracompact.php
rename to application/views/monpas/compactsop/overzicht/oud/extracompactoud.php
index 3806e80..d93ece0 100644
--- a/application/views/monpas/compactsop/extracompact.php
+++ b/application/views/monpas/compactsop/overzicht/oud/extracompactoud.php
@@ -14,7 +14,7 @@
             <?php } ?>
     </div>
     <div class="sopKaderGrafiek  highcharts-background"
-         id="chartCompactExtra"
+         id="<?= $chartid ?>"
          style=" width:355px; height: 140px; text-align: center">
      </div>
     <script>
@@ -131,7 +131,7 @@
 
 
                         var ijkgrafiek;
-                        ijkgrafiek = Highcharts.chart('chartCompactExtra', {
+                        ijkgrafiek = Highcharts.chart('<?= $chartid ?>', {
                             chart:{
                                 animation: false,
                                 backgroundColor: '#e6e6e6',
diff --git a/application/views/monpas/compactsop/inspectiecompact.php b/application/views/monpas/compactsop/overzicht/oud/inspectiecompactoud.php
similarity index 100%
rename from application/views/monpas/compactsop/inspectiecompact.php
rename to application/views/monpas/compactsop/overzicht/oud/inspectiecompactoud.php
diff --git a/application/views/monpas/compactsop/omvangcompactbrs.php b/application/views/monpas/compactsop/overzicht/oud/omvangcompactbrs.php
similarity index 100%
rename from application/views/monpas/compactsop/omvangcompactbrs.php
rename to application/views/monpas/compactsop/overzicht/oud/omvangcompactbrs.php
diff --git a/application/views/monpas/compactsop/paginacompact2.php b/application/views/monpas/compactsop/overzicht/oud/paginacompact2.php
similarity index 100%
rename from application/views/monpas/compactsop/paginacompact2.php
rename to application/views/monpas/compactsop/overzicht/oud/paginacompact2.php
diff --git a/application/views/monpas/compactsop/passendcompact.php b/application/views/monpas/compactsop/overzicht/oud/passendcompact.php
similarity index 100%
rename from application/views/monpas/compactsop/passendcompact.php
rename to application/views/monpas/compactsop/overzicht/oud/passendcompact.php
diff --git a/application/views/monpas/compactsop/tevredencompact.php b/application/views/monpas/compactsop/overzicht/oud/tevredencompact.php
similarity index 100%
rename from application/views/monpas/compactsop/tevredencompact.php
rename to application/views/monpas/compactsop/overzicht/oud/tevredencompact.php
diff --git a/application/views/monpas/compactsop/tijdelijk2.php b/application/views/monpas/compactsop/overzicht/oud/tijdelijk2.php
similarity index 100%
rename from application/views/monpas/compactsop/tijdelijk2.php
rename to application/views/monpas/compactsop/overzicht/oud/tijdelijk2.php