diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 29fbecc..e359b77 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -59,12 +59,15 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.76'; // cluster scans passend onderwijs // public $version = '1.17.79'; // fout matrixfunctie // public $version = '1.17.83'; // sophomepage -// public $version = '1.17.84'; // scan passend onderwijs in compact sop. -// public $version = '1.17.85'; // printfunctie bij in te vullen lijsten - public $version = '1.17.86'; // 3dgrafieken - - - +// public $version = '1.17.84'; // zichtbaarheid paginas afhankelijk van orgsoort +// public $version = '1.17.85'; // fouten divmeter po 2203 in compact +// public $version = '1.17.86'; // titels en headers sop +// public $version = '1.17.88'; // sopfout +// public $version = '1.17.89'; // printformulier +// public $version = '1.17.90'; // sops ordenen per eigen criterium + public $version = '1.17.91'; // grafieken in 3d + + public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in 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 @@ +