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

zichtbaarheid paginas

Browse Source
This commit is contained in:
Monique
2022-01-03 12:15:03 +01:00
parent b9407fb118
commit 47bd7ac76d
10 changed files with 71 additions and 82 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){
// hier wordt het menu opgehaald om de pagina's van de module te laden
$menu = $this->Menus_model->getmenu($module,$this->userrole);
$org = $this->Organisaties_model->get_record_by_id($this->globorgid);
$menu = $this->Menus_model->getmenu($module,$this->userrole, $org->soort);
};
if ($menu){
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();
application/controllers/monpas/Overzichtsop.php
+16 -4
View File
@@ -39,12 +39,12 @@ class Overzichtsop extends MY_Controller{
$orgid = $this->clean_input("orgid");
if ($orgid == 0) $orgid = $this->globorgid;
$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) {
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,));
break;
case 3:
@@ -65,6 +65,10 @@ class Overzichtsop extends MY_Controller{
$organisatie->bgs = $this->Organisaties_model->getorgsvanaf($kamerid);
if ($organisatie->bgs) {
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);
foreach ($bg->scholen as $index => $school) {
$school->sop = 'F';
@@ -84,9 +88,17 @@ class Overzichtsop extends MY_Controller{
$organisatie->kamers = objectToArray($organisatie->kamers);
}
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);
if ($kamer->bgs) {
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);
foreach ($bg->scholen as $index => $school) {
$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(){
$user = new stdClass;
$organisatie = new stdClass;
$module = $this->session->userdata['module'];
@@ -29,60 +27,12 @@ class Menu extends MY_Controller{
if (0 == $module) {$modulenaam = "Instrumenten";}
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);
if ($org){
$menu = $this->Menus_model->getmenu($module,$this->userrole, $org->soort);
$aangepastmenu = [];
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 ($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
$menuitem->subpaginas = $this->Menus_model->getsubmenus($menuitem->id, $this->userrole, $org->soort);
$aangepastmenu [] = $menuitem;
}; // foreach
@@ -140,7 +90,8 @@ class Menu extends MY_Controller{
function getsubmenu(){
//TODO clean input
$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);
}
function getmodule(){