iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add shift calendar to angeltype view fix tab jumps

This commit is contained in:
msquare 2017-11-24 12:09:28 +01:00
parent 928e707015
commit e54a10b816
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/controller/angeltypes_controller.php
View File

@ -192,6 +192,11 @@ function angeltype_controller()
$shiftsFilterRenderer->enableDaySelection($days);
$shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter);
$request = request();
$tab = 0;
if($request->has('shifts_filter_day')) {
$tab = 1;
}
return [
sprintf(_('Team %s'), $angeltype['name']),
@ -205,7 +210,8 @@ function angeltype_controller()
$user_driver_license,
$user,
$shiftsFilterRenderer,
$shiftCalendarRenderer
$shiftCalendarRenderer,
$tab
)
];
}

5
includes/sys_template.php
View File

@ -4,15 +4,16 @@
* Renders tabs from the array. Array key is tab name, array value is tab content.
*
* @param array $tabs
* @param int $selected The selected tab, default 0
* @return string HTML
*/
function tabs($tabs)
function tabs($tabs, $selected = 0)
{
$tab_header = [];
$tab_content = [];
foreach($tabs as $header => $content) {
$class = '';
if(count($tab_header) == 0) {
if(count($tab_header) == $selected) {
$class = 'active';
}
$tab_header[] = '<li role="presentation" class="' . $class . '">

24
includes/view/AngelTypes_view.php
View File

@ -304,14 +304,17 @@ function AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes)
/**
* Render an angeltype page containing the member lists.
*
* @param array $angeltype
* @param array[] $members
* @param array $user_angeltype
* @param bool $admin_user_angeltypes
* @param bool $admin_angeltypes
* @param bool $supporter
* @param array $user_driver_license
* @param array $user
* @param array $angeltype
* @param array[] $members
* @param array $user_angeltype
* @param bool $admin_user_angeltypes
* @param bool $admin_angeltypes
* @param bool $supporter
* @param array $user_driver_license
* @param array $user
* @param ShiftsFilterRenderer $shiftsFilterRenderer
* @param ShiftCalendarRenderer $shiftCalendarRenderer
* @param int $tab The selected tab
* @return string
*/
function AngelType_view(
@ -324,7 +327,8 @@ function AngelType_view(
$user_driver_license,
$user,
ShiftsFilterRenderer $shiftsFilterRenderer,
ShiftCalendarRenderer $shiftCalendarRenderer
ShiftCalendarRenderer $shiftCalendarRenderer,
$tab
) {
return page_with_title(sprintf(_('Team %s'), $angeltype['name']), [
AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user),
@ -342,7 +346,7 @@ function AngelType_view(
$shiftsFilterRenderer,
$shiftCalendarRenderer
)
])
], $tab)
]);
}