X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/fa6508ac21c30d6bfef008387fabd29a843d7b66..f8292d356ef3ac53b2bb1183dd462f7c453c20e5:/mobile/expenses.php diff --git a/mobile/expenses.php b/mobile/expenses.php index de1e6778..84d29738 100644 --- a/mobile/expenses.php +++ b/mobile/expenses.php @@ -29,7 +29,7 @@ require_once('../initialize.php'); import('form.Form'); import('ttUserHelper'); -import('ttTeamHelper'); +import('ttGroupHelper'); import('DateAndTime'); import('ttExpenseHelper'); @@ -96,7 +96,7 @@ if ($user->can('track_expenses')) { // Dropdown for clients in MODE_TIME. Use all active clients. if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) { - $active_clients = ttTeamHelper::getActiveClients($user->group_id, true); + $active_clients = ttGroupHelper::getActiveClients(true); $form->addInput(array('type'=>'combobox', 'onchange'=>'fillProjectDropdown(this.value);', 'name'=>'client', @@ -122,7 +122,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t // Dropdown for clients if the clients plugin is enabled. if ($user->isPluginEnabled('cl')) { - $active_clients = ttTeamHelper::getActiveClients($user->group_id, true); + $active_clients = ttGroupHelper::getActiveClients(true); // We need an array of assigned project ids to do some trimming. foreach($project_list as $project) $projects_assigned_to_user[] = $project['id']; @@ -148,7 +148,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t } } // If predefined expenses are configured, add controls to select an expense and quantity. -$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id); +$predefined_expenses = ttGroupHelper::getPredefinedExpenses(); if ($predefined_expenses) { $form->addInput(array('type'=>'combobox', 'onchange'=>'recalculateCost();', @@ -216,8 +216,8 @@ if ($request->isPost()) { $smarty->assign('next_date', $next_date); $smarty->assign('prev_date', $prev_date); -$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date)); -$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date)); +$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date)); +$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date)); $smarty->assign('predefined_expenses', $predefined_expenses); $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list);