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

Merge branch 'feature/sophome' into develop

Browse Source
This commit is contained in:
Monique
2022-01-03 12:15:30 +01:00
parent e445e56365 47bd7ac76d
commit 9aa92ea64a
11 changed files with 71 additions and 1927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Toner.php
+3 -3
View File
@@ -47,14 +47,14 @@ class Toner extends MY_Controller{
} }
if ($module >= 0){ if ($module >= 0){
// hier wordt het menu opgehaald om de pagina's van de module te laden // hier wordt het menu opgehaald om de pagina's van de module te laden
$org = $this->Organisaties_model->get_record_by_id($this->globorgid);
$menu = $this->Menus_model->getmenu($module,$this->userrole); $menu = $this->Menus_model->getmenu($module,$this->userrole, $org->soort);
}; };
if ($menu){ if ($menu){
foreach($menu as $menuitem){ foreach($menu as $menuitem){
$menuitem->submenus=$this->Menus_model->getsubmenus($menuitem->id, $this->userrole); $menuitem->submenus=$this->Menus_model->getsubmenus($menuitem->id, $this->userrole, $org->soort);
} }
} }
$lbl = array(); $lbl = array();
application/controllers/monpas/Overzichtsop.php
+16 -4
View File
@@ -39,12 +39,12 @@ class Overzichtsop extends MY_Controller{
$orgid = $this->clean_input("orgid"); $orgid = $this->clean_input("orgid");
if ($orgid == 0) $orgid = $this->globorgid; if ($orgid == 0) $orgid = $this->globorgid;
$organisatie = $this->Organisaties_model->getorg($orgid); $organisatie = $this->Organisaties_model->getorg($orgid);
$organisatie->sop = 'F';
$compactsopID = $this->Compactsop_model->get_fieldvalue(['organisatie_id' => $orgid,
'schooljaarnummer' => $schooljaarnr], 'id');
if ($compactsopID) $organisatie->sop = 'T';
switch ($organisatie->soort) { switch ($organisatie->soort) {
case 4: case 4:
$organisatie->sop = 'F';
$compactsopID = $this->Compactsop_model->get_fieldvalue(['organisatie_id' => $orgid,
'schooljaarnummer' => $schooljaarnr], 'id');
if ($compactsopID) $organisatie->sop = 'T';
echo json_encode(array("organisatie" => $organisatie, "soort" => 4,)); echo json_encode(array("organisatie" => $organisatie, "soort" => 4,));
break; break;
case 3: case 3:
@@ -65,6 +65,10 @@ class Overzichtsop extends MY_Controller{
$organisatie->bgs = $this->Organisaties_model->getorgsvanaf($kamerid); $organisatie->bgs = $this->Organisaties_model->getorgsvanaf($kamerid);
if ($organisatie->bgs) { if ($organisatie->bgs) {
foreach ($organisatie->bgs as $bg) { foreach ($organisatie->bgs as $bg) {
$bg->sop = 'F';
$compactsopID = $this->Compactsop_model->get_fieldvalue(
['organisatie_id' => $bg->id, 'schooljaarnummer' => $schooljaarnr], 'id');
if ($compactsopID) $bg->sop = 'T';
$bg->scholen = $this->Organisaties_model->getorgsvanaf($bg->id); $bg->scholen = $this->Organisaties_model->getorgsvanaf($bg->id);
foreach ($bg->scholen as $index => $school) { foreach ($bg->scholen as $index => $school) {
$school->sop = 'F'; $school->sop = 'F';
@@ -84,9 +88,17 @@ class Overzichtsop extends MY_Controller{
$organisatie->kamers = objectToArray($organisatie->kamers); $organisatie->kamers = objectToArray($organisatie->kamers);
} }
foreach ($organisatie->kamers as $kamer) { foreach ($organisatie->kamers as $kamer) {
$kamer->sop = 'F';
$compactsopID = $this->Compactsop_model->get_fieldvalue(
['organisatie_id' => $kamer->id, 'schooljaarnummer' => $schooljaarnr], 'id');
if ($compactsopID) $kamer->sop = 'T';
$kamer->bgs = $this->Organisaties_model->getorgsvanaf($kamer->id); $kamer->bgs = $this->Organisaties_model->getorgsvanaf($kamer->id);
if ($kamer->bgs) { if ($kamer->bgs) {
foreach ($kamer->bgs as $bg) { foreach ($kamer->bgs as $bg) {
$bg->sop = 'F';
$compactsopID = $this->Compactsop_model->get_fieldvalue(
['organisatie_id' => $bg->id, 'schooljaarnummer' => $schooljaarnr], 'id');
if ($compactsopID) $bg->sop = 'T';
$bg->scholen = $this->Organisaties_model->getorgsvanaf($bg->id); $bg->scholen = $this->Organisaties_model->getorgsvanaf($bg->id);
foreach ($bg->scholen as $index => $school) { foreach ($bg->scholen as $index => $school) {
$school->sop = 'F'; $school->sop = 'F';
application/controllers/shared/Menu.php
+5 -54
View File
@@ -19,8 +19,6 @@ class Menu extends MY_Controller{
} }
public function get_menu(){ public function get_menu(){
$user = new stdClass; $user = new stdClass;
$organisatie = new stdClass; $organisatie = new stdClass;
$module = $this->session->userdata['module']; $module = $this->session->userdata['module'];
@@ -29,60 +27,12 @@ class Menu extends MY_Controller{
if (0 == $module) {$modulenaam = "Instrumenten";} if (0 == $module) {$modulenaam = "Instrumenten";}
else {$modulenaam= $this->Modules_model->get_fieldvalue(array("sysnr" => $module), 'naamkort'); } else {$modulenaam= $this->Modules_model->get_fieldvalue(array("sysnr" => $module), 'naamkort'); }
$menu = $this->Menus_model->getmenu($module,$this->userrole);
$aangepastmenu = [];
$org = $this->Organisaties_model->get_record_by_id($this->globorgid); $org = $this->Organisaties_model->get_record_by_id($this->globorgid);
if ($org){ if ($org){
$menu = $this->Menus_model->getmenu($module,$this->userrole, $org->soort);
$aangepastmenu = [];
foreach ($menu as $menuitem){ foreach ($menu as $menuitem){
if ($menuitem->holdernaam == "sophoofd"){ $menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole, $org->soort);
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 ($subpagina->paginanaam == 'sophome') {
switch ($org->soort) {
case 1:
$subpagina->naam = "SWOP Home";
break;
case 2:
$subpagina->naam = "ROP Home";
break;
case 3:
$subpagina->naam = "BOP Home";
break;
default:
$subpagina->naam = "SOP Home";
}
}
}
}; //if
$aangepastmenu [] = $menuitem; $aangepastmenu [] = $menuitem;
}; // foreach }; // foreach
@@ -140,7 +90,8 @@ class Menu extends MY_Controller{
function getsubmenu(){ function getsubmenu(){
//TODO clean input //TODO clean input
$pageid = $this->uri->segment(4); $pageid = $this->uri->segment(4);
$submenus = $this->Menus_model->getsubmenus($pageid, $this->userrole); $org = $this->Organisaties_model->get_record_by_id($this->globorgid);
$submenus = $this->Menus_model->getsubmenus($pageid, $this->userrole, $org->soort);
echo json_encode($submenus); echo json_encode($submenus);
} }
function getmodule(){ function getmodule(){
application/models/monpas/Menus_model.php
+31 -7
View File
@@ -13,22 +13,46 @@ class Menus_model extends MY_Model{
$this->load->model($models); $this->load->model($models);
} }
function getmenu($module, $autorisatienivo){ function getmenu($module, $autorisatienivo, $orgsoort){
$this->sql="SELECT id, naam, paginanaam,holdernaam $this->sql="SELECT id, naam, paginanaam,holdernaam
FROM tb_menus FROM tb_menus
WHERE ( {$autorisatienivo} & autorisatienivo) WHERE ( {$autorisatienivo} & autorisatienivo)
AND ((module = {$module}) OR ({$module} !=0 && module = 9)) AND ((module = {$module}) OR ({$module} !=0 && module = 9))
AND valtonder = 0 AND valtonder = 0 ";
ORDER BY volgorde";
switch($orgsoort){
case 1: $this->sql.=" AND(orgniveau = 'ALL' OR orgniveau = 'SWV' OR orgniveau = 'BGRESWV') ";
break;
case 2: $this->sql.= "AND(orgniveau = 'ALL' OR orgniveau = 'REGIO' OR orgniveau = 'BGRESWV') ";
break;
case 3: $this->sql.= "AND(orgniveau = 'ALL' OR orgniveau = 'BG' OR orgniveau = 'BGRESWV') ";
break;
case 4: $this->sql.= "AND(orgniveau = 'ALL' OR orgniveau = 'SCHOOL') ";
break;
}
$this->sql.="ORDER BY volgorde ";
return $this->get_query_result(); return $this->get_query_result();
} }
function getsubmenus($pageid,$autorisatienivo){ function getsubmenus($pageid,$autorisatienivo, $orgsoort){
$this->sql="SELECT id, naam, paginanaam, holdernaam, volgorde $this->sql="SELECT id, naam, paginanaam, holdernaam, volgorde
FROM tb_menus FROM tb_menus
WHERE ( {$autorisatienivo} & autorisatienivo) WHERE ( {$autorisatienivo} & autorisatienivo)
AND valtonder= $pageid AND valtonder = $pageid " ;
ORDER BY volgorde" ;
return $this->get_query_result(); switch($orgsoort){
case 1: $this->sql.=" AND(orgniveau = 'ALL' OR orgniveau = 'SWV' OR orgniveau = 'BGRESWV') ";
break;
case 2: $this->sql.= "AND(orgniveau = 'ALL' OR orgniveau = 'REGIO' OR orgniveau = 'BGRESWV') ";
break;
case 3: $this->sql.= "AND(orgniveau = 'ALL' OR orgniveau = 'BG' OR orgniveau = 'BGRESWV') ";
break;
case 4: $this->sql.= "AND(orgniveau = 'ALL' OR orgniveau = 'SCHOOL') ";
break;
}
$this->sql.=" ORDER BY volgorde ";
return $this->get_query_result();
} }
function gettypes($modulenr){ function gettypes($modulenr){
application/views/monpas/compactsop/overzicht/_bestuur.php
+3 -2
View File
@@ -12,7 +12,7 @@
<td style="background-color: #f5f0f2;"> <td style="background-color: #f5f0f2;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#8cff1a; height: 30px; width: 30px;"> style="background-color:#8cff1a; height: 30px; width: 30px; padding-left: 8px; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px; background-color: #f5f0f2;">BOP</td> <td style="padding: 5px; background-color: #f5f0f2;">BOP</td>
@@ -25,7 +25,8 @@
<td > <td >
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; border-radius: 50%; box-shadow: none; border: none"> style="background-color:#1aa3ff; height: 30px; width: 30px; padding-left: 8px; border-radius: 50%;
box-shadow: none; border: none; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px">SOP</td> <td style="padding: 5px">SOP</td>
application/views/monpas/compactsop/overzicht/_regio.php
+2 -2
View File
@@ -30,7 +30,7 @@
<td style="background-color: #f5f0f2;"> <td style="background-color: #f5f0f2;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style=" height: 30px; width: 30px; background-color: #8cff1a;"> style=" height: 30px; width: 30px; padding-left: 8px; background-color: #8cff1a; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px; background-color: #f5f0f2;">ROP</td> <td style="padding: 5px; background-color: #f5f0f2;">ROP</td>
@@ -44,7 +44,7 @@
<td > <td >
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; float: left"> style="background-color:#1aa3ff; height: 30px; padding-left: 8px; width: 30px; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px">SOP</td> <td style="padding: 5px">SOP</td>
application/views/monpas/compactsop/overzicht/_school.php
+1 -1
View File
@@ -6,7 +6,7 @@
<td > <td >
<button data-bind="visible: erIsEenSop()== true, click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop()== true, click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; "> style="background-color:#1aa3ff; height: 30px; padding-left: 8px; width: 30px; ">
</button> </button>
</td> </td>
application/views/monpas/compactsop/overzicht/_swv.php
+5 -5
View File
@@ -11,8 +11,8 @@
<th style="background-color: #a07b8e;"> <th style="background-color: #a07b8e;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class=" buttonCompact glyphicon glyphicon-open" class=" buttonCompact glyphicon glyphicon-open"
style="background-color:white; height: 30px; width: 30px; float: left; border-radius: 50%; style="background-color:#A28A29; height: 30px; width: 30px; float: left; padding-left: 8px; border-radius: 50%;
color: white; border: none; box-shadow: none; "> color:white; border: none; box-shadow: none; ">
</button> </button>
</th> </th>
<th style="padding: 5px; color: white; background-color: #a07b8e; ">SWOP</th> <th style="padding: 5px; color: white; background-color: #a07b8e; ">SWOP</th>
@@ -28,7 +28,7 @@
<td style="background-color: #ded0d7"> <td style="background-color: #ded0d7">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#ff8c1a; height: 30px; width: 30px; float: left"> style="background-color:#ff8c1a; height: 30px; width: 30px; padding-left: 8px; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px; background-color: #ded0d7">ROP</td> <td style="padding: 5px; background-color: #ded0d7">ROP</td>
@@ -42,7 +42,7 @@
<td style="background-color: #f5f0f2;"> <td style="background-color: #f5f0f2;">
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#8cff1a; height: 30px; width: 30px; float: left"> style="background-color:#8cff1a; height: 30px; width: 30px; padding-left: 8px; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px; background-color: #f5f0f2;">BOP</td> <td style="padding: 5px; background-color: #f5f0f2;">BOP</td>
@@ -56,7 +56,7 @@
<td > <td >
<button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF" <button data-bind="visible: erIsEenSop(), click: $root.fOpenPDF"
class="buttonCompact glyphicon glyphicon-open" class="buttonCompact glyphicon glyphicon-open"
style="background-color:#1aa3ff; height: 30px; width: 30px; float: left"> style="background-color:#1aa3ff; height: 30px; width: 30px; padding-left: 8px; float: left">
</button> </button>
</td> </td>
<td style="padding: 5px">SOP</td> <td style="padding: 5px">SOP</td>
application/views/monpas/pages/sopoverzicht.php
+3 -3
View File
@@ -4,10 +4,10 @@
<div class="col-xs-9 " > <div class="col-xs-9 " >
<h4 data-bind="text: titel ? titel : '' "> <h4 data-bind="text: titel() ? subtitel() ? titel() + ' ' + subtitel() : titel(): '' ">
</h4>
<h4 data-bind=" text: subtitel ? subtitel : '' ">
</h4> </h4>
<!-- <h4 data-bind=" text: subtitel ? subtitel : '' ">-->
<!-- </h4>-->
<p>Selecteer een schooljaar:</p> <p>Selecteer een schooljaar:</p>
public/js/monpas/models/sopoverzichtmodel.js
+1
View File
@@ -171,6 +171,7 @@ mh.initSopOverzichtModel = function(){
$.post("index.php/monpas/overzichtsop/getoverzicht", submitData , function(data){ $.post("index.php/monpas/overzichtsop/getoverzicht", submitData , function(data){
self.toporg(''); self.toporg('');
if (data.organisatie){ if (data.organisatie){
self.orgsoort(data.soort); self.orgsoort(data.soort);
self.orgsoort(data.soort); self.orgsoort(data.soort);
switch (self.orgsoort()){ switch (self.orgsoort()){
public/tmp/temp150.html
-1845
View File
File diff suppressed because it is too large Load Diff