Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fouten/omvanggrafiek' into feature/alleInstrumenteninCompactSop

Browse Source
This commit is contained in:
Monique
2022-04-08 12:52:10 +02:00
parent 606dad7d77 0f637c8d12
commit 4230646bd4
13 changed files with 169 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Omvang.php
+1 -1
View File
@@ -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 );
application/controllers/shared/Menu.php
+103 -88
View File
@@ -1,43 +1,49 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
class Menu extends MY_Controller{
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
}
<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
public function get_menu(){
$user = new stdClass;
$organisatie = new stdClass;
$module = $this->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';
// }
}
application/core/MY_Controller.php
+7 -2
View File
@@ -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
application/views/monpas/mainheader.php
+13 -11
View File
@@ -324,45 +324,47 @@
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 1"></li>
</ul>
<p style="font-weight: bold; margin-top: 20px;">2. Onderwijskwaliteit; Inspectie</p>
<p style="font-weight: bold; margin-top: 20px;">2. Passend Onderwijs</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 2"></li>
</ul>
<p style="font-weight: bold; margin-top: 20px;">3. Basisondersteuning</p>
<p style="font-weight: bold; margin-top: 20px;">3. Inclusief Onderwijs</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 3"></li>
</ul>
<p style="font-weight: bold; margin-top: 20px;">4. Extra Ondersteuning</p>
<p style="font-weight: bold; margin-top: 20px;">4. Basisondersteuning</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 4"></li>
</ul>
<p style="font-weight: bold; margin-top: 20px;">5. Extra Ondersteuning</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 5"></li>
</ul>
</div>
<div class="col-md-6 col-xs-12">
<p style="font-weight: bold; margin-top: 20px;">5. Expertise</p>
<p style="font-weight: bold;margin-top: 20px; ">6. Expertise</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 5"></li>
</ul>
<p style="font-weight: bold;margin-top: 20px; ">6. Tevredenheid</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 8"></li>
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 6"></li>
</ul>
<p style="font-weight: bold; margin-top: 20px;">7. Financiën</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 7"></li>
</ul>
<p style="font-weight: bold; margin-top: 20px;">Extra</p>
<p style="font-weight: bold; margin-top: 20px;">8. Algemeen</p>
<ul style="list-style-type: none; margin:0; padding : 0"
data-bind="foreach: handleidingen">
<li data-bind="text: schermnaam, click: $parent.fDownloadDocument, visible: nummer == 8"></li>
</ul>
</div>
</div>
</div>
application/views/monpas/pages/beheer.php
+1 -2
View File
@@ -2,8 +2,7 @@
<div class="row" id ="pagBindBeheer">
<div class= "col-sm-12" >
<!-- ko foreach: beheermenu -->
<div class="submenuitem2"
data-bind="click:$parent.fChangeMenu, css:{'selected': $parent.selectedMenu() && $parent.selectedMenu().id == id}">
<div class="submenuitem2"data-bind="click:$parent.fChangeMenu, css:{'selected': $parent.selectedMenu() && $parent.selectedMenu().id == id}">
<span data-bind="text: naam"> </span>
</div>
<!-- /ko -->
application/views/monpas/pages/monitor.php
+33 -29
View File
@@ -48,52 +48,55 @@
<tr >
<td colspan = 2>
<!-- ko if: $parent.selectedOrgversion() && $parent.selectedOrgversion().toonOmschrijving()== false -->
<table style="width:100%">
<tr>
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> nr
</th>
<th class="header2" style="width: 50%;padding-left: 2px"
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}">indicator
</th>
<th class="header2" style="width: 40%;padding-left: 2px;text-align:left"
data-bind="style: {backgroundColor: disabled() ? '#d9d9d9' : '#e7e2e5'}"> score
</th>
</tr>
<tbody data-bind="foreach: indicatorscores">
<tr style="border-bottom: 1px solid #ebebeb">
<td style="text-align:right;vertical-align:top" data-bind="text: nummer,
<table style="width:100%" data-bind="foreach: indicatorscores">
<thead data-bind="visible: $index() == 0">
<tr>
<th class="header2" style="width: 3%;padding-left: 2px;text-align:right"
data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'} "> nr
</th>
<th class="header2" style="padding-left: 2px"
data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
attr: {width: scoretype > 5 ? '65%': '72%' } ">
</th>
<th class="header2" style="padding-left: 2px;text-align:left"
data-bind="style: {backgroundColor: $parent.disabled() ? '#d9d9d9' : '#e7e2e5'},
attr: {width: scoretype > 5 ? '32%': '22%'} "> score
</th>
</tr>
</thead>
<tbody >
<tr style="border-bottom: 1px solid #ebebeb; ">
<td style="text-align:right;vertical-align:top; padding-top: 5px;" data-bind="text: nummer,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }">
</td>
<td data-bind="text: omschrijving,
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top">
style: {color: $parent.disabled()? '#d9d9d9' : '#262626' }" style="vertical-align:top; padding-top: 5px;">
</td>
<td>
<div class="nietVoorPdf">
<span data-bind="visible: scoretype==1">
<td style="vertical-align:top; padding-top: 5px;" >
<span class="nietVoorPdf" data-bind="visible: scoretype==1">
<input class="rapport"
data-bind="textInput: score,
event:{input: $root.fUpdateScoretype12},
enable: $root.editok() && $parent.disabled() == false,
attr:{'id' : $index}" />
</span>
</div>
<div class="alleenVoorPdf">
<span data-bind="visible: scoretype==1 || scoretype == 2,
<span class="alleenVoorPdf" data-bind="visible: scoretype==1 || scoretype == 2,
text: score">
</span>
</div>
<div class="nietVoorPdf">
<span data-bind="visible: scoretype == 2">
<span class="nietVoorPdf"data-bind="visible: scoretype == 2">
<input class="integer"
data-bind="textInput: score,
event:{input: $root.fUpdateScoretype12},
visible: scoretype==2,
enable: $root.editok() && $parent.disabled() == false" /> %
</span>
</div>
<div data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 || scoretype==7 ">
<span data-bind="visible: scoretype==3 || scoretype == 4 || scoretype == 5 || scoretype == 6 || scoretype==7 ">
<!-- ko if: $parent.disabled() == false -->
<!-- ko foreach: $root.scoreopties -->
<!-- ko if: $parent.scoretype == type -->
@@ -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() " />
<span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span>
<span style="vertical-align:top; display: inline-block; margin-left:5px;margin-right: 20px;" data-bind="text: optie"> </span>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
@@ -113,10 +116,11 @@
<input type='radio'
data-bind="checked: $parent.score(),
enable: false " />
<span style="vertical-align:top; display: inline-block; margin-left:5px;" data-bind="text: optie"> </span>
<span style="vertical-align:top; display: inline-block; margin-left:5px; margin-right: 20px;" data-bind="text: optie"> </span>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</span>
</td>
</tr>
</tbody>
documents/handleiding_basisondersteuning_2015.pdf
BIN
View File
Binary file not shown.
documents/handleiding_monitor_financien_2020.pdf
BIN
View File
Binary file not shown.
documents/handleiding_monpas_2015.pdf
BIN
View File
Binary file not shown.
documents/handleiding_tevredenheidsmeter_2015.pdf
BIN
View File
Binary file not shown.
documents/handleiding_tevredenheidsmeter_school_2015.pdf
BIN
View File
Binary file not shown.
public/index.php
+1
View File
@@ -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 ) )
{
public/js/monpas/models/omvangmodel.js
+10 -8
View File
@@ -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,
},