diuversen opmerkingen 19062018

This commit is contained in:
2018-07-14 16:56:42 +02:00
parent 124be78a85
commit cecbfd83fb
20 changed files with 266 additions and 67 deletions
+9
View File
@@ -44,5 +44,14 @@ class Page extends Eloquent {
return $appPages;
}
public static function getPageAccessByRoleLevel( $roleLevel )
{
self::selectRaw( "
IF(id = page_id, 'MAIN', 'SUB') AS typepage,
IF((SELECT {$roleLevel} & pagelevel ) = 0, 'F', 'T') AS pageaccess" )
->orderByRaw( "id, IF(id = page_id, 0, 1)" )
->get();
}
}
+1 -1
View File
@@ -92,7 +92,7 @@ class Project extends BaseModel {
public static function getActiveProjects()
{
$projects = Project::selectRaw( "projects.id, YEAR(projects.startdate) AS instroom, YEAR(projects.enddate) AS uitstroom, projectnumber,
$projects = Project::selectRaw( "projects.id, YEAR(projects.startdate) AS instroom, YEAR(projects.enddate) AS uitstroom, projectnumber, current_financial_year,
projectname, CUS.name, OFF.own_revenue, OFF.other_revenue" )
->join( 'customers AS CUS', 'CUS.id', '=', 'projects.customer_id' )
->join( 'offers AS OFF', 'OFF.project_id', '=', 'projects.id' )
+14
View File
@@ -42,5 +42,19 @@ class Role extends BaseModel {
return $roleHierarchy;
}
public static function getPagesAccessByRole()
{
$roles = self::all();
foreach ( $roles as $role )
{
$pageroles[ $role->id ]['rolelevel'] = $role->rolelevel;
$pageroles[ $role->id ]['rolename'] = $role->rolename;
$pageroles[ $role->id ]['pagesAccess'] =
Page::getPageAccessByRoleLevel( $role->rolelevel );
}
}
}