diff --git a/application/controllers/shared/Menu.php b/application/controllers/shared/Menu.php index 507f779..2c9ea80 100644 --- a/application/controllers/shared/Menu.php +++ b/application/controllers/shared/Menu.php @@ -83,8 +83,8 @@ class Menu extends MY_Controller{ $handleiding = $this->Documenten_model->get_record_by_id($handleidingid); $this->load->helper('download'); - // $data = file_get_contents($this->rootpath ."/documents/".$handleiding->documentnaam); - $data = file_get_contents("/home/monpas/prod/documents/".$handleiding->documentnaam);//TW: rootpath is verkeerd door symlink + $data = file_get_contents($this->rootpath ."/documents/".$handleiding->documentnaam); +// $data = file_get_contents("/home/monpas/prod/documents/".$handleiding->documentnaam);//TW: rootpath is verkeerd door symlink force_download($handleiding->documentnaam, $data); } function getsubmenu(){ diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index f40d51a..9bb1c9c 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -68,9 +68,11 @@ class MY_Controller extends CI_Controller{ // 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.95';// verbeteringen invullijst, fout omvang +// public $version = '1.17.95';// verbeteringen invullijst, fout omvang + public $version = '1.17.96';// nieuwe handleidingen + + - public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in diff --git a/application/views/monpas/mainheader.php b/application/views/monpas/mainheader.php index a824c40..b8513cd 100644 --- a/application/views/monpas/mainheader.php +++ b/application/views/monpas/mainheader.php @@ -322,45 +322,47 @@ data-bind="foreach: handleidingen">
  • -

    2. Onderwijskwaliteit; Inspectie

    +

    2. Passend Onderwijs

    -

    3. Basisondersteuning

    +

    3. Inclusief Onderwijs

    -

    4. Extra Ondersteuning

    +

    4. Basisondersteuning

    +

    5. Extra Ondersteuning

    +
    -

    5. Expertise

    + +

    6. Expertise

    -

    6. Tevredenheid

    -

    7. Financiƫn

    -

    Extra

    +

    8. Algemeen

    +
    diff --git a/documents/handleiding_basisondersteuning_2015.pdf b/documents/handleiding_basisondersteuning_2015.pdf deleted file mode 100644 index a768ae2..0000000 Binary files a/documents/handleiding_basisondersteuning_2015.pdf and /dev/null differ diff --git a/documents/handleiding_monitor_financien_2020.pdf b/documents/handleiding_monitor_financien_2020.pdf deleted file mode 100644 index ab8fdb2..0000000 Binary files a/documents/handleiding_monitor_financien_2020.pdf and /dev/null differ diff --git a/documents/handleiding_monpas_2015.pdf b/documents/handleiding_monpas_2015.pdf deleted file mode 100644 index 26f0970..0000000 Binary files a/documents/handleiding_monpas_2015.pdf and /dev/null differ diff --git a/documents/handleiding_tevredenheidsmeter_2015.pdf b/documents/handleiding_tevredenheidsmeter_2015.pdf deleted file mode 100644 index 1e188e5..0000000 Binary files a/documents/handleiding_tevredenheidsmeter_2015.pdf and /dev/null differ diff --git a/documents/handleiding_tevredenheidsmeter_school_2015.pdf b/documents/handleiding_tevredenheidsmeter_school_2015.pdf deleted file mode 100644 index a642661..0000000 Binary files a/documents/handleiding_tevredenheidsmeter_school_2015.pdf and /dev/null differ diff --git a/public/js/monpas/models/omvangmodel.js b/public/js/monpas/models/omvangmodel.js index 866c160..c182a48 100644 --- a/public/js/monpas/models/omvangmodel.js +++ b/public/js/monpas/models/omvangmodel.js @@ -672,7 +672,7 @@ mh.initOmvangModel = function(){ size: 250, cursor: 'pointer', dataLabels: { - enabled: false + enabled: fadleidinglse }, showInLegend: true }