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

sopBobRopSwop en divmeter voor po2203 in compact sop

Browse Source
This commit is contained in:
Monique
2021-09-07 10:28:28 +02:00
parent 29b45411b4
commit 4c9eb6a4fd
49 changed files with 397 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Compactsop.php
+2 -2
View File
@@ -79,8 +79,8 @@ class Compactsop extends MY_Controller{
if (!$this->userid) die;
$schooljaar = $this->uri->segment(4);
$orgsoort = $this->uri->segment(5);
$compacteVersies = new CompacteVersies($schooljaar, $orgsoort);
$onderdelen = $compacteVersies->getOnderdelen();
$compacteversies = new Compacteversies($schooljaar, $orgsoort);
$onderdelen = $compacteversies->getOnderdelen();
echo json_encode($onderdelen);
}
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/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
+6 -2
View File
@@ -188,6 +188,10 @@ class Compacteonderdelen
case 8:
case 9:
$this->setIJkpunten();
break;
case 10:
$this->setDiversiteit();
break;
}
}
@@ -195,8 +199,8 @@ 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();
$divafbeelding = New Diversiteitafbeeldingen($divdata, $this->onderdeel['modulenr'], $this->schooljaarnr);
$this->diversiteit = $divafbeelding->getDiversiteitafbeeldingen();
$data = [
'schooljaar' => $this->schooljaar->naam,
application/libraries/monpas/compactsop/Compacteversies.php
+36 -3
View File
@@ -9,6 +9,7 @@ class Compacteversies
private $kalenderjaar2;
private $jaarnr1;
private $jaarnr2;
private $swvID;
private $orglist;
private $aantallln;
private $onderdelen;
@@ -38,6 +39,7 @@ class Compacteversies
$this->setSchooljaar();
$this->setKalenderjaren();
$this->setOrglist();
$this->setSWVID();
$this->setCompactSopOnderdelen();
$this->loopCompactSop();
}
@@ -63,8 +65,35 @@ class Compacteversies
}
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->onderdelen = $this->CI->Compactsoponderdelen_model->getOnderdelen($this->orgsoortnr, $this->swvID,
$this->schooljaar->schooljaarnr);
}
private function loopCompactSop(){
@@ -113,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);
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/Compactsoponderdelen_model.php
+12 -4
View File
@@ -12,13 +12,21 @@ class compactsoponderdelen_model extends MY_Model{
$this->load->model($models);
}
function getOnderdelen($orgsoort){
$this->sql = "SELECT C.naam, C.naamkort, C.ijkpunten, C.vergelijking, S.pad, S.blokid, C.nummer, S.toon_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}
WHERE S.org_soort = {$orgsoort} ";
ORDER BY S.toon_nummer ";
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){
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/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/monpas/compactsop/maaksoponderdelen/blokvorm.php
+2
View File
@@ -3,6 +3,7 @@
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() }">
@@ -12,6 +13,7 @@
</div>
<!-- class ="versievak"-->
<div class="panel-body"
style="height: 75px;"
data-bind =" text: infotekst,
visible: infotekst() && ! selected()> '',
style: {color: (geenGegevens() || geenLicentie()) ? '#949494' : '#333333'} ">
application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php
+4 -2
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>
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/pages/sopoverzicht.php
+41 -324
View File
@@ -1,339 +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 -->
<!-- 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 -->
<!-- ko if: orgsoort() ==2 -->
<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>
</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-5" >
<div class="col-xs-6 " >
<h3>Compacte Ontwikkelingsplannen</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>
<p>Selecteer een schooljaar:</p>
<select data-bind=" options: schooljaren,
optionsText: 'naam',
value: $root.selectedSchooljaar,
event: {change: fChangeSchooljaar}">
</select>
<!-- <div class="col-sm-5" >-->
<!-- <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>-->
<!-- <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>-->
<!-- 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 -->
<div class="row" data-bind="visible: orgsoort()== 4 ">
<?php $this->load->view("monpas/compactsop/overzicht/_school"); ?>
</div>
<!-- ko if: keuzesoort() == 3 -->
<!-- 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>
<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: alfabetisch() == false-->
<table data-bind="with: $root.selectedOrg()">
<thead>
<tr>
<!-- ko if: keuzesoort()== 1 -->
<th>SWOP</th>
<!-- /ko -->
<!-- ko if: keuzesoort() < 3 -->
<th>ROP</th>
<!-- /ko -->
<!-- ko if: keuzesoort() < 4 -->
<th>BOB</th>
<!-- /ko -->
<th>SOP</th>
<th>Organisatienaam</th>
</tr>
<tr>
<!-- ko if: keuzesoort()== 1 -->
<th 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>
</th>
<!-- /ko -->
<!-- ko if: keuzesoort() < 3 -->
<th></th>
<!-- /ko -->
<!-- ko if: keuzesoort() < 4 -->
<th></th>
<!-- /ko -->
<th></th>
<th></th>
</tr>
</thead>
<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>
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/js/monpas/models/compactsopmodel.js
+7 -3
View File
@@ -39,6 +39,7 @@ mh.initCompactSopModel = function(){
case '7': dit.naamkort2('Middelen'); break;
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;
@@ -90,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."
@@ -311,6 +314,7 @@ mh.initCompactSopModel = function(){
return mh.CompactSopModel.uploadLogoNaam().replace('C:\\fakepath\\', '')
}),
initBindings :function(){
var self = mh.CompactSopModel;
if (!ko.dataFor(document.getElementById('pagcompactsop')) ) {
@@ -516,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'){
public/js/monpas/models/sopoverzichtmodel.js
+65 -66
View File
@@ -8,23 +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);
this.erIsEenSop = ko.observable(false);
if(b.sop === 'T') dit.erIsEenSop(true)
if(p.sop === 'T') dit.erIsEenSop(true);
dit.kamers = ko.observableArray([]);
dit.scholen = ko.observableArray([]);
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){
@@ -33,36 +36,41 @@ 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(b.sop === 'T') dit.erIsEenSop(true)
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(b.sop === 'T') dit.erIsEenSop(true)
if(p.sop === 'T') dit.erIsEenSop(true)
if (p.scholen){
@@ -75,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;
@@ -96,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),
@@ -136,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;
@@ -160,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;
@@ -183,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));
@@ -198,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;