From e4e8e2925427249ed29a92fe0c77698bbef63edc Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Tue, 14 Dec 2021 12:10:30 +0100
Subject: [PATCH] tussenstand

---
 .../monpas/compactsop/diversiteitcompact.php  | 14 ++++--
 .../monpas/compactsop/diversiteitcompact2.php | 15 ++++--
 .../views/monpas/compactsop/paginacompact.php |  2 +
 .../views/monpas/pages/mondiv/diversiteit.php |  4 --
 .../monpas/models/mondiv/diversiteitsmodel.js | 49 -------------------
 5 files changed, 25 insertions(+), 59 deletions(-)

diff --git a/application/views/monpas/compactsop/diversiteitcompact.php b/application/views/monpas/compactsop/diversiteitcompact.php
index f8307ee..0bee1bb 100644
--- a/application/views/monpas/compactsop/diversiteitcompact.php
+++ b/application/views/monpas/compactsop/diversiteitcompact.php
@@ -118,7 +118,14 @@
                     chart: {
                         type: 'column',
                         animation: false,
-                        backgroundColor: '#e6e6e6'
+                        backgroundColor: '#e6e6e6',
+                        options3d: {
+                            enabled: true,
+                            alpha: 15,
+                            beta: 15,
+                            depth: 50,
+                            viewDistance: 25
+                        }
                     },
                     title: {
                         text: 'Diversiteitsquotient per groep',
@@ -144,6 +151,7 @@
                     },
                     yAxis: {
                         min: 0,
+                        tickInterval: 0.2,
                         title: {
                             text: 'DQ'
                         },
@@ -157,8 +165,8 @@
 
                     plotOptions: {
                         column: {
-                            pointPadding: 0.05,
-                            groepPadding: 0.05,
+                            pointWidth: null,
+                            groepPadding: 0,
                             borderWidth: 0,
                             color: '#7f036C'
                         }
diff --git a/application/views/monpas/compactsop/diversiteitcompact2.php b/application/views/monpas/compactsop/diversiteitcompact2.php
index 1e18d59..e0356f2 100644
--- a/application/views/monpas/compactsop/diversiteitcompact2.php
+++ b/application/views/monpas/compactsop/diversiteitcompact2.php
@@ -443,6 +443,7 @@
     </script>
     <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/modules/variable-pie.js"></script>
     <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/modules/pattern-fill.js"></script>
+    <script src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
 
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.css" integrity="sha256-0XAFLBbK7DgQ8t7mRWU5BF2OMm9tjtfH945Z7TTeNIo=" crossorigin="anonymous" />
@@ -601,7 +602,14 @@
                         type: 'column',
                         animation: false,
                         backgroundColor: '#e6e6e6',
-                        height: 350
+                        height: 350,
+                        options3d: {
+                            enabled: true,
+                            alpha: 15,
+                            beta: 15,
+                            depth: 50,
+                            viewDistance: 25
+                        }
                     },
                     title: {
                         text: 'Diversiteitsquotient per groep'
@@ -612,6 +620,7 @@
                     },
                     yAxis: {
                         min: 0,
+                        tickInterval: 0.2,
                         title: {
                             text: 'DQ'
                         }
@@ -619,8 +628,8 @@
 
                     plotOptions: {
                         column: {
-                            pointPadding: 0.05,
-                            groepPadding: 0.05,
+                            pointWidth: 0,
+                            groepPadding: 0,
                             borderWidth: 0,
                             color: 'url(#highcharts-default-pattern-8)'
                         }
diff --git a/application/views/monpas/compactsop/paginacompact.php b/application/views/monpas/compactsop/paginacompact.php
index 0c7df3a..5ee19ae 100644
--- a/application/views/monpas/compactsop/paginacompact.php
+++ b/application/views/monpas/compactsop/paginacompact.php
@@ -444,6 +444,8 @@
     </script>
     <script src="<?php echo $this->config->item('base_url'); ?>/js_lib/Highcharts/code/modules/variable-pie.js"></script>
     <script src="<?php echo $this->config->item('base_url'); ?>/js_lib/Highcharts/code/modules/pattern-fill.js"></script>
+    <script src="<?php echo $this->config->item('base_url'); ?>/js_lib/Highcharts/code/highcharts-3d.js"></script>
+
     <link rel="stylesheet" href="/css_lib/bootstrap-3.3.2-dist/css/bootstrap.css" crossorigin="anonymous" />
     // <link rel="stylesheet" href="<?php echo $this->config->item('vendor_url_secure'); ?>/css_lib/bootstrap-3.3.2-dist/css/bootstrap.css" crossorigin="anonymous" />
 
diff --git a/application/views/monpas/pages/mondiv/diversiteit.php b/application/views/monpas/pages/mondiv/diversiteit.php
index 87a59d0..dabd069 100644
--- a/application/views/monpas/pages/mondiv/diversiteit.php
+++ b/application/views/monpas/pages/mondiv/diversiteit.php
@@ -146,10 +146,6 @@
 
             <div id="dqpergroep" style="width: 100%"></div>
         </div>
-        <div class="col-sm-12 col-md-6">
-
-            <div id="dqpergroep3d" style="width: 100%"></div>
-        </div>
     </div>
 	<div class="row">
 		<div class="col-sm-12 col-md-6">
diff --git a/public/js/monpas/models/mondiv/diversiteitsmodel.js b/public/js/monpas/models/mondiv/diversiteitsmodel.js
index f19fcf2..1425bed 100644
--- a/public/js/monpas/models/mondiv/diversiteitsmodel.js
+++ b/public/js/monpas/models/mondiv/diversiteitsmodel.js
@@ -281,56 +281,7 @@ ls.initDiversiteitModel = function(module){
 					labels[counter]='school';
 					scores[counter]= self.schoolDQ() === 0? null: Number(self.schoolDQ());
 
-
 				Highcharts.chart('dqpergroep', {
-					chart: {
-						type: 'column',
-						backgroundColor: '#ffffff',
-
-					},
-					title: {
-						text: 'Diversiteitsquotiënt per groep'
-					},
-					credits:{
-						enabled: false
-					},
-					xAxis: {
-						categories: labels,
-
-					},
-					yAxis: {
-						min: 0,
-						tickInterval: 0.2,
-						title: {
-							text: 'DQ'
-						}
-					},
-					tooltip: {
-						headerFormat: '<span style="font-size:10px">groep: {point.key}</span><table>',
-						pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
-							'<td style="padding:0"><b>{point.y:.1f}</b></td></tr>',
-						footerFormat: '</table>',
-						shared: true,
-						useHTML: true
-					},
-					legend: {
-					enabled: false,
-					},
-
-					series: [{
-						name: 'dq',
-						color: '#6F0B3D',
-						data: scores
-
-					}],
-					plotOptions: {
-						series: {
-							pointWidth: null,
-							pointPadding: 0,
-						}
-					},
-				});
-				Highcharts.chart('dqpergroep3d', {
 					chart: {
 						type: 'column',
 						backgroundColor: '#ffffff',