From e54a10b81679bae9d19337617d6c58310d2f7a58 Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 24 Nov 2017 12:09:28 +0100 Subject: add shift calendar to angeltype view fix tab jumps --- includes/view/AngelTypes_view.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'includes/view/AngelTypes_view.php') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index e42321af..122241a0 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -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) ]); } -- cgit v1.2.3-54-g00ecf