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

Merge branch 'feature/robbobswop' into develop

Browse Source
This commit is contained in:
Monique
2021-09-07 10:29:38 +02:00
parent 92175d82b2 4c9eb6a4fd
commit 1ed87d3d5f
170 changed files with 1738 additions and 194424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+6
View File
@@ -81,3 +81,9 @@ Thumbs.db
*.mov
*.wmv
docs/
public/tmp/
documents/compactsops/
application/cache/.htaccess
Vendored
+1
View File
@@ -0,0 +1 @@
Deny from all
application/config/email.php
+17 -8
View File
@@ -6,13 +6,22 @@
* Time: 10:46
*/
//
//$config['smtp_host']=$_ENV['MAIL']['HOST'];
//$config['smtp_port']=$_ENV['MAIL']['SMTP_PORT'];
//$config['smtp_timeout']='30';
//$config['smtp_user']=$_ENV['MAIL']['SMTP_USER'];
//$config['smtp_pass']=$_ENV['MAIL']['SMTP_PASS'];
//$config['mailtype']='html';
//$config['charset']='utf-8';
//$config['newline']="\r\n";
$config['smtp_host']=$_ENV['MAIL']['HOST'];
$config['smtp_port']=$_ENV['MAIL']['SMTP_PORT'];
$config['smtp_timeout']='30';
$config['smtp_user']=$_ENV['MAIL']['SMTP_USER'];
$config['smtp_pass']=$_ENV['MAIL']['SMTP_PASS'];
$config['mailtype']='html';
$config['charset']='utf-8';
$config['newline']="\r\n";
$config['charset'] = 'iso-8859-1';
$config['protocol'] = $_ENV['MAIL']['PROTOCOL'];
$config['smtp_host'] = $_ENV['MAIL']['HOST'];
$config['smtp_user'] = $_ENV['MAIL']['SMTP_USER'];
$config['smtp_pass'] = $_ENV['MAIL']['SMTP_PASS'];
$config['smtp_port'] = $_ENV['MAIL']['SMTP_PORT'];
application/controllers/Login.php
+165 -105
View File
@@ -1,128 +1,188 @@
<?php
class Login extends MY_Controller{
function __construct(){
use Mailgun\Mailgun;
class Login extends MY_Controller {
function __construct()
{
parent::__construct();
$models = array("shared/Users_model",
'shared/Session_model',
'shared/Orgusers_model',
"shared/Autorisaties_model",
"shared/Autorisatienivos_model",
"shared/Licenties_model"); // 'Pages_model',
$this->load->model($models);
$this->load->helper('string');
$models = [
"shared/Users_model",
'shared/Session_model',
'shared/Orgusers_model',
"shared/Autorisaties_model",
"shared/Autorisatienivos_model",
"shared/Licenties_model"]; // 'Pages_model',
$this->load->model( $models );
$this->load->helper( 'string' );
}
function controlleergnaam(){
$username = $this->db->escape_str($this->input->post('gebruikersnaam'), TRUE);
$userid = $this->Users_model->get_fieldvalue(array('lower(gnaam)'=> strtolower($username),
'actief' => 1), 'id');
function controlleergnaam()
{
$username = $this->db->escape_str( $this->input->post( 'gebruikersnaam' ), TRUE );
$userid = $this->Users_model->get_fieldvalue( [
'lower(gnaam)' => strtolower( $username ),
'actief' => 1], 'id' );
if(!$userid){
$zout = FALSE;
$challenge = FALSE;
}else{
$this->Session_model->set_tmpuserid($userid);
$zout = $this->Users_model->get_record_by_id($userid, 'zout');
$challenge = random_string('alnum', 10);
$this->session->set_userdata('challenge', $challenge);
if ( ! $userid )
{
$zout = FALSE;
$challenge = FALSE;
}
$data = array('userid'=>$userid, 'salt'=>$zout, 'challenge'=>$challenge);
echo json_encode($data);
else
{
$this->Session_model->set_tmpuserid( $userid );
$zout = $this->Users_model->get_record_by_id( $userid, 'zout' );
$challenge = random_string( 'alnum', 10 );
$this->session->set_userdata( 'challenge', $challenge );
}
$data = ['userid' => $userid, 'salt' => $zout, 'challenge' => $challenge];
echo json_encode( $data );
}
function controleerwwoord(){
$result = null;
$userrole = null;
$tmpuserid = $this->session->userdata('tmpuserid');
$password = $this->Users_model->get_record_by_id($tmpuserid, 'wachtwoord');
$salt = $this->Users_model->get_record_by_id($tmpuserid, 'zout');
$challenge = $this->session->userdata('challenge');
$masterpass = md5(md5($salt.'Mstr@p0m-mnbs_983').$challenge);
$saltedww = md5(md5($salt.$password).$challenge);
$challengedww = md5($password.$challenge);
$saltedchallenge= $this->db->escape_str($this->input->post('saltedchallenge', TRUE));
function controleerwwoord()
{
$result = NULL;
$userrole = NULL;
$tmpuserid = $this->session->userdata( 'tmpuserid' );
$password = $this->Users_model->get_record_by_id( $tmpuserid, 'wachtwoord' );
$salt = $this->Users_model->get_record_by_id( $tmpuserid, 'zout' );
if (($challengedww !==$saltedchallenge) &&
($masterpass !==$saltedchallenge)){
$result = null;
}else{
$orguser = $this->Orgusers_model->get_records_where(array('user_id'=>$tmpuserid), TRUE);
$orguser = $this->Orgusers_model->gethighestautorisatie($tmpuserid);
$challenge = $this->session->userdata( 'challenge' );
$masterpass = md5( md5( $salt . 'Mstr@p0m-mnbs_983' ) . $challenge );
$saltedww = md5( md5( $salt . $password ) . $challenge );
$challengedww = md5( $password . $challenge );
$saltedchallenge = $this->db->escape_str( $this->input->post( 'saltedchallenge', TRUE ) );
if ($orguser) {
$userrole = $orguser->nivo;
if ( ( $challengedww !== $saltedchallenge ) &&
( $masterpass !== $saltedchallenge ) )
{
$result = NULL;
}
else
{
$orguser = $this->Orgusers_model->get_records_where( ['user_id' => $tmpuserid], TRUE );
$orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid );
if ( $orguser )
{
$userrole = $orguser->nivo;
}
if ($userrole == null || !$orguser || $userrole ==0){
$result="geen rechten";
if ( $userrole == NULL || ! $orguser || $userrole == 0 )
{
$result = "geen rechten";
}
else {
$this->login_user($tmpuserid);
$result='ok';
else
{
$this->login_user( $tmpuserid );
$result = 'ok';
}
}
echo json_encode($result);
}
echo json_encode( $result );
}
function login_user($tmpuserid){
$orguser = $this->Orgusers_model->gethighestautorisatie($tmpuserid);
$orgid = $orguser->organisatie_id;
//$nivoid = $this->Autorisaties_model->get_fieldvalue(array('orguser_id'=>$orguser->id), 'nivo_id');
//$userrole = $this->Autorisatienivos_model->get_fieldvalue(array('id'=>$nivoid), "nivo");
$userrole = $orguser->nivo;
$modules = $this->Licenties_model->get_licentie($orgid);
$this->Session_model->set_userid($tmpuserid);
$this->Session_model->set_orgid($orgid);
$this->Session_model->set_role($userrole);
$this->session->set_userdata(array('language'=>'dutchijk'));
if (!$modules) {$this->Session_model->set_module(-1);}
else { if (count($modules) == 1) {$this->Session_model->set_module($modules[0]->sysnr);}
else {$this->Session_model->set_module(0); } ;
function login_user( $tmpuserid )
{
$orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid );
$orgid = $orguser->organisatie_id;
//$nivoid = $this->Autorisaties_model->get_fieldvalue(array('orguser_id'=>$orguser->id), 'nivo_id');
//$userrole = $this->Autorisatienivos_model->get_fieldvalue(array('id'=>$nivoid), "nivo");
$userrole = $orguser->nivo;
$modules = $this->Licenties_model->get_licentie( $orgid );
$this->Session_model->set_userid( $tmpuserid );
$this->Session_model->set_orgid( $orgid );
$this->Session_model->set_role( $userrole );
$this->session->set_userdata( ['language' => 'dutchijk'] );
if ( ! $modules )
{
$this->Session_model->set_module( - 1 );
}
else
{
if ( count( $modules ) == 1 )
{
$this->Session_model->set_module( $modules[0]->sysnr );
}
else
{
$this->Session_model->set_module( 0 );
};
};
}
function logout(){
function logout()
{
$this->session->sess_destroy();
redirect(base_url().'index.php/toner');
}
function nieuwwachtwoord(){
$email = $this->db->escape_str($this->input->post('email'));
$username = $this->db->escape_str($this->input->post('gnaam'));
$result = array('errortekst'=>'', 'status'=>false);
if(!$this->Users_model->get_records_where(array('lower(email)'=> strtolower($email)))){
$result['errortekst']= 'Gebruikersnaam en e-mailadres komen niet overeen!';
}
elseif(!$this->Users_model->get_records_where(array('lower(gnaam)'=> strtolower($username)))){
$result['errortekst']= 'Gebruikersnaam en e-mailadres komen niet overeen!';
}
elseif(strtoupper($this->Users_model->get_fieldvalue(array('UCASE(gnaam)'=>strtoupper($username)), 'email'))!=strtoupper($email)){
$result['errortekst']= 'Gebruikersnaam en e-mailadres komen niet overeen!';
}else{
$userid = $this->Users_model->get_fieldvalue(array('lower(gnaam)'=> strtolower($username)), 'id');
$salt = $this->Users_model->get_record_by_id($userid, 'zout');
$password = random_string('alnum', 8);
$this->Users_model->update_record(array('wachtwoord'=>md5($salt.$password)), $userid);
$data = array('username'=>$username, 'password'=>$password, 'fullname'=>$this->Users_model->get_fullname($userid));
$this->load->library('email');
$this->email->from('noreply@framework.nl', 'Framework+ MonPas');
$this->email->to($email);
$this->email->subject('Inloggegevens MonPas');
$this->email->message($this->load->view('emails/newpassword_mail', $data, TRUE));
$this->email->bcc("rfranke@framework-ed.nl");
$this->email->send();
$result['errortekst']= 'Er is een e-mail gestuurd naar '.$email.' met uw nieuwe wachtwoord.';
$result['status']=true;
}
echo json_encode($result);
redirect( base_url() . 'index.php/toner' );
}
}
function nieuwwachtwoord()
{
$email = $this->db->escape_str( $this->input->post( 'email' ) );
$username = $this->db->escape_str( $this->input->post( 'gnaam' ) );
$result = ['errortekst' => '', 'status' => FALSE];
if ( ! $this->Users_model->get_records_where( ['lower(email)' => strtolower( $email )] ) )
{
$result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!';
}
elseif ( ! $this->Users_model->get_records_where( ['lower(gnaam)' => strtolower( $username )] ) )
{
$result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!';
}
elseif ( strtoupper( $this->Users_model->get_fieldvalue( ['UCASE(gnaam)' => strtoupper( $username )], 'email' ) ) != strtoupper( $email ) )
{
$result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!';
}
else
{
$userid = $this->Users_model->get_fieldvalue( ['lower(gnaam)' => strtolower( $username )], 'id' );
$salt = $this->Users_model->get_record_by_id( $userid, 'zout' );
$password = random_string( 'alnum', 8 );
$this->Users_model->update_record( ['wachtwoord' => md5( $salt . $password )], $userid );
$data = ['username' => $username, 'password' => $password, 'fullname' => $this->Users_model->get_fullname( $userid )];
$html = $this->load->view( 'emails/newpassword_mail', $data, TRUE );
if( $_ENV['ENVIRONMENT'] == 'production')
{
//Deze code wordt alleen op produktie gebruikt en stuurt de mail
//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [
'from' => 'info@monpas.nl',
'to' => $email,
'cc' => 'rfranke@framework-ed.nl',
'subject' => 'Inloggegevens MonPas',
'html' => $html,
'inline' => [
[
'filename' => 'monpasklein.png',
'filePath' => FCPATH . 'css/images/monpasklein.png']
]
] );
}else{
$this->load->library( 'email' );
$this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' );
$this->email->to( $email );
$this->email->subject( 'Inloggegevens MonPas' );
$this->email->message( $this->load->view( 'emails/newpassword_mail', $data, TRUE ) );
$this->email->bcc( "rfranke@framework-ed.nl" );
$this->email->send();
}
$result['errortekst'] = 'Er is een e-mail gestuurd naar ' . $email . ' met uw nieuwe wachtwoord.';
$result['status'] = TRUE;
}
echo json_encode( $result );
}
}
application/controllers/monpas/Compactsop.php
+7 -8
View File
@@ -49,13 +49,11 @@ class Compactsop extends MY_Controller{
echo json_encode($editok);
}
function controleerschool(){
function getorgsoort(){
if (!$this->userid) die;
$orgid = $this->globorgid;
$school = false;
$organisatie = $this->Organisaties_model->get_record_by_id($orgid);
if ($organisatie && $organisatie->soort == 4) $school = true;
echo json_encode($school);
$soort = $this->Organisaties_model->get_fieldvalue(['id' => $this->globorgid], 'soort');
echo json_encode($soort);
}
function getSchooljaren(){
@@ -80,13 +78,14 @@ class Compactsop extends MY_Controller{
function getOnderdelenEnVersies(){
if (!$this->userid) die;
$schooljaar = $this->uri->segment(4);
$compacteVersies = new Compacteversies($schooljaar);
$onderdelen = $compacteVersies->getOnderdelen();
$orgsoort = $this->uri->segment(5);
$compacteversies = new Compacteversies($schooljaar, $orgsoort);
$onderdelen = $compacteversies->getOnderdelen();
echo json_encode($onderdelen);
}
function getSchoolgegevens(){
function getOrganisatiegegevens(){
if (!$this->userid) die;
$school = $this->Schooldetails_model->getschool($this->globorgid);
if(!$school){
application/controllers/monpas/Omvang.php
+4 -2
View File
@@ -467,7 +467,8 @@ class Omvang extends MY_Controller{
$schooljaar->schooljaarnr = $omvang->schooljaarnr;
$schooljaar->naam = $omvang->naam;
$schooljaar->aantal = $omvang->aantal;
$schooljaar->aantalllnarr = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDs);
$aantal = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDs);
$schooljaar->aantalllnarr = $aantal->aantal;
$schooljaar->tlvs = $this->Tlvs_model->getAantalLeerlingenMetTLV($nummer, $schoolIDs);
if($organisatie->soort == 4){
$schooljaar->arrangementen = $this->Arrangementen_model->getArrangementenMetAantallen($organisatie->id,$nummer );
@@ -478,7 +479,8 @@ class Omvang extends MY_Controller{
$schooljaar->naamboven = $organisatieBoven->naamkort;
$schooljaar->brinboven = $organisatieBoven->brin;
$schooljaar->aantalboven = $boven->aantal;
$schooljaar->aantalllnarrB = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDsBoven);
$aantal = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDsBoven);
$schooljaar->aantalllnarrB = $aantal->aantal;
$schooljaar->tlvsB = $this->Tlvs_model->getAantalLeerlingenMetTLV($nummer, $schoolIDsBoven);
}
application/controllers/monpas/Overzichtsop.php
+23 -20
View File
@@ -88,30 +88,33 @@ class Overzichtsop extends MY_Controller{
}
}
}
echo json_encode(array("organisatie" => $organisatie, "soort" => 1));
echo json_encode([
"organisatie" => $organisatie,
"soort" => 1]);
break;
}
}
function getAlfabetisch(){
if (!$this->userid) die;
$schooljaarnr = $this->clean_input("schooljaarnr");
$orgid = $this->clean_input("orgid");
if ($orgid == 0) $orgid = $this->globorgid;
$organisatie = $this->Organisaties_model->getorg($orgid);
if($organisatie->soort == 2) $organisatie->scholen = $this->Organisaties_model->getscholenonderkamer($organisatie->id);
if($organisatie->soort == 1) $organisatie->scholen = $this->Organisaties_model->getscholenonderswv($organisatie->id);
foreach ($organisatie->scholen as $index => $school) {
$school->sop = 'F';
$compactsopID = $this->Compactsop_model->get_fieldvalue(
['organisatie_id' => $school->id, 'schooljaarnummer' => $schooljaarnr], 'id');
if ($compactsopID) $school->sop = 'T';
}
echo json_encode(array("organisatie" => $organisatie, "soort" => $organisatie->soort));
}
// function getAlfabetisch(){
// if (!$this->userid) die;
// $schooljaarnr = $this->clean_input("schooljaarnr");
// $orgid = $this->clean_input("orgid");
// if ($orgid == 0) $orgid = $this->globorgid;
// $organisatie = $this->Organisaties_model->getorg($orgid);
// if($organisatie->soort == 2) $organisatie->scholen = $this->Organisaties_model->getscholenonderkamer($organisatie->id);
// if($organisatie->soort == 1) $organisatie->scholen = $this->Organisaties_model->getscholenonderswv($organisatie->id);
//
// foreach ($organisatie->scholen as $index => $school) {
// $school->sop = 'F';
// $compactsopID = $this->Compactsop_model->get_fieldvalue(
// ['organisatie_id' => $school->id, 'schooljaarnummer' => $schooljaarnr], 'id');
// if ($compactsopID) $school->sop = 'T';
// }
//
//// echo json_encode(array("organisatie" => $organisatie, "soort" => $organisatie->soort));
//
// }
function download_pdf(){
application/controllers/monpas/Pdfmaker.php
+2 -1
View File
@@ -33,8 +33,9 @@ class Pdfmaker extends MY_Controller{
$zoek = [" ", "'", "/"];
$schoolid = str_replace($zoek, "",$schoolid);
$schoolnaam = str_replace($zoek, "",$organisatie->naamkort);
// $schoolnaam = $organisatie->naamkort;
$titel = str_replace($zoek, "",$titel);
$frameworklogo= $this->config->item('vendor_url').'/images/logos/frameworklogo.png';
$logonaam = $this->Schooldetails_model->get(["organisatie_id" =>$schoolid],'logo', true);
if (! $logonaam) $logonaam="monpaslogo.png";
application/controllers/monpas/Sopoud.php
+1
View File
@@ -87,6 +87,7 @@ class Sopoud extends MY_Controller{
function Getversies($profielid,$chapterid){
$versies = [];
$hoofdstuk = $this->Hoofdstukken_model->get_record_by_id($chapterid);
if ($hoofdstuk->module == 0 ) return $versies;
$module = $this->Modules_model->get_record_by_id( $hoofdstuk->module);
application/controllers/shared/Menu.php
+52 -20
View File
@@ -20,7 +20,7 @@ class Menu extends MY_Controller{
public function get_menu(){
$menu = new stdClass;
$user = new stdClass;
$organisatie = new stdClass;
$module = $this->session->userdata['module'];
@@ -32,11 +32,55 @@ class Menu extends MY_Controller{
$menu = $this->Menus_model->getmenu($module,$this->userrole);
foreach($menu as $menuitem){
if($menuitem->holdernaam == "sophoofd"){
$menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole);
}
}
$aangepastmenu = [];
$org = $this->Organisaties_model->get_record_by_id($this->globorgid);
if ($org){
foreach ($menu as $menuitem){
if ($menuitem->holdernaam == "sophoofd"){
switch ($org->soort){
case 1: $menuitem->naam = "SWOP"; break;
case 2: $menuitem->naam = "ROP" ; break;
case 3: $menuitem->naam = "BOP" ; break;
default: $menuitem->naam = "SOP";
};//switch
$menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole);
foreach($menuitem->subpaginas as $subpagina) {
if ($subpagina->paginanaam == 'compactsop') {
switch ($org->soort) {
case 1:
$subpagina->naam = "Compact SWOP";
break;
case 2:
$subpagina->naam = "Compact ROP";
break;
case 3:
$subpagina->naam = "Compact BOP";
break;
default:
$subpagina->naam = "Compact SOP";
}
}
}
}; //if
$aangepastmenu [] = $menuitem;
}; // foreach
}; //if organisatie
//
// foreach($aangepastmenu as $menuitem){
// if($menuitem->holdernaam == "sophoofd"){
// $menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole);
//
// }
// }
$licenties = null;
$licenties = $this->Licenties_model->get_licentie($this->orgid);
@@ -55,23 +99,11 @@ class Menu extends MY_Controller{
$organisatie = $this->Organisaties_model->get_orgnaam($this->globorgid);
}
$org = $this->Organisaties_model->get_record_by_id($this->globorgid);
if ($org){
foreach ($menu as $menuitem){
if (strtoupper($menuitem->naam) == "sophoofd"){
switch ($org->soort){
case 1: $menuitem->naam = "SWOP"; break;
case 2: $menuitem->naam = "KOP" ; break;
case 3: $menuitem->naam ="BOP"; break;
default: $menuitem->naam = "SOP";
};//switch
}; //if
}; // foreach
}; //if organisatie
echo json_encode(array( 'module' =>$module,
'modulenaam' => $modulenaam,
'menu' =>$menu,
'menu' => $aangepastmenu,
'user' => $user,
'organisatie' => $organisatie));
}
application/controllers/shared/Users.php
+72 -19
View File
@@ -1,5 +1,8 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
use Mailgun\Mailgun;
class Users extends MY_Controller{
function __construct(){
@@ -158,16 +161,45 @@ class Users extends MY_Controller{
$user = $this->Users_model->get_record_by_id($userid);
$data = array('username'=>$user->gnaam, 'password'=>$ww, 'fullname'=>$this->Users_model->get_fullname($userid));
$org = $this->getBijlage($orgid);
$this->load->library('email');
$this->email->from('noreply@framework.nl', 'Framework+ MonPas');
$this->email->to($user->email);
$this->email->subject('Inloggegevens MonPas');
$this->email->message($this->load->view('emails/newuser_mail', $data, TRUE));
$this->email->bcc("rfranke@framework-ed.nl");
if ($org->randomname)
$this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile);
$this->email->send();
$html = $this->load->view('emails/newuser_mail', $data, TRUE);
if( $_ENV['ENVIRONMENT'] == 'production')
{
//Deze code wordt alleen op produktie gebruikt en stuurt de mail
//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
$mailData = [
'from' => 'info@monpas.nl',
'to' => $user->email,
'cc' => 'rfranke@framework-ed.nl',
'subject' => 'Inloggegevens MonPas',
'html' => $html,
'inline' => [
[
'filename' => 'monpasklein.png',
'filePath' => FCPATH . 'css/images/monpasklein.png']
]
];
if( $org->randomname ) $mailData['attachment'][0] = [
'filename' => $org->bijlagefile,
'filePath' => MYROOTPATH. 'docs/'.$org->randomname ];
$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData );
}else{
$this->load->library('email');
$this->email->from('noreply@framework.nl', 'Framework+ MonPas');
$this->email->to($user->email);
$this->email->subject('Inloggegevens MonPas');
$this->email->message($this->load->view('emails/newuser_mail', $data, TRUE));
$this->email->bcc("rfranke@framework-ed.nl");
if ($org->randomname)
$this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile);
$this->email->send();
}
}
function updateuser2(){
@@ -288,14 +320,35 @@ class Users extends MY_Controller{
$this->Users_model->update_record(array('wachtwoord'=>$saltedww),$userid);
$data = array('username'=>$user->gnaam, 'password'=>$ww, 'fullname'=>$this->Users_model->get_fullname($userid));
$this->load->library('email');
$this->email->from('noreply@framework.nl', 'Framework+ MonPas');
$this->email->to($user->email);
$this->email->subject('Inloggegevens MonPas');
$this->email->message($this->load->view('emails/newpassword_mail', $data, TRUE));
$this->email->bcc("rfranke@framework-ed.nl");
$this->email->send();
$html = $this->load->view( 'emails/newpassword_mail', $data, TRUE );
if( $_ENV['ENVIRONMENT'] == 'production')
{
//Deze code wordt alleen op produktie gebruikt en stuurt de mail
//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [
'from' => 'info@monpas.nl',
'to' => $user->email,
'cc' => 'rfranke@framework-ed.nl',
'subject' => 'Inloggegevens MonPas',
'html' => $html,
'inline' => [
[
'filename' => 'monpasklein.png',
'filePath' => FCPATH . 'css/images/monpasklein.png']
]
] );
}else
{
$this->load->library( 'email' );
$this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' );
$this->email->to( $user->email );
$this->email->subject( 'Inloggegevens MonPas' );
$this->email->message( $html );
$this->email->bcc( "rfranke@framework-ed.nl" );
$this->email->send();
}
echo json_encode(array('ok'=>$ok, 'errortekst'=>$errortekst));
}
@@ -366,4 +419,4 @@ class Users extends MY_Controller{
$user=$this->Users_model->getorggebruikers($orgid, $userid);
echo json_encode($user);
}
}
}
application/libraries/monpas/Diversiteitafbeeldingen.php
-20
View File
@@ -14,20 +14,14 @@ class Diversiteitafbeeldingen {
private $vormen;
private $combifactor;
private $combifactoren;
private $deelfactoren;
private $deelfactor;
private $schoolfactor;
private $tijden;
private $tijd;
private $uur;
private $uur0;
private $minuut0;
private $string;
private $soort;
private $totminuten;
private $schoolminuten= 0;
private $schooltijdstring;
private $tottijd;
private $minuten;
private $totG = 0;
private $totS = 0;
@@ -35,23 +29,9 @@ class Diversiteitafbeeldingen {
private $gtijd;
private $itijd;
private $stijd;
private $minuten1 = 0;
private $minuten2 = 0;
private $minuten3 = 0;
private $minuten4 = 0;
private $minuten5 = 0;
private $dagtijd1 = 0;
private $dagtijd2 = 0;
private $dagtijd3 = 0;
private $dagtijd4 = 0;
private $dagtijd5 = 0;
private $schoolsoort;
private $factorenTot = 0;
private $combis;
private $combi;
private $groep12;
private $groep38;
private $groepdiversiteit =0;
private $totaal = 0;
private $aantalgroepen = 0;
private $som1 =0;
application/libraries/monpas/compactsop/Compacteonderdelen.php
+98 -102
View File
@@ -8,19 +8,14 @@ class Compacteonderdelen
private $omvangjaar;
private $jaar;
private $schooljaar;
private $schooljaarV;
private $school;
private $schoolgegevens;
private $schoolpartial = [];
private $swvid;
private $details;
private $orgGegevens;
private $orgpartial = [];
private $orglist;
private $organisatie;
private $kleurcodes;
private $orgsoort;
private $kleuren;
private $legenda;
private $logo;
private $tlvs;
private $arrangementen;
private $aantallen;
private $diversiteit;
private $ijkpunten;
private $scorevorm;
@@ -35,18 +30,15 @@ class Compacteonderdelen
private $uitgavetypen;
private $type;
private $typesom;
private $naam;
private $data;
private $html;
private $onderdeelcs;
private $onderdelencs;
private $onderdelenNew;
private $compacteonderdelen;
public function __construct($schooljaarnr, $onderdelen, $omvangjaren){
$this->CI = &get_instance();
$this->schooljaarnr = $schooljaarnr;
$this->onderdelen = $onderdelen;
$this->omvangjaren = $omvangjaren;
$this->onderdelen = $onderdelen;
$this->omvangjaren = $omvangjaren;
$this->handle();
}
@@ -66,17 +58,15 @@ class Compacteonderdelen
{
$this->setSchooljaar();
$this->setOrganisatie();
$this->setSchool();
$this->setSchoolGegevens();
$this->setSchoolPartial();
$this->setSWVid();
$this->setKleurcodes();
$this->setOrgSoort();
$this->setOrgdetails();
$this->setOrgGegevens();
$this->setOrgPartial();
$this->setOrglist();
$this->setKleuren();
$this->setLegenda();
$this->loopOnderdelen();
$this->setCompacteOnderdelen();
}
private function setSchooljaar(){
@@ -87,22 +77,35 @@ class Compacteonderdelen
private function setOrganisatie(){
$this->organisatie = $this->CI->Organisaties_model->get_record_by_id($this->CI->globorgid);
}
private function setSchool(){
$this->school = $this->CI->Schooldetails_model->get_details($this->CI->globorgid);
private function setOrgSoort(){
switch($this->organisatie->soort){
case 1: $this->orgsoort = "SWV";
break;
case 2: $this->orgsoort = "Regio";
break;
case 3: $this->orgsoort = "Bestuur";
break;
case 4:
default: $this->orgsoort = "School";
}
}
private function setSchoolGegevens(){
private function setOrgdetails(){
$this->details = $this->CI->Schooldetails_model->get_details($this->CI->globorgid);
}
private function setOrgGegevens(){
$test = $this->CI->rootpath;
$logo = false;
if($this->school && $this->school->logo) {
$logo = $this->CI->config->item('vendor_url') . '/images/logos/' . $this->school->logo;
if($this->details && $this->details->logo) {
$logo = $this->CI->config->item('vendor_url') . '/images/logos/' . $this->details->logo;
}
$this->schoolgegevens = [
$this->orgGegevens = [
'organisatie' => $this->organisatie,
'naamkort' => $this->organisatie->naamkort,
'school' => $this->school,
'details' => $this->details,
'orgsoort' => $this->orgsoort,
'schooljaar' => $this->schooljaar->naam,
'schooljaarnr' => $this->schooljaarnr,
'datum' => date("d-m-Y"),
@@ -110,20 +113,18 @@ class Compacteonderdelen
];
}
private function setSchoolpartial()
private function setOrgpartial()
{
$this->schoolpartial['data'] = $this->schoolgegevens;
$this->schoolpartial['html'] = 'monpas/compactsop/schoolgegevenscompact';
$this->orgpartial['data'] = $this->orgGegevens;
$this->orgpartial['html'] = 'monpas/compactsop/schoolgegevenscompact';
}
private function setSWVid()
{
$this->swvid = $this->CI->Organisaties_model->get_swvid($this->CI->globorgid);
}
private function setOrglist(){
$lijst = [];
$orglist = $this->CI->Organisaties_model->getlistrecursief($this->organisatie->id, $lijst);
$orglist = implode('","', $orglist);
$this->orglist = '"'. $orglist .'"';
private function setKleurcodes()
{
$this->kleurcodes = new Kleurcodes();
}
private function setKleuren()
@@ -156,29 +157,13 @@ class Compacteonderdelen
private function loopOnderdelen()
{
if (!$this->onderdelen) return;
foreach ($this->onderdelen as $index => $this->onderdeel) {
$this->data = "";
$this->html = "";
$this->setOnderdeelNaam();
$this->setHTMLPad();
foreach ($this->onderdelen ? : [] as $index => $this->onderdeel) {
$this->switchOnderdelen();
$this->setOnderdeel();
$this->setOnderdelen();
}
}
private function setOnderdeelNaam()
{
if (!$this->onderdeel['onderdeelnr']) return;
$this->naam = $this->CI->Compactsoponderdelen_model->get_fieldvalue(['nummer' => $this->onderdeel['onderdeelnr']], 'naam');
}
private function setHTMLPad(){
if (!$this->onderdeel['onderdeelnr']) return;
$this->html = $this->CI->Compactsoponderdelen_model->get_fieldvalue(['nummer' => $this->onderdeel['onderdeelnr']], 'pad');
}
private function switchOnderdelen()
{
if (!$this->onderdeel['onderdeelnr']) return;
@@ -201,7 +186,12 @@ class Compacteonderdelen
$this->setMiddelen();
break;
case 8:
case 9:
$this->setIJkpunten();
break;
case 10:
$this->setDiversiteit();
break;
}
}
@@ -210,7 +200,7 @@ class Compacteonderdelen
$divcompact = New Diversiteit($this->schooljaarnr, $this->CI->globorgid, $this->onderdeel['modulenr']);
$divdata = $divcompact->getDiversiteit();
$divafbeelding = New Diversiteitafbeeldingen($divdata, $this->onderdeel['modulenr'], $this->schooljaarnr);
$this->diversiteit = $divafbeelding->getDiversiteitAfbeeldingen();
$this->diversiteit = $divafbeelding->getDiversiteitafbeeldingen();
$data = [
'schooljaar' => $this->schooljaar->naam,
@@ -230,35 +220,45 @@ class Compacteonderdelen
$jaren = "'" . $jaren . "'";
$arrs = $this->CI->Arrangementen_model->getArrangementnamenSop($jaren,$this->CI->globorgid );
if($arrs) {
$kleuren = ['#ffcc80', '#ffb84d', '#ffa31a', '#e68a00', '#b36b00', '#804d00', '#4d2e00', '#ffe0b3', '#fff5e6'];
$index = 0;
foreach ($arrs as $arr) {
if ($index >= count($kleuren)) $index = 0;
$arr->kleur = $kleuren[$index];
$index++;
}
}
if($this->organisatie->soort == 4) {
$arrs = $this->CI->Arrangementen_model->getArrangementnamenSop($jaren, $this->CI->globorgid);
if ($arrs) {
$kleuren = ['#ffcc80', '#ffb84d', '#ffa31a', '#e68a00', '#b36b00', '#804d00', '#4d2e00', '#ffe0b3', '#fff5e6'];
$index = 0;
foreach ($arrs as $arr) {
if ($index >= count($kleuren)) $index = 0;
$arr->kleur = $kleuren[$index];
$index++;
}
}
}
foreach($this->omvangjaren as $index => $this->omvangjaar) {
$this->jaar = new stdClass();
$this->jaar->aantallen =
$this->CI->Aantalleerlingen_model->get_omvang($this->omvangjaar, $this->CI->globorgid);
$this->CI->Aantalleerlingen_model->get_omvang($this->omvangjaar, $this->orglist);
$this->jaar->tlvs =
$this->CI->Tlvs_model->getAantalLeerlingenMetTLV($this->omvangjaar, $this->CI->globorgid);
$this->jaar->arrangementen =
$this->CI->Arrangementen_model->getArrangementenMetAantallenSop($this->CI->globorgid,$this->omvangjaar );
if($this->jaar->arrangementen) {
foreach ($this->jaar->arrangementen as $arrangement) {
foreach ($arrs as $arr) {
if ($arrangement->id == $arr->id) {
$arrangement->kleur = $arr->kleur;
}
$arrangement->naamkort = $arrangement->naam;
if (strlen($arrangement->naam)> 10){
$arrangement->naamkort = substr($arrangement->naam, 0, 12);
$arrangement->naamkort = $arrangement->naamkort. '..';
$this->CI->Tlvs_model->getAantalLeerlingenMetTLV($this->omvangjaar, $this->orglist);
if($this->organisatie->soort < 4){
$this->jaar->arrangementen =
$this->CI->Arrangementen_model->getAantalLeerlingenMetArrangement($this->omvangjaar, $this->orglist );
}
if($this->organisatie->soort == 4) {
$this->jaar->arrangementen =
$this->CI->Arrangementen_model->getArrangementenMetAantallenSop( $this->organisatie->id, $this->schooljaarnr );
if($this->jaar->arrangementen) {
foreach ($this->jaar->arrangementen as $arrangement) {
foreach ($arrs as $arr) {
if ($arrangement->id == $arr->id) {
$arrangement->kleur = $arr->kleur;
}
$arrangement->naamkort = $arrangement->naam;
if (strlen($arrangement->naam) > 10) {
$arrangement->naamkort = substr($arrangement->naam, 0, 12);
$arrangement->naamkort = $arrangement->naamkort . '..';
}
}
}
}
@@ -315,7 +315,6 @@ class Compacteonderdelen
return $deel1 . ',' . $deel2;
}
private function lowercase(){
$klein = strtolower($this->type->uitgavetype);
$eerste = ucfirst($klein);
@@ -327,7 +326,6 @@ class Compacteonderdelen
$this->typesom = number_format(($this->typesom / 100), 0,',','.');
}
private function setSubsoorten(){
$this->subsoorten = $this->CI->Finbestemmingen_model->getUitgavenPerSubsoortSchool($this->CI->globorgid, $this->jaarnummer);
}
@@ -420,34 +418,32 @@ class Compacteonderdelen
$this->data = $this->ijkpunten;
}
private function setOnderdeel(){
if (!$this->onderdeel['onderdeelnr']) return;
// $this->onderdeelcs['breed'] = 'F';
private function setOnderdeel(){
$this->onderdeelcs = $this->onderdeel;
$this->onderdeelcs['breed'] = 'F';
if($this->html) {
$this->onderdeelcs['html'] = $this->html;
}
if($this->data && $this->naam) {
$this->onderdeelcs['data'] =
['data' =>$this->data,
'naam' =>$this->naam];
}
$result = $this->CI->Compactsoponderdelen_model->getOnderdeel($this->onderdeel['onderdeelnr'], $this->organisatie->soort);
$this->onderdeel['html'] = $result->pad;
$this->onderdeel['breed'] = 'F';
if($this->data){
$this->onderdeel['data'] =
['data' =>$this->data,
'naam' =>$result->naam ];
}
}
private function setOnderdelen(){
$this->onderdelencs []= $this->onderdeelcs;
$this->onderdelenNew []= $this->onderdeel;
}
private function setCompacteOnderdelen(){
$this->compacteonderdelen= [
'schoolgegevens' => $this->schoolpartial,
'orggegevens' => $this->orgpartial,
'legenda' => $this->legenda,
'onderdelen' => $this->onderdelencs,
'onderdelen' => $this->onderdelenNew,
'schooljaarnr' => $this->schooljaarnr,
'schooljaar' => $this->schooljaar->naam,
'schoolnaam' => $this->organisatie->naam
'orgnaam' => $this->organisatie->naam
];
}
}
application/libraries/monpas/compactsop/Compactepaginas.php
+6 -22
View File
@@ -3,13 +3,11 @@
class Compactepaginas
{
private $CI;
private $schooljaarnr;
private $schooljaar;
private $schoolnaam;
private $onderdeel;
private $onderdelen;
private $onderdelendef;
private $schoolgegevens;
private $orgGegevens;
private $legenda;
private $paginahtml;
private $pagina;
@@ -20,12 +18,6 @@ class Compactepaginas
private $middelenBreed = 'F';
private $inspectieBreed = 'F';
private $compactarray;
private $boven;
private $onder;
private $linksboven;
private $rechtsboven;
private $linksonder;
private $rechtsonder;
private $blokjeshtml;
private $html;
private $sopid;
@@ -48,12 +40,10 @@ class Compactepaginas
}
private function handle(){
$this->setSchoolgegevens();
$this->setOrggegevens();
$this->setLegenda();
$this->setOnderdelen();
$this->setSchooljaarnr();
$this->SetSchooljaar();
$this->setSchoolnaam();
$this->loopOnderdelen();
$this->setAantalPaginas();
$this->maakPaginas();
@@ -62,8 +52,8 @@ class Compactepaginas
$this->setHtml();
}
private function setSchoolgegevens(){
$this->schoolgegevens = $this->compacteonderdelen['schoolgegevens'];
private function setOrggegevens(){
$this->orgGegevens = $this->compacteonderdelen['orggegevens'];
}
private function setLegenda(){
@@ -74,17 +64,11 @@ class Compactepaginas
$this->onderdelen = $this->compacteonderdelen['onderdelen'];
}
private function setSchooljaarnr(){
$this->schooljaarnr = $this->compacteonderdelen['schooljaarnr'];
}
private function setSchooljaar(){
$this->schooljaar = $this->compacteonderdelen['schooljaar'];
}
private function setSchoolnaam(){
$this->schoolnaam = $this->compacteonderdelen['schoolnaam'];
}
private function loopOnderdelen(){
foreach($this->onderdelen as $index => $this->onderdeel ) {
@@ -171,7 +155,7 @@ class Compactepaginas
}
private function setCompactArray(){
if(! isset($this->onderdeel['html']) || ! isset($this->onderdeel['data'])) return;
if(!isset($this->onderdeel['html']) || !isset($this->onderdeel['data'])) return;
$this->compactarray = ['html' => $this->onderdeel['html'],
'data' => $this->onderdeel['data'] ];
}
@@ -212,7 +196,7 @@ class Compactepaginas
if(isset($this->pagina->rechtsonder)&& $this->pagina->rechtsonder)$rechtsonder = $this->pagina->rechtsonder;
$this->gegevens = ['schoolgegevens' => $this->schoolgegevens,
$this->gegevens = ['schoolgegevens' => $this->orgGegevens,
'legenda' => $this->legenda,
'boven' => $boven,
'onder' => $onder,
application/libraries/monpas/compactsop/Compacteversies.php
+111 -30
View File
@@ -9,24 +9,16 @@ class Compacteversies
private $kalenderjaar2;
private $jaarnr1;
private $jaarnr2;
private $modulenr;
private $licentie;
private $selected;
private $erIsDiversiteit;
private $groepen;
private $swvID;
private $orglist;
private $aantallln;
private $onderdelen;
private $onderdeel;
private $erZijnBudgetten = 'F';
private $budgetten;
private $geopendeversies;
private $versie;
private $erIsEenVersie = 'F';
private $gevuldeversies;
private $gevuldeschooljaren;
private $gevuldschooljaar;
private $vormtekst;
private $filledversies;
private $filledversie;
public function getOnderdelen(){
@@ -34,10 +26,11 @@ class Compacteversies
}
public function __construct( $schooljaarnr)
public function __construct( $schooljaarnr, $orgsoort)
{
$this->CI =& get_instance();
$this->schooljaarnr = $schooljaarnr;
$this->orgsoortnr = $orgsoort;
$this->handle();
}
@@ -45,6 +38,8 @@ class Compacteversies
{
$this->setSchooljaar();
$this->setKalenderjaren();
$this->setOrglist();
$this->setSWVID();
$this->setCompactSopOnderdelen();
$this->loopCompactSop();
}
@@ -62,10 +57,44 @@ class Compacteversies
if(!$this->jaarnr2) $this->jaarnr2 = intval($this->jaarnr1) + 1;
}
private function setCompactSopOnderdelen(){
$this->onderdelen = $this->CI->Compactsoponderdelen_model->getOnderdelen();
private function setOrglist(){
$lijst = [];
$orglist = $this->CI->Organisaties_model->getlistrecursief($this->CI->globorgid, $lijst);
$orglist = implode('","', $orglist);
$this->orglist = '"'. $orglist .'"';
}
private function setSWVID(){
$organisatie =$this->CI->Organisaties_model->get_record_by_id($this->CI->globorgid);
if ($organisatie) {
switch ($organisatie->soort) {
case "1":
$this->swvID = $organisatie->id;
break;
case "2":
$this->swvID = $organisatie->valtonder_id;
break;
case "3" :
$kamer = $this->CI->Organisaties_model->get_record_by_id($organisatie->valtonder_id);
$this->swvID = $kamer->valtonder_id;
break;
case "4":
$kamer = $this->CI->Organisaties_model->get_record_by_id($organisatie->valtonder_id);
$bestuur = $this->CI->Organisaties_model->get_record_by_id($kamer->valtonder_id);
$this->swvID = $bestuur->valtonder_id;
break;
}
}
else{
$this->swvID = null;
}
}
private function setCompactSopOnderdelen(){
$this->onderdelen = $this->CI->Compactsoponderdelen_model->getOnderdelen($this->orgsoortnr, $this->swvID,
$this->schooljaar->schooljaarnr);
}
private function loopCompactSop(){
if ($this->onderdelen){
@@ -85,7 +114,8 @@ class Compacteversies
}
private function setModuleMetLicentie(){
$this->onderdeel->modulenr = $this->CI->Compactsoponderdelen_model->getModuleMetLicentie($this->CI->globorgid, $this->onderdeel->nummer);
$this->onderdeel->modulenr =
$this->CI->Compactsoponderdelen_model->getModuleMetLicentie($this->CI->globorgid, $this->onderdeel->nummer, $this->orgsoortnr);
if($this->onderdeel->modulenr) $this->onderdeel->licentie = 'T';
}
@@ -112,18 +142,22 @@ class Compacteversies
break;
case 630: $this->onderdeel->schooltype = 'Alle';
break;
default: $this->onderdeel->schooltype = 'Alle';
case 660: $this->onderdeel->schooltype = 'R';
break;
default: $this->onderdeel->schooltype = 'R';
}
}
private function setDiversiteit(){
if($this->onderdeel->nummer != 1) return;
if($this->onderdeel->nummer != 1 && $this->onderdeel->nummer != 10) return;
$module = 2;
if(isset($this->swvID) && $this->swvID == 150 && $this->schooljaar->schooljaarnr > 8) $module = 660;
$this->aantallln = $this->CI->Groepen_model->getversiesmetleerlingen(
$this->CI->globorgid, $this->schooljaarnr, $this->onderdeel->schooltype, $module);
if(isset($this->aantallln)){
if ($this->aantallln > 0) {
$this->onderdeel->groepen = $this->CI->Groepen_model->get_AantalGroepen($this->schooljaarnr, $this->CI->globorgid, $module);
@@ -138,22 +172,26 @@ class Compacteversies
private function setExtraOmvang(){
if($this->onderdeel->nummer != 3 || $this->onderdeel->licentie == 'F') return;
$schooljaren = $this->CI->Aantalleerlingen_model->get_gevuldeschooljaren_Sop($this->schooljaarnr, $this->CI->globorgid);
$schooljaren = $this->CI->Aantalleerlingen_model->get_gevuldeschooljaren_Sop($this->schooljaarnr, $this->orglist);
if($schooljaren && count($schooljaren) > 0) {
$this->onderdeel->gegevens = 'T';
$this->onderdeel->gevuldeschooljaren = $schooljaren;
foreach ($this->onderdeel->gevuldeschooljaren as $this->gevuldschooljaar) {
$this->gevuldschooljaar->erZijnTLVs = false;
$this->gevuldschooljaar->erZijnTLVs = false;
$this->gevuldschooljaar->erZijnArrangementen = false;
$tlvs = $this->CI->Tlvs_model->getAantalTLVsSop($this->gevuldschooljaar->schooljaarnr, $this->CI->globorgid);
$tlvs = $this->CI->Tlvs_model->getAantalTLVsSop($this->gevuldschooljaar->schooljaarnr, $this->orglist);
if ($tlvs) {
if ($tlvs > 0) $this->gevuldschooljaar->erZijnTLVs = true;
if ($tlvs->aantal > 0) {
$this->gevuldschooljaar->erZijnTLVs = true;
$this->gevuldschooljaar->orgsmettlvs = $tlvs->orgsmettlvs;}
}
$arr = $this->CI->Arrangementen_model->getAantalLeerlingenMetArrangement($this->gevuldschooljaar->schooljaarnr, $this->CI->globorgid);
$arr = $this->CI->Arrangementen_model->getAantalLeerlingenMetArrangement($this->gevuldschooljaar->schooljaarnr, $this->orglist);
if ($arr) {
if ($arr > 0) $this->gevuldschooljaar->erZijnArrangementen = true;
if ($arr->aantal > 0){
$this->gevuldschooljaar->erZijnArrangementen = true;
$this->gevuldschooljaar->orgsmetarrs = $arr->orgsmetarrs;
}
}
}
}
@@ -178,8 +216,8 @@ class Compacteversies
private function setGeopendeVersies(){
if($this->onderdeel->ijkpunten == 'F' || $this->onderdeel->licentie =='F') return;
$this->onderdeel->geopendeversies = $this->CI->Filledversions_model->getfilledversionsperorg(
$this->CI->globorgid, $this->onderdeel->modulenr);
$this->onderdeel->geopendeversies = $this->CI->Filledversions_model->getfilledversions_bij_orglist(
$this->orglist, $this->onderdeel->modulenr);
}
private function loopGeopendeVersies(){
@@ -194,21 +232,64 @@ class Compacteversies
}
private function setFilledVersies(){
$this->gevuldeversies = $this->CI->Scores_model->fGetGevuldeVersies(
$this->versie->id, $this->CI->globorgid);
$this->gevuldeversies = $this->CI->Scores_model->fTelGevuldeVersiesBijOrglist(
$this->versie->id, $this->orglist);
if($this->gevuldeversies) {
if($this->versie->vorm == 1){
if($this->gevuldeversies->aantalFV > 0 ) {
if ($this->versie->vorm == 1) {
$this->vormtekst = 'schoolversie';
}
if($this->versie->vorm == 2){
if ($this->versie->vorm == 2) {
$this->vormtekst = 'individuele versie';
}
$this->versie->naam = $this->versie->naam . ', periode: ' . $this->versie->periodenummer . ': ' . $this->versie->geldigvanaf . ' - ' . $this->versie->geldigtm .', '. $this->vormtekst;
$this->versie->naam = $this->versie->naam . ', periode: ' . $this->versie->periodenummer . ': ' .
$this->versie->geldigvanaf . ' - ' . $this->versie->geldigtm . ', ' . $this->vormtekst;
$this->versie->naamkort = 'Periode: ' . $this->versie->periodenummer . ': ' . $this->versie->geldigvanaf . ' - ' . $this->versie->geldigtm;
if($this->orgsoortnr < 4){
if($this->gevuldeversies->aantalorgs == 1) {
$this->versie->naam = $this->versie->naam . ' (' . $this->gevuldeversies->aantalorgs . ' school';
}
else{
$this->versie->naam = $this->versie->naam . ' (' . $this->gevuldeversies->aantalorgs . ' scholen';
}
$this->versie->naamkort = $this->versie->naamkort . ' ('. $this->gevuldeversies->aantalorgs;
if ($this->versie->vorm == 2) {
if($this->gevuldeversies->aantalFV == 1){
$this->versie->naam = $this->versie->naam . '/ '. $this->gevuldeversies->aantalFV . ' lijst)';
}
else{
$this->versie->naam = $this->versie->naam . '/ '. $this->gevuldeversies->aantalFV . ' lijsten)';
}
$this->versie->naamkort = $this->versie->naamkort .'/ '. $this->gevuldeversies->aantalFV . ')';
}
else{
$this->versie->naam = $this->versie->naam . ')';
$this->versie->naamkort = $this->versie->naamkort . ')';
}
}
else{
if ($this->versie->vorm == 2) {
if($this->gevuldeversies->aantalFV == 1){
$this->versie->naam = $this->versie->naam . ' (' . $this->gevuldeversies->aantalFV . ' lijst)';
}
else {
$this->versie->naam = $this->versie->naam . ' (' . $this->gevuldeversies->aantalFV . ' lijsten)';
}
$this->versie->naamkort = $this->versie->naamkort .' ('. $this->gevuldeversies->aantalFV . ')';
}
else{
$this->versie->naam = $this->versie->naam . ')';
$this->versie->naamkort = $this->versie->naamkort . ')';
}
}
$this->onderdeel->filledversies [] = $this->versie;
}
}
}
application/libraries/monpas/ijkpunten/Lijsten.php
+1 -1
View File
@@ -185,7 +185,7 @@ class Lijsten
}
private function setBrin(){
if($this->soort != 4) return;
if($this->soort != 4 && $this->soort != 3) return;
$this->lijst->brin = $this->CI->Organisaties_model->get_fieldvalue(['id' => $this->orgid], 'brin');
}
application/models/Phantom_model.php
+1 -1
View File
@@ -114,7 +114,7 @@ class Phantom_model extends CI_Model{
curl_setopt_array( $curl, array(
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => 'https://print.pensare-services.nl/print',
CURLOPT_URL => $_ENV['printserver'],
// CURLOPT_URL => 'http://pdf.pensare-services.nl/index.php/pdfcreate',
CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $data
application/models/monpas/Arrangementen_model.php
+4 -4
View File
@@ -86,18 +86,18 @@ class arrangementen_model extends MY_Model{
return $this->get_query_row();
}
function getAantalLeerlingenMetArrangement($schooljaarnr, $orgids){
$this->sql= "SELECT SUM(APA.aantal) as aantal
function getAantalLeerlingenMetArrangement($schooljaarnr, $orglist){
$this->sql= "SELECT SUM(APA.aantal) as aantal, COUNT(DISTINCT(ARR.organisatie_id)) AS orgsmetarrs
FROM tb_arrangementen_piv_aantal APA
JOIN tb_arrangementen ARR ON APA.arrangement_id = ARR.id
JOIN tb_aantalleerlingen A ON ARR.organisatie_id = A.organisatie_id
WHERE APA.schooljaarnr = {$schooljaarnr}
AND ARR.organisatie_id IN ({$orgids})
AND ARR.organisatie_id IN ({$orglist})
AND A.schooljaarnr = {$schooljaarnr}
AND A.meetellen = 'T'
GROUP BY APA.schooljaarnr ";
return $this->get_query_row('aantal');
return $this->get_query_row();
}
application/models/monpas/Compactsoponderdelen_model.php
+27 -10
View File
@@ -1,7 +1,6 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/** Sop_model juli 2019 */
class compactsoponderdelen_model extends MY_Model{
@@ -13,26 +12,44 @@ class compactsoponderdelen_model extends MY_Model{
$this->load->model($models);
}
function getOnderdelen(){
$this->sql = "SELECT *
FROM tb_compactsoponderdelen
ORDER BY nummer ";
function getOnderdelen($orgsoort, $swvID, $schooljaarnr){
$this->sql = "SELECT C.naam, C.naamkort, C.ijkpunten, C.vergelijking, S.pad, S.blokid, C.nummer,
S.toon_nummer
FROM tb_compactsoponderdelen C
JOIN tb_compactonderdeel_piv_orgsoort S ON C.id = S.onderdeel_id
WHERE S.org_soort = {$orgsoort} ";
if($swvID == 150 && $schooljaarnr > 8){
$this->sql .= "AND C.nummer <> 1 ";
}
else{
$this->sql .= "AND C.nummer <> 10 ";
}
$this->sql .= " ORDER BY S.toon_nummer ";
return $this->get_query_result();
}
function getOnderdeel($nummer, $orgsoort){
$this->sql = "SELECT C.naam, C.naamkort, S.pad, S.blokid, S.toon_nummer
FROM tb_compactsoponderdelen C
JOIN tb_compactonderdeel_piv_orgsoort S ON C.id = S.onderdeel_id
WHERE S.org_soort = {$orgsoort}
AND C.nummer = {$nummer} ";
return $this->get_query_row();
}
function getModuleMetLicentie($orgid, $onderdeelnummer){
function getModuleMetLicentie($orgid, $onderdeelnummer, $orgsoort){
$this->sql = "SELECT L.modulenr
FROM tb_compactsoponderdelen CO
JOIN tb_sop_piv_modules SM ON CO.nummer = SM.onderdeel_nr
JOIN tb_licenties L ON SM.modulenr = L.modulenr
JOIN tb_compactonderdeel_piv_orgsoort S ON CO.id = S.onderdeel_id
WHERE L.orgid = {$orgid}
AND CO.nummer = {$onderdeelnummer}
AND CO.nummer = {$onderdeelnummer}
AND S.org_soort = {$orgsoort}
GROUP BY CO.nummer ";
return $this->get_query_row("modulenr");
}
}
application/models/monpas/Filledversions_model.php
+19 -2
View File
@@ -62,8 +62,7 @@ class Filledversions_model extends MY_Model{
function getfilledversionsperorg($orgid, $modulenr)
{
function getfilledversionsperorg($orgid, $modulenr){
// om de ingevulde lijsten per school op te halen
$this->sql = "SELECT DISTINCT(FV.orgversie_id) as id, OV.organisatie_id, periodenummer, OV.actief, versie_id, V.naam,
OV.vorm, OV.scoretype, OV.score_omschrijving,
@@ -82,6 +81,24 @@ class Filledversions_model extends MY_Model{
}
function getfilledversions_bij_orglist($orglist, $modulenr){
$this->sql = "SELECT DISTINCT(FV.orgversie_id) as id, OV.organisatie_id, periodenummer, OV.actief, versie_id, V.naam,
OV.vorm, OV.scoretype, OV.score_omschrijving,
DATE_FORMAT(geldigvanaf, '%d-%m-%Y') AS geldigvanaf,
DATE_FORMAT(geldigtm, '%d-%m-%Y') AS geldigtm,
DATE_FORMAT(invullentm, '%d-%m-%Y') AS invullentm,
V.naam
FROM tb_filledversions FV
JOIN tb_orgversies OV ON OV.id = FV.orgversie_id
JOIN tb_versies V ON V.id =OV.versie_id
WHERE FV.organisatie_id IN ({$orglist})
AND V.modulenr = {$modulenr}
ORDER BY OV.actief DESC, OV.periodenummer DESC ";
return $this->get_query_result();
}
function gettevergelijkenschoolversies($orgids, $modulenr){
// om de ingevulde lijsten per school op te halen
$this->sql =" SELECT DISTINCT (FV.orgversie_id) AS orgversieid, vorm, scoretype, (OV.versie_id) AS versieid, naam, A.omschrijving
application/models/monpas/Groepen_model.php
+13 -2
View File
@@ -49,14 +49,25 @@ class Groepen_model extends MY_Model{
return $this->get_query_row('aantal');
}
function getversiesmetleerlingen($orgid, $schooljaarnr, $schooltype, $module){
function getversiesmetleerlingengoedeversie($orgid, $schooljaarnr, $schooltype, $module){
$this->sql="SELECT SUM(totaantal) AS llnschool
FROM tb_groepen
WHERE organisatie_id ={$orgid}
AND schooljaarnr = {$schooljaarnr}
AND schooltype = '{$schooltype}'
AND module = {$module} ";
return $this->get_query_row('llnschool');
return $this->get_query_row("aantallln");
}
function getversiesmetleerlingen($orgid, $schooljaarnr, $schooltype, $module){
$this->sql="SELECT totaantal, niveau, schooljaarnr
FROM tb_groepen
WHERE organisatie_id ={$orgid}
AND schooljaarnr = {$schooljaarnr}
AND schooltype = '{$schooltype}'
AND module = {$module} ";
return $this->get_query_result();
}
application/models/monpas/Scores_model.php
+16 -1
View File
@@ -434,6 +434,21 @@ class Scores_model extends MY_Model{
return $lijst;
}
function fTelGevuldeVersiesBijOrglist($orgversieid, $orglist){
$this->sql =" SELECT COUNT(DISTINCT(Q.filledversion_id)) AS aantalFV, COUNT(DISTINCT(Q.organisatie_id)) AS aantalorgs
FROM(
SELECT S.filledversion_id, FV.organisatie_id
FROM tb_scores S
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
WHERE FV.orgversie_id = {$orgversieid}
AND FV.organisatie_id IN ({$orglist})
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5) AS Q ";
return $this->get_query_row();
}
function fCountGevuldeBestuurVersies($orgversieid, $bgid){
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal
FROM tb_scores S
@@ -445,7 +460,7 @@ class Scores_model extends MY_Model{
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5";
return $this->get_query_result('aantal');
return $this->get_query_row('aantal');
}
application/models/monpas/Sopinhouden_model.php
+1 -1
View File
@@ -164,7 +164,7 @@ class Sopinhouden_model extends MY_Model{
// $content = '';
$versie = "";
$result = $this->getOntwikkelagenda($profielid, 4,$targetversieid);
if($result ) {
if($result) {
$versie = $result['targetversie'];
}
$imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test', FALSE, FALSE, array(650, 300));
application/models/monpas/Tlvs_model.php
+4 -4
View File
@@ -39,16 +39,16 @@ class tlvs_model extends MY_Model{
return $this->get_query_result();
}
function getAantalTLVsSop($schooljaarnr, $orgid){
$this->sql = "SELECT SUM(COALESCE(T.aantal, 0)) as aantal
function getAantalTLVsSop($schooljaarnr, $orglist){
$this->sql = "SELECT SUM(COALESCE(T.aantal, 0)) as aantal, COUNT(DISTINCT(T.organisatie_id)) AS orgsmettlvs
FROM tb_tlvs T
JOIN tb_schooljaren S ON T.schooljaarnr = S.schooljaarnr
JOIN tb_aantalleerlingen A ON T.organisatie_id = A.organisatie_id
WHERE T.organisatie_id = {$orgid}
WHERE T.organisatie_id IN ({$orglist})
AND T.schooljaarnr = {$schooljaarnr}
AND A.schooljaarnr = {$schooljaarnr}
AND A.meetellen = 'T' ";
return $this->get_query_row('aantal');
return $this->get_query_row();
}
application/models/shared/Aantalleerlingen_model.php
+5 -3
View File
@@ -42,20 +42,22 @@ class aantalleerlingen_model extends MY_Model{
return $this->get_query_result();
}
function get_gevuldeschooljaren_Sop($schooljaarnr, $schoolid){
$this->sql= " SELECT A.schooljaarnr, S.naam
function get_gevuldeschooljaren_Sop($schooljaarnr, $orglist){
$this->sql= " SELECT A.schooljaarnr, S.naam, COUNT(A.organisatie_id) AS orgsmetlln
FROM tb_schooljaren S
JOIN tb_aantalleerlingen A ON S.schooljaarnr = A.schooljaarnr
WHERE A.organisatie_id = {$schoolid}
WHERE A.organisatie_id IN ({$orglist})
AND A.aantal > 0
AND A.schooljaarnr <= {$schooljaarnr}
AND A.meetellen = 'T'
GROUP BY A.schooljaarnr
ORDER BY A.schooljaarnr DESC";
return $this->get_query_result();
}
function get_omvang($schooljaarnr, $orgs){
$this->sql=" SELECT A.schooljaarnr, S.naam, SUM(A.aantal) as aantal
FROM tb_schooljaren S
application/models/shared/Organisaties_model.php
-1
View File
@@ -507,7 +507,6 @@ class Organisaties_model extends MY_Model{
return $lijst;
}
function getKleurcodesOrg($clusterid = FALSE, $swvid){
if (! $clusterid) $clusterid = 0;
$sql = " SELECT *
application/views/emails/newpassword_mail.php
+2 -2
View File
@@ -10,7 +10,7 @@
<table width="600px" style="background-color:#ffffff;border:4px solid #930f50;margin:10 0 60px 0;">
<tr>
<td colspan="4">
<img src="<?=base_url()?>css/images/monpasklein.png" style="margin:20px; height: 60px;" />
<img src="cid:monpasklein.png" style="margin:20px; height: 60px;" />
<div style="border:2px solid #930f50;width:500px;height;400px;margin-top:20px;padding:20px;margin-left:25px;background-color:#f1f4f7log;">
<p style="font-family:arial;font-size:14px;color:#031a3c;">
Beste <?=$fullname?>,<br /><br />
@@ -37,4 +37,4 @@
</tr>
</table>
</body>
</html>
</html>
application/views/emails/newuser_mail.php
+2 -2
View File
@@ -10,7 +10,7 @@
<table width="600px" style="background-color:#ffffff;border:4px solid #930f50;margin:10 0 60px 0;">
<tr>
<td colspan="4">
<img src="<?=base_url()?>css/images/monpasklein.png" style="margin:20px; height:60px" />
<img src="cid:monpasklein.png" style="margin:20px; height:60px" />
<div style="border:2px solid #930f50;width:500px;height;400px;margin-top:20px;padding:20px;margin-left:25px;background-color:#f1f4f7log;">
<p style="font-family:arial;font-size:14px;color:#031a3c;">
Beste <?=$fullname?>,<br /><br />
@@ -38,4 +38,4 @@
</tr>
</table>
</body>
</html>
</html>
application/views/monpas/compactsop/expertisecompactsosbo.php
+260
View File
@@ -0,0 +1,260 @@
<div class="sopOnderdeelBlok">
<div class="sopTitelHolder">
<?php if($naam){ ?>
<p class="sopTitel" ><?=$naam ?></p>
<?php if ($data['lijsten'][0]){ ?>
<div >
<p class="subTitel1">
<?php echo $data['versienaam'], $data['lijsten'][0]->vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?>
</p>
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
<p class="subTitel2"><?=$lijst->vantm ?></p>
<?php }; ?>
</div>
<?php } ?>
<?php }; ?>
</div>
<div class="sopKaderGrafiek highcharts-background"
id="chartCompactExpert">
</div>
<script>
<?php if ($data['lijsten']){ ?>
$(function(){
fFillGraph2=function(){
var xas = [];
var verkorteVersies = [];
var balkGegevens = [];
var lijnGegevens;
<?php foreach($data['lijsten'] as $index => $lijst){ ?>
var indexnummer = <?= $index?>;
var labels = [];
var scores = [];
var ambities = [];
var xastitel = '';
<?php if($lijst->label){ ?>
var xastitel = '<?php echo $lijst->label ?>';
<?php } ?>
<?php foreach($lijst->scores as $index2 => $score){
$omschrijving = "gemiddelde";
if(isset($score->omschrijving)){
$omschrijving = $score->omschrijving;
};
?>
labels.push(<?php $score->nummer ?>);
scores.push({
y: <?= $score->gem ?>,
color: '<?=$score->kleur ?>',
name: '<?= $score->nummer ?>',
soort: 'score',
versie: <?= $lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?php echo isset( $score->omschrijving) ? $score->omschrijving : ''; ?>' <?php // hier van $omschrijving $score->omschrijving gemaakt ?>
})
<?php } // foreach lijstscores ?>
verkorteVersies.push(<?= $lijst->periodenummer ?>);
var ambitiewaarde =<?=$data['lijsten'][0]->ambities->gemscore; ?>;
ambities.push(
{ y: <?=$data['lijsten'][0]->ambities->gemscore; ?>,
color: '#000000',
name: '',
soort: 'ambitie',
versie: <?=$lijst->periodenummer ?>,
vantm: '<?= $lijst->vantm ?>',
omschrijving: '<?='test'; //$omschrijving is geen veld?>'
}
);
labels.unshift(' ');
var legescore ={
y : 0,
color : 'transparent',
name : '0',
soort : 'extra',
versie : '',
vantm : '<?= $lijst->vantm ?>',
omschrijving: ''
};
scores.unshift(legescore);
verkorteVersies.unshift(<?= $lijst->periodenummer ?>);
labels.push(' ');
scores.push(legescore);
verkorteVersies.push(<?=$lijst->periodenummer ?>);
balkGegevens[indexnummer] =({
dataLabels: {
format: '<span style="font-size: 5px;">{point.versie}</span>'
},
type : 'column',
name : verkorteVersies,
backgroundColor: '#e6e6e6',
data : scores
});
<?php } // foreach lijsten ?>
var extralijn = {
y: ambitiewaarde,
name: '',
soort: 'extra'
};
ambities.unshift(extralijn);
ambities.push(extralijn);
var splinedata=[];
var xas = [];
if (balkGegevens[0]){
$.each(balkGegevens[0].data,function(i,p){
if (p.name=== '0') xas.push('');
else xas.push(p.name);
splinedata.push(ambitiewaarde)
});
}
lijnGegevens = ({
dataLabels: {
format: ''
},
type: 'spline',
name: verkorteVersies,
data: splinedata //ambities
});
balkGegevens.push(lijnGegevens);
// });
var ijkgrafiek;
ijkgrafiek = Highcharts.chart('chartCompactExpert', {
chart:{
animation: false,
backgroundColor: '#e6e6e6'
},
title:{
text:''
},
credits: {
enabled: false
},
xAxis: {
type: 'category',
categories: xas,
labels:{
style:{
fontSize: '8px'
}
}
},
yAxis: {
min:0,
max: 100,
title: false,
labels:{
style:{
fontSize: '8px'
}
}
},
legend: {
enabled: false
},
plotOptions: {
column:{
pointPadding: 0.05,
borderWidth:0
},
series:{
groupPadding: 0.05,
animation: false,
dataLabels: {
enabled: true,
inside: true,
align: 'center',
verticalAlign: 'bottom',
color: '#404040',
style: {
textOutline: false
}
}
},
spline: {
color: 'grey',
pointStart: 0,
marker: {
enabled: false
}
}
},
series: balkGegevens,
showInLegend: false
});
}()
});
<?php } ?>
</script>
<div class="sopKaderTabel" >
<?php if ($data['lijsten'][0]->scores){ ?>
<table class="sopTabel" >
<thead >
<tr >
<th style="width: 20px; padding-left: 3px; ">nr
</th>
<th style=" padding-left:3px;">
<?=$data['lijsten'][0]->label?>
</th>
<?php foreach ($data['lijsten'] as $lijst){ ?>
<th style=" width: 30px;
padding-right: 3px;">
<?php echo 'p '.$lijst->periodenummer; ?>
</th>
<?php }; // foreach ?>
</tr>
</thead>
<tbody >
<?php $i = 0;
foreach( $data['lijsten'][0]->scores as $score){ ?>
<tr>
<td ><?php if($score->nummer != 'gem'){ echo $score->nummer . '.';}?>
</td>
<td style=" overflow-x: hidden; overflow-y: hidden;
text-overflow: ellipsis;
white-space: nowrap;" >
<?php echo isset($score->omschrijving) ? $score->omschrijving: 'Gemiddelde'?>
</td>
<?php foreach ($data['lijsten'] as $lijst){
$kleur = isset($lijst->scores[$i]->kleur) ? $lijst->scores[$i]->kleur : '';
$gem = isset($lijst->scores[$i]->gem) ? $lijst->scores[$i]->gem : ''; ?>
<td style="background-color: <?=$kleur ?> !important;
padding-right: 3px;
text-align: right" >
<?=$gem?>
</td>
<?php }; // foreach
$i++; ?>
</tr>
<?php } ; ?>
</tbody>
<tr >
<td colspan="8"
class="inforegel">Scores in procenten </td>
</tr>
</table>
<?php } ;?>
</div>
</div>
application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php
+4 -2
View File
@@ -3,15 +3,17 @@
data-bind=" css{randinactief: geenLicentie(), geenrand: selected} ">
<!-- class="naamvak"-->
<div class="panel-heading"
style="height: 60px;"
data-bind="css: {inactiefsop: geenLicentie(),
lichtsop: geenGegevens() && !geenLicentie(),
witsop: selected() }">
<h4 data-bind="text: nummer + '. '+ naam,
<h4 data-bind="text: toonnummer + '. '+ naam,
click: $root.fSelecteerOnderdeel">
</h4>
</div>
<!-- class ="versievak"-->
<div class="panel-body"
style="height: 75px;"
data-bind =" text: infotekst,
visible: infotekst() && ! selected()> '',
style: {color: (geenGegevens() || geenLicentie()) ? '#949494' : '#333333'} ">
@@ -49,7 +51,7 @@
<input type="checkbox"
data-bind="attr: {'value': schooljaarnr}, checked:$root.selectedOmvangJaren"/>
</td >
<td style=" vertical-align: text-top; padding-left: 5px;">
<td style=" vertical-align: text-top; padding-left: 10px;">
<span class="versievak"
data-bind="text: schooljaarnaam">
</span>
application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+6 -4
View File
@@ -10,7 +10,8 @@
<div class="col-xs-4" >
<div class="panel-group" data-bind="foreach: onderdelen ">
<!-- ko if: nummer <= 4 -->
<!-- ko if: (toonnummer <= 4 && $parent.orgsoortnummer() == 4) ||
(toonnummer <= 3 && $parent.orgsoortnummer() != 4) -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko -->
</div>
@@ -19,7 +20,8 @@
<div class="col-xs-4"
style="border-right: 1px solid lightgrey">
<div class="panel-group" data-bind="foreach: onderdelen ">
<!-- ko if: nummer > 4 -->
<!-- ko if: (toonnummer > 4 && $parent.orgsoortnummer() == 4) ||
(toonnummer > 3 && $parent.orgsoortnummer() != 4) -->
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/blokvorm"); ?>
<!-- /ko -->
</div>
@@ -34,7 +36,7 @@
color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: nummer + '. ' ">
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() ">
@@ -47,7 +49,7 @@
style="background-color:#930f50; color: white;
margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: nummer + '. ' ">
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() ">
application/views/monpas/compactsop/maaksoponderdelen/knoppenbalk.php
+1 -1
View File
@@ -27,7 +27,7 @@
<td style="vertical-align: bottom; ">
<button class="buttonCompact glyphicon glyphicon-home"
style="background-color: #5cd65c; font-size: x-large; text-align: center;padding-right: 10px"
data-bind="click: fGetSchoolgegevens" >
data-bind="click: fGetOrganisatiegegevens" >
</button>
</td>
application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php
+4 -4
View File
@@ -22,7 +22,7 @@
</div>
<div data-bind="visible: gevuld()">
<div style="color: white; " data-bind="text: nummer() + ' '+ naamkort2()">
<div style="color: white; " data-bind="text: toonnummer()+ ' '+ naamkort2()">
</div>
</div>
</div>
@@ -39,7 +39,7 @@
</div>
</div>
<div data-bind="visible: gevuld()">
<div style="color: white; " data-bind="text: nummer() + ' '+ naamkort2()">
<div style="color: white; " data-bind="text: toonnummer() + ' '+ naamkort2()">
</div>
</div>
</div>
@@ -69,7 +69,7 @@
style =" color: white; padding: 10px; margin: 5px;
margin-right: 15px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: nummer + '. ' ">
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() ">
@@ -84,7 +84,7 @@
style="color: white;
margin: 5px; padding: 10px; height: 150px; ">
<label style="padding-top: 15px; width: 10px; vertical-align:top"
data-bind="text: nummer + '. ' ">
data-bind="text: toonnummer + '. ' ">
</label>
<label style="padding-top: 15px; width: 50px;"
data-bind="text: naamkort2() ">
application/views/monpas/compactsop/omvangcompactbrs.php
+421
View File
@@ -0,0 +1,421 @@
<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('vendor_url'); ?>/css/chart.css" />
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $this->config->item('vendor_url'); ?>/js_lib/Highcharts/code/highcharts.js"></script>
<div class="sopOnderdeelBlok">
<div class="sopTitelHolder " >
<?php if($naam): ?>
<p class="sopTitel"><?php echo $naam ?></p>
<?php endif ?>
<?php if (!isset($data[1]) ): ?>
<div class="col-xs-12 sopTitel" style="width: 350px;">
<p class=" subTitel1" ><?php echo $data[0]->aantallen->naam?></p>
<span class="subTitel2">Totaal aantal leerlingen: <?php echo $data[0]->aantallen->aantal ?></span>
</div>
<?php else : ?>
<div class="col-xs-6 sopTitel" style="width: 175px;">
<p class=" subTitel1" ><?php echo $data[0]->aantallen->naam?></p>
<span class="subTitel2">Totaal aantal leerlingen: <?php echo $data[0]->aantallen->aantal ?></span>
</div>
<div class="col-xs-6 sopTitel" style="width: 175px; display: inline-block; ">
<p class="subTitel1"><?php echo $data[1]->aantallen->naam?></p>
<span class="subTitel2">Totaal aantal leerlingen: <?php echo $data[1]->aantallen->aantal;
?></span>
</div>
<?php endif ?>
</div>
<div class="sopKaderGrafiek" style="margin-top: 0; padding-top: 0;">
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
<div id="omvangchart" style="width: 350px; height: 175px;">
</div>
</div>
<?php if ((!$data[0]->tlvs && !isset($data[1] ))|| (!$data[0]->tlvs && isset($data[1]) && !$data[1]->tlvs )):?>
<div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
<span class="subTitel2" style="padding: 0">Geen TLVs</span>
</div>
<?php elseif(! isset($data[1])) : ?>
<div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
<span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span>
</div>
<div class="col-xs-12" style="border: 1px #ff0000; margin: 0; padding: 0">
<div id="tlvs" style="width: 300px; height: 150px;">
</div>
</div>
<?php else: ?>
<div class="col-xs-12" style="margin-top: 0; padding-top: 0; text-align: center">
<span class="subTitel2" style="padding: 0">TLVs per zorgzwaarte</span>
</div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[0]->tlvs) : ?>
<div id="tlvs" style="width: 175px; height: 150px; margin: 0 auto; padding: 0">
</div>
<?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
<?php endif ?>
</div>
<div class="col-xs-6" style="border: 1px #ff0000; margin: 0; padding: 0">
<?php if($data[1]->tlvs) : ?>
<div id="tlvsII" style="width: 175px; height: 150px; margin: 0 auto;padding: 0">
</div>
<?php else : ?>
<div class="subTitel2" style="width: 175px; text-align: center; padding-top: 50px;">Geen TLVs</div>
<?php endif ?>
</div>
<?php endif ?>
</div>
<script>
// Build the chart
$(function(){
var schooljaren = [];
var aantallln = [];
var aantalarr = [];
var so = 0;
var sbo = 0;
var so2 = 0;
var sbo2 = 0;
var aantalso = [];
var aantalsbo = [];
var series = [];
<?php if(isset($data[0])) : ?>
schooljaren.push('<?=$data[0]->aantallen->naam ?>');
aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>)
<?php if($data[0]->arrangementen) : ?>
aantalarr.push(<?=intval($data[0]->arrangementen->aantal) ?>)
<?php elseif (isset($data[1])) :?>
aantalarr.push(0)
<?php endif; ?>
<?php if($data[0]->tlvs) : ?>
<?php foreach($data[0]->tlvs as $tlv) : ?>
<?php if($tlv->soort == "SBO") :?>
sbo = sbo + (<?= intval($tlv->aantal) ?>)
<?php endif; ?>
<?php if($tlv->soort == "SO") :?>
so = so + (<?= intval($tlv->aantal) ?>)
<?php endif; ?>
<?php endforeach; ?>
aantalsbo.push(sbo)
aantalso.push(so)
<?php elseif (isset($data[1])) :?>
aantalsbo.push(0)
aantalso.push(0)
<?php endif; ?>
<?php if(isset($data[1])) : ?>
schooljaren.push('<?=$data[1]->aantallen->naam ?>');
aantallln.push(<?=intval($data[1]->aantallen->aantal) ?>)
<?php if($data[1]->arrangementen) : ?>
aantalarr.push(<?=intval($data[1]->arrangementen->aantal) ?>)
<?php else :?>
aantalarr.push(0)
<?php endif; ?>
<?php if($data[1]->tlvs) : ?>
<?php foreach($data[1]->tlvs as $tlv) : ?>
<?php if($tlv->soort == "SBO") :?>
sbo2 = sbo2 + (<?= intval($tlv->aantal) ?>)
<?php endif; ?>
<?php if($tlv->soort == "SO") :?>
so2 = so2 + (<?= intval($tlv->aantal) ?>)
<?php endif; ?>
<?php endforeach; ?>
aantalsbo.push(sbo2)
aantalso.push(so2)
<?php else :?>
aantalsbo.push(0)
aantalso.push(0)
<?php endif; ?>
<?php else : ?>
schooljaren.unshift(' ');
schooljaren.push(' ');
aantallln.unshift(<?=intval($data[0]->aantallen->aantal) ?>);
aantallln.push(<?=intval($data[0]->aantallen->aantal) ?>);
aantalarr.unshift(0);
aantalarr.push(0);
aantalsbo.unshift(0);
aantalsbo.push(0);
aantalsbo.unshift(0);
<?php endif; ?>
series.push({
type: 'column',
name: 'tlvs sbo ',
color: '#005c99',
data: aantalsbo,
stack: 'tlvs'
})
series.push({
type: 'column',
name: 'tlvs so ',
color: '#4d9900',
data: aantalso,
stack: 'tlvs'
})
series.push({
type: 'column',
name: 'arrangementen',
color: '#ffcc80',
data: aantalarr,
stack: 'arrangementen'
})
series.push({
type: 'spline',
name: 'totaal leerlingen',
color : '#A28A29',
data: aantallln,
marker: {
lineWidth: 2
}
});
maakChart(schooljaren, series)
<?php endif; ?>
<?php if(($data[0]->tlvs)) : ?>
var pieID = 'tlvs';
var aantallen = [
<?php foreach($data[0]->tlvs as $tlv): ?>
<?php if($tlv->zwaarte == 'HOOG'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') so hoog',
y: <?= intval($tlv->aantal) ?>,
color: '#4d9900'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'MIDDEN'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') so midden',
y: <?= intval($tlv->aantal) ?>,
color: '#66cc00'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'LAAG'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') so laag',
y: <?= intval($tlv->aantal) ?>,
color: '#d9ffb3'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'ZWAAR'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') sbo zwaar',
y: <?= intval($tlv->aantal) ?>,
color: '#005c99'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'LICHT'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') sbo licht',
y: <?= intval($tlv->aantal) ?>,
color: '#99d6ff'
},
<?php endif; ?>
<?php endforeach; ?>
]
maakPie(pieID, aantallen);
<?php endif ?>
<?php if(isset($data[1] ) && $data[1]->tlvs) : ?>
var pieID = 'tlvsII'
var aantallen2 = [
<?php foreach($data[1]->tlvs as $tlv): ?>
<?php if($tlv->zwaarte == 'HOOG'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') so hoog',
y: <?= intval($tlv->aantal) ?>,
color: '#4d9900'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'MIDDEN'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') so midden',
y: <?= intval($tlv->aantal) ?>,
color: '#66cc00'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'LAAG'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') so laag',
y: <?= intval($tlv->aantal) ?>,
color: '#d9ffb3'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'ZWAAR'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') sbo zwaar',
y: <?= intval($tlv->aantal) ?>,
color: '#005c99'
},
<?php endif; ?>
<?php if($tlv->zwaarte == 'LICHT'): ?>
{
name: '(' + <?=$tlv->aantal?> + ') sbo licht',
y: <?= intval($tlv->aantal) ?>,
color: '#99d6ff'
},
<?php endif; ?>
<?php endforeach; ?>
]
maakPie(pieID, aantallen2);
<?php endif ?>
});
function maakChart(schooljaren, series){
Highcharts.chart('omvangchart', {
// // chart: {
// backgroundColor: 'transparent',
// plotBorderWidth: null,
// plotShadow: false,
// margin: [0,-10, 0, -80]
// },
credits: {
enabled: false
},
title: {
text: null
},
xAxis: {
categories: schooljaren
},
yAxis: {
allowDecimals: false,
min: 0,
title: {
text: 'Aantal leerlingen',
style:{
fontSize: '8px'
},
},
labels:{
style: {
fontSize: '8px'
} ,
},
stackLabels: {
enabled: true,
style:{
fontSize: '8px',
fontWeight: '200'
},
},
},
plotOptions: {
column: {
stacking: 'normal'
}
},
legend: {
itemStyle: {
fontWeight: '200',
fontSize: '8px',
},
// backgroundColor: 'white',
borderWidth: 0.5,
align: 'right',
symbolPadding: 1,
padding: 8,
verticalAlign: 'top',
floating: true,
x: 10,
y: -2,
width: 100,
itemWidth: 100,
itemDistance: 0,
},
series: series
});
}
function maakPie(pieID, punten) {
Highcharts.chart(pieID, {
chart: {
backgroundColor: 'transparent',
plotBorderWidth: null,
plotShadow: false,
type: 'pie',
margin: [0,-10, -50, -80]
},
title: {
text: null,
margin: 0,
},
credits: {
enabled: false
},
plotOptions: {
pie: {
// allowPointSelect: true,
size: 95,
padding: 0,
// cursor: 'pointer',
dataLabels: {
enabled: false,
},
showInLegend: true,
},
},
legend: {
itemStyle: {
fontWeight: '200',
fontSize: '8px',
},
align: 'right',
symbolPadding: 1,
padding: 0,
verticalAlign: 'top',
floating: true,
x: 10,
y: 0,
width: 80,
itemWidth: 80,
itemDistance: 0,
},
series: [{
name: 'tlvs',
// colorByPoint: true,
data: punten
}]
});
}
</script>
</div>
application/views/monpas/compactsop/overzicht/_bestuur.php
+36
View File
@@ -0,0 +1,36 @@
<table style="border: 1px solid #A28A29; margin-top: 30px;"
data-bind="with: $root.selectedOrg()">
<thead>
<tr style="border-bottom:1px solid #A28A29; ">
<th style="padding: 5px; color: white; background-color:#A28A29">Download</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Soort</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Organisatie</th>
</tr>
<tr style="border-bottom:1px solid #A28A29; ">
<td style="background-color: #f5f0f2;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#8cff1a; height: 30px; width: 30px;">
</button>
</td>
<td style="padding: 5px; background-color: #f5f0f2;">BOP</td>
<td style="padding: 5px; background-color: #f5f0f2;" data-bind="text: brin + ' ' + naam">
</td>
</tr>
</thead>
<tbody data-bind="foreach: scholen">
<tr style="border-bottom:1px solid #A28A29; ">
<td >
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; border-radius: 50%; box-shadow: none; border: none">
</button>
</td>
<td style="padding: 5px">SOP</td>
<td style="padding: 5px" data-bind="text: brin + ' ' + naam">
</td>
</tr>
</tbody>
</table>
application/views/monpas/compactsop/overzicht/_regio.php
+61
View File
@@ -0,0 +1,61 @@
<table style="border: 1px solid #A28A29; margin-top: 30px;"
data-bind="with: $root.selectedOrg()">
<thead>
<tr>
<th style="padding: 5px; color: white; background-color:#A28A29">Download</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Soort</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Organisatie</th>
</tr>
<tr style="border-bottom:1px solid #A28A29; ">
<th style="background-color: #ded0d7">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class=" buttonCompact glyphicon glyphicon-open"
style="background-color:#ff8c1a; height: 30px; width: 30px; float: left; border-radius: 50%;
color: white; border: none; box-shadow: none; ">
</button>
</th>
<th style="padding: 5px; background-color: #ded0d7 ">ROP</th>
<th style="padding: 5px; background-color: #ded0d7" data-bind="text: naam">
</th>
</tr>
</thead>
<tbody >
<!-- ko foreach: bgs -->
<tr style="border-bottom: 1px solid #A28A29;">
<td style="background-color: #f5f0f2;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style=" height: 30px; width: 30px; background-color: #8cff1a;">
</button>
</td>
<td style="padding: 5px; background-color: #f5f0f2;">ROP</td>
<td style="padding: 5px; background-color: #f5f0f2;" data-bind="text: brin + ' ' + naam">
</td>
</tr>
<!--ko foreach: scholen -->
<tr style="border-bottom: 1px solid #A28A29;">
<td >
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; float: left">
</button>
</td>
<td style="padding: 5px">SOP</td>
<td style="padding: 5px" data-bind="text: brin + ' ' + naam">
</td>
</tr>
<!-- /ko -->
<!--/ko-->
</tbody>
</table>
application/views/monpas/compactsop/overzicht/_school.php
+14
View File
@@ -0,0 +1,14 @@
<table style="width: 500px;" data-bind="with: $root.selectedOrg()">
<tr>
<td style="padding: 5px">SOP</td>
<td style="padding: 5px" data-bind="text: brin + ' ' + naam">
</td>
<td >
<button data-bind="visible: erIsEenSop()== true, click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; ">
</button>
</td>
</tr>
</table>
application/views/monpas/compactsop/overzicht/_swv.php
+74
View File
@@ -0,0 +1,74 @@
<table style="border: 1px solid #A28A29; margin-top: 30px;"
data-bind="with: $root.selectedOrg()">
<thead>
<tr style="border-bottom: 1px solid white;">
<th style="padding: 5px; color: white; background-color:#A28A29">Download</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Soort</th>
<th style="padding: 5px; color: white; background-color:#A28A29 ">Organisatie</th>
</tr>
<tr style="border-bottom:1px solid #A28A29; ">
<th style="background-color: #a07b8e;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class=" buttonCompact glyphicon glyphicon-open"
style="background-color:white; height: 30px; width: 30px; float: left; border-radius: 50%;
color: white; border: none; box-shadow: none; ">
</button>
</th>
<th style="padding: 5px; color: white; background-color: #a07b8e; ">SWOP</th>
<th style="padding: 5px; color: white; background-color: #a07b8e;" data-bind="text: naam">
</th>
</tr>
</thead>
<tbody >
<!-- ko forach: kamers -->
<tr style="border-bottom: 1px solid #A28A29;">
<td style="background-color: #ded0d7">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#ff8c1a; height: 30px; width: 30px; float: left">
</button>
</td>
<td style="padding: 5px; background-color: #ded0d7">ROP</td>
<td style="padding: 5px; background-color: #ded0d7" data-bind="text: naam">
</td>
</tr>
<!--ko foreach: bgs -->
<tr style="border-bottom: 1px solid #A28A29;">
<td style="background-color: #f5f0f2;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#8cff1a; height: 30px; width: 30px; float: left">
</button>
</td>
<td style="padding: 5px; background-color: #f5f0f2;">BOP</td>
<td style="padding: 5px; background-color: #f5f0f2;" data-bind="text: brin + ' ' + naam">
</td>
</tr>
<!--ko foreach: scholen -->
<tr style="border-bottom: 1px solid #A28A29;">
<td >
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; float: left">
</button>
</td>
<td style="padding: 5px">SOP</td>
<td style="padding: 5px" data-bind="text: brin + ' ' + naam">
</td>
</tr>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</tbody>
</table>
application/views/monpas/compactsop/schoolgegevens.php
+9 -3
View File
@@ -1,7 +1,10 @@
<table class="sopSchoolTabel" style="table-layout:fixed">
<tbody>
<tr>
<td class="sopTabeltd" style="color:#737373 !important ; width:45px">School
<td class="sopTabeltd" style="color:#737373 !important ; width:45px"><?php
if (isset($data['orgsoort'])) {
echo $data['orgsoort'];
} ?>
</td>
<td class="sopTabeltd" style="overflow-x: hidden; width:200px; white-space:nowrap" >
<?php
@@ -18,10 +21,13 @@
</td>
</tr>
<tr>
<td class="sopTabeltd" style="color:#737373 !important;">Brin
<td class="sopTabeltd" style="color:#737373 !important;">
<?php if (isset($data['organisatie']->brin) && $data['organisatie']->soort > 2) {
echo 'Brin';
} ?>
</td>
<td class="sopTabeltd" style="overflow-x:hidden; white-space:nowrap">
<?php if (isset($data['organisatie']->brin)) {
<?php if (isset($data['organisatie']->brin) && $data['organisatie']->soort > 2) {
echo $data['organisatie']->brin;
} ?>
</td>
application/views/monpas/modals/school_modal.php
+9 -8
View File
@@ -7,19 +7,20 @@
data-dismiss="modal"
type="button"
style="color:#ffffff" >x</button>
<h4>Schoolgegevens</h4>
<h4>Organisatiegegevens</h4>
</div>
<div class="modal-body">
<table style="width: 90%;" data-bind="foreach: $root.school"">
<table style="width: 90%;" data-bind="foreach: $root.school">
<tr >
<td style="width: 20%">School</td>
<td style="width: 20%" data-bind="text: $root.orgsoort() "></td>
<td style="width: 30%" data-bind="text: naam"></td>
<td style="width: 20%" >Adres</td>
<td style="width: 30%">
<input style="width: 100%"
data-bind="textInput: straat,
event:{input: $root.fSaveSchool} "/>
event:{input: $root.fSaveOrg} "/>
</td>
</tr>
<tr >
@@ -27,26 +28,26 @@
<td data-bind="text: brin"></td>
<td>Plaats</td>
<td> <input data-bind="textInput: plaats,
event:{input: $root.fSaveSchool}"
event:{input: $root.fSaveOrg}"
style="width: 100%;"/>
</td>
</tr>
<tr>
<td>Telefoon</td>
<td><input data-bind="textInput: foon,
event:{input: $root.fSaveSchool}"
event:{input: $root.fSaveOrg}"
style="width: 80%;"/>
</td>
<td>E-mail</td>
<td><input data-bind="textInput: email,
event:{input: $root.fSaveSchool}"
event:{input: $root.fSaveOrg}"
style="width: 100%;"/>
</td>
</tr>
<tr >
<td>Website</td>
<td><input data-bind="textInput: site,
event:{input: $root.fSaveSchool}"/>
event:{input: $root.fSaveOrg}"/>
</td>
<td></td>
<td>
application/views/monpas/pages/compactsop.php
+4 -14
View File
@@ -1,16 +1,8 @@
<div class="col-sm-12 mainpagina submenupage" id ="pagcompactsop">
<h2>Compact Sop</h2>
<h2 data-bind="text: 'Compact ' + label()"></h2>
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/knoppenbalk"); ?>
<div class= "row" data-bind="visible: !schooljanee()" >
<div class="col-sm-12" >
<h4> Het Compact Schoolondersteuningsprofiel is toegankelijk voor scholen.</h4>
</div>
</div>
<div class="row" data-bind="visible: schooljanee()">
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/knoppenbalk"); ?>
<div class="row" style="margin-left: 10px;" data-bind="visible: toonOnderdelen()">
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/kiesonderdelen"); ?>
</div>
@@ -19,10 +11,8 @@
<?php $this->load->view("monpas/compactsop/maaksoponderdelen/maaklayout"); ?>
</div>
</div> <!-- visible school ja/nee -->
<?php $this->load->view("monpas/modals/school_modal"); ?>
<!-- --><?php //$this->load->view("monpas/modals/omvang_modal"); ?>
</div>
application/views/monpas/pages/sopoverzicht.php
+41 -291
View File
@@ -1,306 +1,56 @@
<div class="col-sm-12 mainpagina" id ="pagsopoverzicht">
<div class="row">
<div class="col-sm-12 col-md-3" >
<div style = "max-height: 300px; overflow-y:auto">
<div class="col-xs-3"></div>
<!-- ko if : orgsoort() ==4 -->
<div data-bind="visible: orgsoort()== 4, with: toporg">
<p data-bind="text: brin + ' - ' + naam"></p>
</div>
<!-- /ko -->
<div class="col-xs-6 " >
<h3>Compacte Ontwikkelingsplannen</h3>
<!-- ko if : orgsoort() ==3 -->
<div data-bind="visible: orgsoort() == 3">
<table style="width: 100%;">
<tbody data-bind="with: toporg">
<tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">
<td class="orgtd brin" data-bind="text: brin"></td>
<td class='orgtd' data-bind="text: naam"></td>
</tr>
</tbody>
</table>
</div>
<!-- /ko -->
<p>Selecteer een schooljaar:</p>
<select data-bind=" options: schooljaren,
optionsText: 'naam',
value: $root.selectedSchooljaar,
event: {change: fChangeSchooljaar}">
</select>
<!-- ko if: orgsoort() ==2 -->
<!-- <div class="col-sm-5" >-->
<table style="width: 100%">
<tbody data-bind="with: toporg">
<tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">
<td data-bind="click: $root.fToggleGeopend" style="width:16px;">
<button class="noshowklein openbutton"
data-bind="css: {'closebutton': geopend() }">
</button>
</td>
<td class='orgtd' data-bind="text: naam, click: $root.fSwitchOrg"></td>
</tr>
<tr data-bind="visible: geopend">
<td colspan = 2 style="padding-left: 20px;">
<table style="width: 100%">
<tbody data-bind="foreach: bgs">
<tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">
<td data-bind="click: $root.fToggleGeopend" style="width:16px;">
<!-- <button class="noshowklein openbutton"-->
<!-- data-bind="css: {'closebutton': geopend() }">-->
<!-- </button>-->
</td>
<td class='orgtd' data-bind="text: naam, click: $root.fSwitchOrg"></td>
</tr>
<tr data-bind="visible: geopend">
<!-- <td colspan = 2 style="padding-left: 20px;">-->
<!-- <table>-->
<!-- <tbody data-bind="foreach: scholen">-->
<!-- <tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">-->
<!-- <td class='orgtd' data-bind="text: naam, click: $root.fSwitchOrg"></td>-->
<!-- </tr>-->
<!-- </tbody>-->
<!-- </table>-->
<!-- </td>-->
</tr>
<tbody>
</table>
</td>
</tr>
<!-- <p style="margin-top: 8px;">Ordening</p>-->
<!--if orgsoort = 1 of 2-->
<!-- <p>-->
<!-- <i class="fa fa-check-square"-->
<!-- style="color: #A28A29;"-->
<!-- data-bind="click: $root.fToggleOrdening"></i>-->
<!-- <span data-bind="click: $root.fToggleOrdening">per bestuur-->
<!-- </span>-->
<!-- </p>-->
<!-- <p>-->
<!-- <i class="fa fa-square"-->
<!-- style="color: #A28A29;"-->
<!-- data-bind="click: $root.fToggleOrdening"-->
<!-- ></i>-->
<!-- <span data-bind="click: $root.fToggleOrdening">alfabetisch-->
<!-- </span>-->
<!-- </p>-->
<!---->
<!-- </div>-->
</tbody>
</table>
<!-- /ko -->
<!-- ko if: orgsoort() ==1 -->
<table style="width: 100%;">
<tbody data-bind="with: toporg">
<tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">
<td data-bind="click: $root.fToggleGeopend" style="width:16px;">
<button class="noshowklein openbutton"
data-bind="css: {'closebutton': geopend() }">
</button>
</td>
<td class='orgtd' data-bind="text: naam, click: $root.fSwitchOrg"></td>
</tr>
<tr data-bind="visible: geopend()">
<td></td>
<td >
<table style="width: 100%;">
<tbody data-bind="foreach: kamers">
<tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">
<td data-bind="click: $root.fToggleGeopend" style="width:16px;">
<button class="noshowklein openbutton"
data-bind="css: {'closebutton': geopend() }">
</button>
</td>
<td class='orgtd' data-bind="text: naam, click: $root.fSwitchOrg"></td>
</tr>
<tr data-bind="visible: geopend()">
<td></td>
<td >
<table style="width: 100%;">
<tbody data-bind="foreach: bgs">
<tr class="selectable" data-bind="css: {'selected': $root.selectedOrg().id == id}">
<td class='orgtd' data-bind="text: naam, click: $root.fSwitchOrg"></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /ko -->
</div >
</div>
<div class="col-sm-12 col-md-4" >
<h3>Compact SOPS</h3>
<div class="col-sm-7" >
<p>Selecteer een schooljaar:</p>
<select data-bind=" options: schooljaren,
optionsText: 'naam',
value: $root.selectedSchooljaar,
event: {change: fChangeSchooljaar}">
</select>
</div>
<div class="col-sm-5" >
<!-- ko if: keuzesoort() == 1 || keuzesoort() == 2 -->
<p style="margin-top: 8px;">Ordening</p>
<div data-bind="visible: alfabetisch() == false">
<p>
<i class="fa fa-check-square"
style="color: #A28A29;"
data-bind="click: $root.fToggleOrdening"></i>
<span data-bind="click: $root.fToggleOrdening">per bestuur
</span>
</p>
<p>
<i class="fa fa-square"
style="color: #A28A29;"
data-bind="click: $root.fToggleOrdening"
></i>
<span data-bind="click: $root.fToggleOrdening">alfabetisch
</span>
</p>
</div>
<div data-bind="visible: alfabetisch() == true">
<p>
<i class="fa fa-square"
style="color: #A28A29;"
data-bind="click: $root.fToggleOrdening"></i>
<span data-bind="click: $root.fToggleOrdening">per bestuur
</span>
</p>
<p>
<i class="fa fa-check-square"
style="color: #A28A29;"
data-bind="click: $root.fToggleOrdening"></i>
<span data-bind="click: $root.fToggleOrdening">alfabetisch
</span>
</p>
</div>
<!-- /ko -->
<div class="row" data-bind="visible: orgsoort()== 4 ">
<?php $this->load->view("monpas/compactsop/overzicht/_school"); ?>
</div>
<div style="margin-top: 80px;">
<table style="width: 375px; ">
<tr style="vertical-align: top;font-weight: bold; background-color:#A28A29; color: white">
<td style="width: 50px;">Sop
</td>
<td style="width: 325px;">Naam
</td>
</tr>
</table>
<!-- ko if: orgsoort() == 3 -->
<div class="row" ">
<?php $this->load->view("monpas/compactsop/overzicht/_bestuur"); ?>
</div>
<!--/ko -->
<div class="row" data-bind="visible: orgsoort()== 2 ">
<?php $this->load->view("monpas/compactsop/overzicht/_regio"); ?>
</div>
<div class="row" data-bind="visible: orgsoort()== 1 ">
<?php $this->load->view("monpas/compactsop/overzicht/_swv"); ?>
</div>
<!-- ko if: keuzesoort() == 4 -->
<table style="width: 375px;" data-bind="with: $root.selectedOrg()">
<tr>
<td style="width: 50px;"><button data-bind="visible: erIsEenSop()== true, click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px;">
</button>
</td>
<td style="width: 324px;"
data-bind="text: brin + ' ' + naam">
</td>
</tr>
</table>
<!-- /ko -->
<!-- ko if: keuzesoort() == 3 -->
<table style="width: 375px; border: 1px solid #A28A29;"
data-bind="with: $root.selectedOrg()">
<tbody data-bind="foreach: scholen">
<tr >
<td style="width: 50px;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px;">
</button>
</td>
<td style="width: 324px;"
data-bind="text: brin + ' ' + naam">
</td>
</tr>
</tbody>
</table>
<!-- /ko -->
<!-- ko if: keuzesoort() == 2 && alfabetisch() == false -->
<table style="width: 375px;" data-bind="with: $root.selectedOrg()">
<tbody data-bind="foreach: bgs">
<tr>
<td style="vertical-align: top; background-color: #930f50; font-weight: bold; color: white"
data-bind="text: naam"></td>
</tr>
<tr>
<td>
<table data-bind="foreach: scholen"
style="border: 1px solid #930f50;margin-left: -3px; margin-right: -3px;" >
<tr style="height: 35px;">
<td style="width: 50px;">
<button data-bind="visible: erIsEenSop(),
click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px;">
</button>
</td>
<td style="width: 325px;"
data-bind="text: brin + ' ' + naam">
</td>
</tr>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /ko -->
<!-- ko if: keuzesoort() == 1 && alfabetisch() == false-->
<table style="width: 375px;" data-bind="with: $root.selectedOrg()">
<tbody data-bind="foreach: kamers">
<tr>
<td style="vertical-align: top; background-color: #930f50; font-weight: bold; color: white"
data-bind="text: naam"></td>
</tr>
<tr>
<td>
<table data-bind="foreach: bgs"
style="border: 1px solid #930f50; margin-left: -3px; margin-right: -3px;">
<tr>
<td style=" vertical-align: top; background-color: #930f50; color: white"
data-bind="text: brin + ' ' + naam"></td>
</tr>
<tr>
<td >
<table data-bind="foreach: scholen" style="width:100%">
<tr style="height: 35px;">
<td style="width: 50px;">
<button data-bind="visible: erIsEenSop(),
click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px;">
</button>
</td>
<td style="width: 315px;"
data-bind="text: brin + ' ' + naam">
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /ko -->
<!-- ko if: (keuzesoort() == 1 || keuzesoort() == 2) && alfabetisch() == true -->
<table style="width: 375px; border: 1px solid #A28A29;"
data-bind="with: $root.selectedOrg()">
<tbody data-bind="foreach: scholen">
<tr style="height: 35px;">
<td style="width: 50px;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px;">
</button>
</td>
<td style="width: 324px;"
data-bind="text: brin + ' ' + naam">
</td>
</tr>
</tbody>
</table>
<!-- /ko -->
</div>
application/views/monpas/sop/diversiteittabel2.php
+1 -1
View File
@@ -16,7 +16,7 @@
<tr>
<td> Totaal aantal leerlingen</td>
<?php $schooltotaal = 0;
if (($groepen)){
if ($groepen){
foreach($groepen as $groep){
$schooltotaal = $schooltotaal + $groep->totaantal; ?>
<td style="text-align:right"><?=$groep->totaantal?></td>
composer.json
+4 -1
View File
@@ -11,7 +11,10 @@
"source": "https://github.com/bcit-ci/CodeIgniter"
},
"require": {
"php": ">=7.0"
"php": ">=7.0",
"mailgun/mailgun-php": "^3.5",
"kriswallsmith/buzz": "^1.2",
"nyholm/psr7": "^1.4"
},
"suggest": {
"paragonie/random_compat": "Provides better randomness in PHP 5.x"
documentatie/Aanmaken van een nieuw instrument.docx
BIN
View File
Binary file not shown.
documentatie/Documentatie bij DQ.docx
BIN
View File
Binary file not shown.
documentatie/Flyer Monitor Financieel ls 22_01_2016.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Diversiteitmeter.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Expertise Scan.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding MonPas.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Monitor Basisondersteuning.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Monitor Financiën.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Partituur IJkpuntenmei 2016_2.doc
BIN
View File
Binary file not shown.
documentatie/Handleiding Schoolmeter.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Tevredenheidsmeter School.docx
BIN
View File
Binary file not shown.
documentatie/Handleiding Tevredenheidsmeter.docx
BIN
View File
Binary file not shown.
documentatie/Instructie Editor ls opmerkingen.docx
BIN
View File
Binary file not shown.
documentatie/Kleurenschema.docx
BIN
View File
Binary file not shown.
documentatie/Korte namen Monitor Basisondersteuning.doc
BIN
View File
Binary file not shown.
documentatie/MonPas kleurschema.cs
BIN
View File
Binary file not shown.
documentatie/Monitor Basisondersteuning PO in de ik vorm.doc
BIN
View File
Binary file not shown.
documentatie/Toelichting IJkpunten van de Basisondersteuning.doc
BIN
View File
Binary file not shown.
documentatie/Van SOP naar SOP 2.pdf
BIN
View File
Binary file not shown.
documentatie/Voorbeelden van vragen en ondersteuning.doc
BIN
View File
Binary file not shown.
documentatie/handleiding_sop_en_sopnieuw.pdf
BIN
View File
Binary file not shown.
documents/demo_bob_de_meander.pdf
BIN
View File
Binary file not shown.
documents/demo_sop_de_kindertuin.pdf
BIN
View File
Binary file not shown.
documents/handleiding_basisondersteuning_2015.pdf
BIN
View File
Binary file not shown.
documents/handleiding_diversiteitsmeter_2015.pdf
BIN
View File
Binary file not shown.
documents/handleiding_expertise_scan_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_schoolmeter_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/css/images/huis.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 693 B

public/js/monpas/models/compactsopmodel.js
+58 -28
View File
@@ -24,6 +24,7 @@ mh.initCompactSopModel = function(){
var dit = this;
this.id = o.id;
this.nummer = o.nummer;
this.toonnummer = o.toon_nummer;
this.ijkpunten = o.ijkpunten;
this.geenLicentie = ko.observable(o.licentie == "T" ? false : true);
this.naam = o.naam;
@@ -36,23 +37,20 @@ mh.initCompactSopModel = function(){
case '5': dit.naamkort2('Exp.Team'); break;
case '6': dit.naamkort2('Tevr. School'); break;
case '7': dit.naamkort2('Middelen'); break;
case '8': dit.naamkort2('Insp. indic.');
case '8': dit.naamkort2('Insp. indic.'); break;
case '9': dit.naamkort2('Exp. SO & SBO'); break;
case '10': dit.naamkort2('Diversiteit'); break;
}
this.groepen = ko.observable(o && o.groepen && o.groepen > 8 ? o.groepen : 0);
this.schooltype = o.schooltype;
this.modulenr = o.modulenr;
this.versie = o.versie;
this.schooljaar = o.schooljaar;
// this.schooljaarV = o.schooljaarV;
this.aantallln = ko.observable(o && o.aantallln ? o.aantallln : 0);
// this.aantalllnV = ko.observable(o && o.aantalllnV ? o.aantalllnV : 0);
//
this.gekozenVersie = ko.observable('');
this.selected = ko.observable(false); // selected om geplaatst te worden
this.opA4 = ko.observable(false); // op een pagina gezet
this.gekozenVergelijking = ko.observable();
// this.tlvs = ko.observableArray([]);
// this.arrangementen = ko.observableArray([]);
this.orgversies = ko.observableArray([]);
this.budgetversies = ko.observableArray([]);
this.omvangschooljaren = ko.observableArray([]);
@@ -93,8 +91,10 @@ mh.initCompactSopModel = function(){
var diversiteit = o.erIsDiversiteit === 'T' ? true : false
if (this.geenLicentie() ) return "Geen licentie voor het instrument bij dit onderdeel." ;
if (diversiteit && this.nummer == 1) return this.versie
if (! diversiteit && this.nummer == 1) { return "Vul eerst de diversiteitsmeter" + schooljaar + " in."; }
if (diversiteit && (this.nummer == 1 || this.nummer == 10)) return this.versie
if (! diversiteit && this.nummer == 1 ) { return "Vul eerst de diversiteitsmeter" + schooljaar + " in."; }
if (! diversiteit && this.nummer == 10 ) { return "Vul eerst de diversiteitsmeter PO 2203, "+ schooljaar + " in. "; }
if (this.nummer==7 ){
if (!this.budgetversies() || this.budgetversies().length === 0 ) return "Vul eerst de monitor financiën in."
@@ -176,12 +176,16 @@ mh.initCompactSopModel = function(){
this.schooljaarnr = g.schooljaarnr;
this.erZijnTLVs = g.erZijnTLVs;
this.erZijnArrangementen = g.erZijnArrangementen;
this.orgsmetlln = g.orgsmetlln;
this.orgsmettlvs = g.orgsmettlvs;
this.orgsmetarrs = g.orgsmetarrs;
}
function fAddOrgversie(z, v) {
this.orgversieid = ko.observable(v.id);
this.naam = v.naam;
this.naamkort = v.naamkort;
this.aantalorgs = v.aantalorgs;
this.scoretype = v.scoretype;
this.periodenummer = v.periodenummer;
this.versieid = v.versie_id;
@@ -232,6 +236,7 @@ mh.initCompactSopModel = function(){
this.breedte = ko.observable('col-xs-5');
this.nummer = ko.observable(bestaandBlokje ? bestaandBlokje.nummer : null);
this.toonnummer = ko.observable(bestaandBlokje ? bestaandBlokje.toonnummer : null);
this.naam = ko.observable(bestaandBlokje ? bestaandBlokje.naam : '');
@@ -258,6 +263,9 @@ mh.initCompactSopModel = function(){
onderdelen : ko.observableArray([]),
school : ko.observableArray([]),
selectedOmvangJaren : ko.observableArray([]),
orgsoort : ko.observable(''),
orgsoortnummer : ko.observable(),
label : ko.observable(''),
schoolasobject : ko.observable(),
selectedSchooljaar : ko.observable(''),
selectedSopID : ko.observable(''),
@@ -276,7 +284,7 @@ mh.initCompactSopModel = function(){
looptijdNieuwV : ko.observable('L'),
aantalNieuwV : ko.observable(0),
schooljanee : ko.observable(false),
editok : ko.observable(false),
// editok : ko.observable(false),
erIsEenSop : ko.observable(false),
druk : ko.observable(false),
toonOnderdelen : ko.observable(true),
@@ -306,26 +314,43 @@ mh.initCompactSopModel = function(){
return mh.CompactSopModel.uploadLogoNaam().replace('C:\\fakepath\\', '')
}),
initBindings :function(){
var self = mh.CompactSopModel;
if (!ko.dataFor(document.getElementById('pagcompactsop')) ) {
ko.applyBindings(mh.CompactSopModel, document.getElementById("pagcompactsop"));
}
$.post('index.php/monpas/sop/getrechten', function (result) {
self.editok(result);
$.post("index.php/monpas/compactsop/getorgsoort", function (result){
console.log(result)
if(result){
self.orgsoortnummer(result);
console.log(self.orgsoortnummer())
console.log(result, "result")
switch(result){
case '1': self.orgsoort('SWV');
self.label('SWOP');
break;
case '2': self.orgsoort('Regio');
self.label('ROP');
break;
case '3': self.orgsoort('Bestuur');
self.label('BOP');
break;
case '4': self.orgsoort('School');
self.label('SOP');
break;
}
}
self.druk(true);
self.initModel();
}, 'json');
},'json');
},
initModel: function(){
var self =mh.CompactSopModel;
$.post("index.php/monpas/compactsop/controleerschool", function (result){
self.schooljanee(result);
if (self.schooljanee() ){
self.druk(true);
self.fGetSchooljaren(function(){self.fGetCompactSop()})
}
},'json');
self.fGetSchooljaren(function(){self.fGetCompactSop()})
},
fGetSchooljaren: function(callback){
@@ -357,6 +382,8 @@ mh.initCompactSopModel = function(){
self.fGetSchooljaren()
return
}
// return;
$.post("index.php/monpas/compactsop/getCompactsop/" + self.selectedSchooljaar().id, function(result){
self.onderdelen.removeAll();
@@ -385,10 +412,10 @@ mh.initCompactSopModel = function(){
self.paginas.removeAll();
if(self.erIsEenSop()){
apprise("Het nieuwe Compact Sop overschrijft het bestaande Compact Sop bij dit schooljaar. Wilt u doorgaan?",
apprise("Het nieuwe Compact " + self.label() + " overschrijft het bestaande Compact " + self.label() + " bij dit schooljaar. Wilt u doorgaan?",
{verify: true, textYes: ' ja ', textNo: "nee"}, function (ans) {
if (ans) {
$.post("index.php/monpas/compactsop/getOnderdelenEnVersies/" + schooljaar, function(result){
$.post("index.php/monpas/compactsop/getOnderdelenEnVersies/" + schooljaar + "/" + self.orgsoortnummer() , function(result){
self.onderdelen.removeAll();
if(result){
$.each(result, function(i, o){
@@ -401,7 +428,7 @@ mh.initCompactSopModel = function(){
} // if ans
});//apprise
} else {
$.post("index.php/monpas/compactsop/getOnderdelenEnVersies/" + schooljaar, function(result){
$.post("index.php/monpas/compactsop/getOnderdelenEnVersies/" + schooljaar + "/" + self.orgsoortnummer() , function(result){
self.onderdelen.removeAll();
if(result){
$.each(result, function(i, o){
@@ -413,23 +440,22 @@ mh.initCompactSopModel = function(){
} // else
},
fGetSchoolgegevens: function(){
fGetOrganisatiegegevens: function(){
var self = mh.CompactSopModel;
$.post("index.php/monpas/compactsop/getSchoolgegevens", function (result) {
$.post("index.php/monpas/compactsop/getOrganisatiegegevens", function (result) {
if(result){
self.school.removeAll();
// hier kun je ook
//self.school(new fAddSchool(result)) doen.
// dan wordt het geen array maar een object
self.schoolasobject(new fAddSchool(result))
self.school.push(new fAddSchool(result));
$("#modSchool").modal('show');
}
}, 'json');
},
fSaveSchool: function(){
fSaveOrg: function(){
var self = mh.CompactSopModel;
if (timeout) {
@@ -494,7 +520,7 @@ mh.initCompactSopModel = function(){
this.selected(true);
if(self.selectedOnderdeel().nummer === '1' ){
if(self.selectedOnderdeel().nummer === '1' || self.selectedOnderdeel().nummer === '10' ){
self.selectedOnderdeel().gekozenVersie("");
}
else if(self.selectedOnderdeel().nummer === '3'){
@@ -698,6 +724,8 @@ mh.initCompactSopModel = function(){
} else {
self.tobemovedOnderdeel(this)
}
console.log(self.tobemovedOnderdeel(),"onderdeel" )
},
fHiernaartoe: function(){
@@ -745,6 +773,7 @@ mh.initCompactSopModel = function(){
selectedBlokje.gekozenVersie(self.tobemovedOnderdeel().gekozenVersie() ? self.tobemovedOnderdeel().gekozenVersie() : null)
selectedBlokje.gekozenVergelijking(self.tobemovedOnderdeel().gekozenVergelijking() ? self.tobemovedOnderdeel().gekozenVergelijking() : null)
selectedBlokje.nummer(self.tobemovedOnderdeel().nummer);
selectedBlokje.toonnummer(self.tobemovedOnderdeel().toonnummer)
selectedBlokje.gevuld(true);
selectedBlokje.kleur('#930f50');
selectedBlokje.naam(self.tobemovedOnderdeel().naam);
@@ -845,7 +874,7 @@ mh.initCompactSopModel = function(){
});
if(self.selectedOmvangJaren().length > 1){
self.selectedOmvangJaren.sort(function(a,b){return a-b}) ;
self.selectedOmvangJaren.sort(function(a,b){return b-a}) ;
}
var submitData = {
'schooljaarnr' : self.selectedSchooljaar().id,
@@ -870,6 +899,7 @@ mh.initCompactSopModel = function(){
});
},
filterSelected_NotPlaced: function(onderdelen){
console.log(onderdelen(), "onderdelen not placed()")
if (! onderdelen()) return false;
return onderdelen().filter(function(onderdeel){
return ( onderdeel.selected() && ! onderdeel.opA4() );
public/js/monpas/models/omvangmodel.js
-1
View File
@@ -361,7 +361,6 @@ mh.initOmvangModel = function(){
fMaakChart: function(){
var self = mh.OmvangModel;
var schooljaren = [];
var arrangementen = [];
var aantal = [];
var datasbo = [];
var dataso = [];
public/js/monpas/models/sopoverzichtmodel.js
+71 -63
View File
@@ -8,20 +8,26 @@ mh.initSopOverzichtModel = function(){
this.soort = p.soort;
this.brin = p.brin;
this.naam = p.naamkort;
this.soort = 'SWOP'
this.plaats = p.plaats;
this.geopend = ko.observable(false);
dit.kamers = ko.observableArray([]);
dit.scholen = ko.observableArray([]);
this.erIsEenSop = ko.observable(false);
if(p.sop === 'T') dit.erIsEenSop(true);
this.kamers = ko.observableArray([]);
// dit.scholen = ko.observableArray([]);
if (p.kamers){
$.each(p.kamers, function(j,k){
dit.kamers.push(new fAddKamer(k));
})
}
if (p.scholen ){
$.each(p.scholen, function(i,s){
dit.scholen.push(new fAddSchool(s));
})
}
this.bgs = ko.observableArray([])
this.scholen = ko.observableArray([]);
// if (p.scholen ){
// $.each(p.scholen, function(i,s){
// dit.scholen.push(new fAddSchool(s));
// })
// }
}
function fAddKamer(p){
@@ -30,32 +36,43 @@ mh.initSopOverzichtModel = function(){
this.soort = p.soort;
this.brin = p.brin;
this.naam = p.naamkort;
this.soort = 'ROP'
this.plaats = p.plaats;
this.geopend = ko.observable(false);
this.erIsEenSop = ko.observable(false);
if(p.sop === 'T') dit.erIsEenSop(true)
this.kamers = ko.observableArray()
this.bgs = ko.observableArray([]);
this.scholen = ko.observableArray([]);
// this.scholen = ko.observableArray([]);
if (p.bgs){
$.each(p.bgs, function(x,z){
dit.bgs.push(new fAddBG(z));
})
}
if (p.scholen){
$.each(p.scholen, function(i,s){
dit.scholen.push(new fAddSchool(s));
})
}
// if (p.scholen){
// $.each(p.scholen, function(i,s){
// dit.scholen.push(new fAddSchool(s));
// })
// }
}
function fAddBG(p){
var dit = this;
this.id = p.id;
this.soort = p.soort;
this.soort = 'BOP';
this.brin = p.brin;
this.naam = p.naamkort;
this.plaats = p.plaats;
this.geopend = ko.observable(false);
this.kamers = ko.observableArray();
this.bgs = ko.observableArray();
this.scholen = ko.observableArray([]);
this.erIsEenSop = ko.observable(false);
if(p.sop === 'T') dit.erIsEenSop(true)
if (p.scholen){
$.each(p.scholen, function(a,b){
dit.scholen.push(new fAddSchool(b));
@@ -66,7 +83,7 @@ mh.initSopOverzichtModel = function(){
function fAddSchool(b){
var dit = this;
this.id = b.id;
this.soort = b.soort;
this.soort = 'SOP';
this.brin = b.brin;
this.naam = b.naamkort;
this.plaats = b.plaats;
@@ -87,12 +104,10 @@ mh.initSopOverzichtModel = function(){
toporg : ko.observable(''),
selectedOrg : ko.observable(''),
orgsoort : ko.observable(1),
keuzesoort : ko.observable(1),
geopend : ko.observable(false),
schooljaren : ko.observableArray([]),
selectedSchooljaar : ko.observable(''),
gegevens : ko.observable(true),
alfabetisch : ko.observable(false),
@@ -127,16 +142,16 @@ mh.initSopOverzichtModel = function(){
fGetMenu: function(){
var self = mh.SopOverzichtModel;
self.alfabetisch(false);
var submitData = {
'schooljaarnr' : self.selectedSchooljaar().id,
'orgid' : 0
};
$.post("index.php/monpas/overzichtsop/getoverzicht", submitData , function(data){
console.log(data, "data")
self.toporg('');
if (data.organisatie){
self.orgsoort(data.soort);
self.keuzesoort(data.soort);
self.orgsoort(data.soort);
switch (self.orgsoort()){
case 1: self.toporg(new fAddSWV(data.organisatie));
break;
@@ -151,19 +166,12 @@ mh.initSopOverzichtModel = function(){
},'json');
},
fChangeSchooljaar: function(){
fChangeSchooljaar: function() {
var self = mh.SopOverzichtModel;
if(!self.selectedSchooljaar()) return;
if(!self.alfabetisch())self.fGetOverzicht();
if(self.alfabetisch())self.fGetAlfabetisch();
if (!self.selectedSchooljaar()) return;
self.fGetOverzicht();
},
fToggleOrdening: function(){
var self = mh.SopOverzichtModel;
self.alfabetisch(!self.alfabetisch());
if(!self.alfabetisch())self.fGetOverzicht();
if(self.alfabetisch())self.fGetAlfabetisch();
},
fGetOverzicht: function(){
var self =mh.SopOverzichtModel;
@@ -174,8 +182,8 @@ mh.initSopOverzichtModel = function(){
};
$.post("index.php/monpas/overzichtsop/getoverzicht", submitData , function(data){
if (data.organisatie){
self.keuzesoort(data.soort);
switch (self.keuzesoort()){
self.orgsoort(data.soort);
switch (self.orgsoort()){
case 1: self.selectedOrg(new fAddSWV(data.organisatie));
break;
case 2: self.selectedOrg(new fAddKamer(data.organisatie));
@@ -189,40 +197,40 @@ mh.initSopOverzichtModel = function(){
},'json');
},
fGetAlfabetisch: function(){
var self =mh.SopOverzichtModel;
if(self.selectedOrg().soort === '3' || self.selectedOrg().soort === '4'){
self.fGetOverzicht();
return;
}
var submitData = {
'schooljaarnr' : self.selectedSchooljaar().id,
'orgid' : self.selectedOrg().id
};
$.post("index.php/monpas/overzichtsop/getAlfabetisch", submitData , function(data){
if (data.organisatie){
self.keuzesoort(data.soort);
if(self.keuzesoort() === '1') self.selectedOrg(new fAddSWV(data.organisatie));
if(self.keuzesoort() === '2') self.selectedOrg(new fAddKamer(data.organisatie));
}
},'json');
},
// fGetAlfabetisch: function(){
// var self =mh.SopOverzichtModel;
// if(self.selectedOrg().soort === '3' || self.selectedOrg().soort === '4'){
// self.fGetOverzicht();
// return;
// }
// var submitData = {
// 'schooljaarnr' : self.selectedSchooljaar().id,
// 'orgid' : self.selectedOrg().id
// };
// $.post("index.php/monpas/overzichtsop/getAlfabetisch", submitData , function(data){
// if (data.organisatie){
// self.orgsoort(data.soort);
// if(self.orgsoort() === '1') self.selectedOrg(new fAddSWV(data.organisatie));
// if(self.orgsoort() === '2') self.selectedOrg(new fAddKamer(data.organisatie));
// }
// },'json');
// },
fToggleGeopend: function(){
var self =mh.SopOverzichtModel;
this.geopend(!this.geopend());
},
// fToggleGeopend: function(){
// var self =mh.SopOverzichtModel;
// this.geopend(!this.geopend());
// },
fSwitchOrg: function(){
var self =mh.SopOverzichtModel;
if (self.selectedOrg() === undefined) return;
if (this.id === self.selectedOrg().id) return;
self.keuzesoort('');
self.selectedOrg(this);
if (!self.alfabetisch()) self.fGetOverzicht();
if (self.alfabetisch()) self.fGetAlfabetisch();
},
// fSwitchOrg: function(){
// var self =mh.SopOverzichtModel;
// if (self.selectedOrg() === undefined) return;
// if (this.id === self.selectedOrg().id) return;
// self.orgsoort('');
// self.selectedOrg(this);
// if (!self.alfabetisch()) self.fGetOverzicht();
// if (self.alfabetisch()) self.fGetAlfabetisch();
//
// },
fOpenPDF: function(){
var self =mh.SopOverzichtModel;
public/tmp/temp112.html
-2838
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp120.html
-2223
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp170.html
-2068
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp171.html
-2401
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp188.html
-2164
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp197.html
-2208
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp208.html
-2164
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp210.html
-2140
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp211.html
-2164
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp212.html
-2068
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp213.html
-2044
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp215.html
-2448
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp216.html
-2164
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp217.html
-2184
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp218.html
-2256
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp219.html
-1996
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp220.html
-2068
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp221.html
-2068
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp222.html
-2092
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp224.html
-2256
View File
File diff suppressed because it is too large Load Diff
public/tmp/temp225.html
-2068
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More