diff --git a/application/controllers/monpas/Omvang.php b/application/controllers/monpas/Omvang.php index 6718c14..66b3272 100644 --- a/application/controllers/monpas/Omvang.php +++ b/application/controllers/monpas/Omvang.php @@ -468,7 +468,7 @@ class Omvang extends MY_Controller{ $schooljaar->naam = $omvang->naam; $schooljaar->aantal = $omvang->aantal; $aantal = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDs); - $schooljaar->aantalllnarr = $aantal->aantal; + $schooljaar->aantalllnarr = $aantal ? $aantal->aantal: 0; $schooljaar->tlvs = $this->Tlvs_model->getAantalLeerlingenMetTLV($nummer, $schoolIDs); if($organisatie->soort == 4){ $schooljaar->arrangementen = $this->Arrangementen_model->getArrangementenMetAantallen($organisatie->id,$nummer ); diff --git a/application/controllers/shared/Menu.php b/application/controllers/shared/Menu.php index 507f779..a83230c 100644 --- a/application/controllers/shared/Menu.php +++ b/application/controllers/shared/Menu.php @@ -1,43 +1,49 @@ -load->model($models); - $this->load->helper('string'); - if ( ! $this->check_online_status() ) { - echo json_encode( array('offline' => TRUE) ); - die; - };// if - } +session->userdata['module']; - $modulenaam = ''; - if ($module >=0){ +class Menu extends MY_Controller +{ - if (0 == $module) {$modulenaam = "Instrumenten";} - else {$modulenaam= $this->Modules_model->get_fieldvalue(array("sysnr" => $module), 'naamkort'); } + function __construct() + { + parent::__construct(); + $models = array("shared/Users_model", + 'shared/Organisaties_model', + "monpas/Menus_model", + "monpas/Modules_model", + "monpas/Documenten_model", + "shared/Licenties_model", + "ijkpartituur/pages_model"); + $this->load->model($models); + $this->load->helper('string'); + if (!$this->check_online_status()) { + echo json_encode(array('offline' => TRUE)); + die; + };// if + } + + public function get_menu() + { + $user = new stdClass; + $organisatie = new stdClass; + $module = $this->session->userdata['module']; + $modulenaam = ''; + if ($module >= 0) { + + if (0 == $module) { + $modulenaam = "Instrumenten"; + } else { + $modulenaam = $this->Modules_model->get_fieldvalue(array("sysnr" => $module), 'naamkort'); + } $org = $this->Organisaties_model->get_record_by_id($this->globorgid); - if ($org){ - $menu = $this->Menus_model->getmenu($module,$this->userrole, $org->soort); - $aangepastmenu = []; - foreach ($menu as $menuitem){ - $menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole, $org->soort); + if ($org) { + $menu = $this->Menus_model->getmenu($module, $this->userrole, $org->soort); + $aangepastmenu = []; + foreach ($menu as $menuitem) { + $menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole, $org->soort); $aangepastmenu [] = $menuitem; }; // foreach - }; //if organisatie // @@ -48,69 +54,78 @@ class Menu extends MY_Controller{ // } // } - $licenties = null; - $licenties = $this->Licenties_model->get_licentie($this->orgid); - // als licenties voor 1 module, disable de portal knop - if ($licenties && $menu && (count($licenties) <= 1)) { - $i = 0; - $target = -1; - foreach($menu as $item){ - if ($item->naam == "stop") $target = $i; - $i ++; - } - if ($target > -1) unset($menu[$target]); - } + $licenties = null; + $licenties = $this->Licenties_model->get_licentie($this->orgid); + // als licenties voor 1 module, disable de portal knop + if ($licenties && $menu && (count($licenties) <= 1)) { + $i = 0; + $target = -1; + foreach ($menu as $item) { + if ($item->naam == "stop") $target = $i; + $i++; + } + if ($target > -1) unset($menu[$target]); + } - $user = $this->Users_model->get_fullname($this->userid); - $organisatie = $this->Organisaties_model->get_orgnaam($this->globorgid); - } + $user = $this->Users_model->get_fullname($this->userid); + $organisatie = $this->Organisaties_model->get_orgnaam($this->globorgid); + } - - echo json_encode(array( 'module' =>$module, - 'modulenaam' => $modulenaam, - 'menu' => $aangepastmenu, - 'user' => $user, - 'organisatie' => $organisatie)); - } - function gethandleidingen(){ - $handleidingen = $this->Documenten_model->gethandleidingen($this->globorgid, $this->userrole); - echo json_encode($handleidingen); - } - function downloadhandleiding(){ - if( ! $this->userid ) return; + echo json_encode(array('module' => $module, + 'modulenaam' => $modulenaam, + 'menu' => $aangepastmenu, + 'user' => $user, + 'organisatie' => $organisatie)); + } + + function gethandleidingen() + { + $handleidingen = $this->Documenten_model->gethandleidingen($this->globorgid, $this->userrole); + echo json_encode($handleidingen); + } + + function downloadhandleiding() + { + if (!$this->userid) return; $handleidingid = $this->uri->segment(4); $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(MYROOTPATH . '/documents/' . $handleiding->documentnaam); + force_download($handleiding->documentnaam, $data); - } - function getsubmenu(){ - //TODO clean input - $pageid = $this->uri->segment(4); + } + + function getsubmenu() + { + //TODO clean input + $pageid = $this->uri->segment(4); $org = $this->Organisaties_model->get_record_by_id($this->globorgid); - $submenus = $this->Menus_model->getsubmenus($pageid, $this->userrole, $org->soort); - echo json_encode($submenus); - } - function getmodule(){ - echo json_encode($this->module); - } + $submenus = $this->Menus_model->getsubmenus($pageid, $this->userrole, $org->soort); + echo json_encode($submenus); + } + + function getmodule() + { + echo json_encode($this->module); + } + + // function scriptSetModules(){ + // $organisaties = $this->Organisaties_model->getall(); + // foreach($organisaties as $organisatie){ + // if ($organisatie->monbas == 1){ + // $data=array('orgid' =>$organisatie->id, 'modulenr'=>1); + // $this->Licenties_model->insert_record($data); + // } + // if ($organisatie->mondiv == 1){ + // $data=array('orgid' =>$organisatie->id, 'modulenr'=>2); + // $this->Licenties_model->insert_record($data); + // } + // }; // foreach + // echo 'klaar'; + // } - // function scriptSetModules(){ - // $organisaties = $this->Organisaties_model->getall(); - // foreach($organisaties as $organisatie){ - // if ($organisatie->monbas == 1){ - // $data=array('orgid' =>$organisatie->id, 'modulenr'=>1); - // $this->Licenties_model->insert_record($data); - // } - // if ($organisatie->mondiv == 1){ - // $data=array('orgid' =>$organisatie->id, 'modulenr'=>2); - // $this->Licenties_model->insert_record($data); - // } - // }; // foreach - // echo 'klaar'; - // } - } \ No newline at end of file diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 9952dc9..89d8b20 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -67,8 +67,13 @@ 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.95';// verbeteringen invullijst, fout omvang +// public $version = '1.17.96';// nieuwe handleidingen + public $version = '1.17.97';// omvang geen grafiek bij 0 resultaten + + + 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 7cd3b7d..4b94ec7 100644 --- a/application/views/monpas/mainheader.php +++ b/application/views/monpas/mainheader.php @@ -324,45 +324,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/application/views/monpas/pages/beheer.php b/application/views/monpas/pages/beheer.php index bce8d0a..6033858 100644 --- a/application/views/monpas/pages/beheer.php +++ b/application/views/monpas/pages/beheer.php @@ -2,8 +2,7 @@
    -
    +
    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 @@ - - - - - - - - - + + + + + + + + + - 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/index.php b/public/index.php index 401a832..91a3110 100755 --- a/public/index.php +++ b/public/index.php @@ -252,6 +252,7 @@ define( 'MYROOTPATH', str_replace( 'public/', '', FCPATH ) ); // Name of the "system" directory define( 'SYSDIR', basename( BASEPATH ) ); + // The path to the "application" directory if ( is_dir( $application_folder ) ) { diff --git a/public/js/monpas/models/omvangmodel.js b/public/js/monpas/models/omvangmodel.js index 8090ab1..f9c3bc0 100644 --- a/public/js/monpas/models/omvangmodel.js +++ b/public/js/monpas/models/omvangmodel.js @@ -301,6 +301,8 @@ mh.initOmvangModel = function(){ fGetOmvang: function() { var self = mh.OmvangModel; + self.toonresult(false); + var schooljaren = this.selectedSchooljaren.sort() var submitData = {'schooljaren' : schooljaren, @@ -372,8 +374,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()); @@ -629,7 +631,7 @@ mh.initOmvangModel = function(){ - self.fMaakPie(titel, pienaam, pie, naam, breedte, ); + self.fMaakPie(titel, pienaam, pie, naam, breedte ); } }) @@ -640,11 +642,12 @@ mh.initOmvangModel = function(){ var self = mh.OmvangModel; + Highcharts.chart(pienaam, { chart: { plotBackgroundColor: null, plotBorderWidth: null, - height: 800, + height: 850, plotShadow: false, type: 'pie', margin: [0, 0, 0, 0], @@ -683,11 +686,10 @@ mh.initOmvangModel = function(){ padding: 0, verticalAlign: 'top', floating: false, - x: -5, + x: 0, y: 260, - width: 350, - height: 500, - itemWidth: breedte, + // width: 350, + // height: 500, itemDistance: 0, },
    nr - indicator - score -
    +
    nr + + score +
    + style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top; padding-top: 5px;"> -
    - +
    		+ + - -
    - -
    -
    - + + + % -
    -
    + + @@ -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() " /> - + @@ -113,10 +116,11 @@ - + +