X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftimer.php;h=d3a0d0fb6df634c1c867c8a467ac0c03cc96d527;hb=223ec69341da525ce2fce640ad5e62b00ec27360;hp=bf92a89ef2988bcaec49ea43f688a3406fa22d6a;hpb=1bebedf4f6025a06d5c738a82ef057d2d0200eac;p=timetracker.git diff --git a/mobile/timer.php b/mobile/timer.php index bf92a89e..d3a0d0fb 100644 --- a/mobile/timer.php +++ b/mobile/timer.php @@ -29,7 +29,6 @@ require_once('../initialize.php'); import('form.Form'); import('ttUserHelper'); -import('ttTeamHelper'); import('ttGroupHelper'); import('ttClientHelper'); import('ttTimeHelper'); @@ -54,7 +53,7 @@ $_SESSION['date'] = $cl_date; // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) { require_once('../plugins/CustomFields.class.php'); - $custom_fields = new CustomFields($user->group_id); + $custom_fields = new CustomFields(); $smarty->assign('custom_fields', $custom_fields); } @@ -145,7 +144,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t } if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - $task_list = ttTeamHelper::getActiveTasks($user->group_id); + $task_list = ttGroupHelper::getActiveTasks(); $form->addInput(array('type'=>'combobox', 'name'=>'task', 'style'=>'width: 250px;', @@ -255,7 +254,7 @@ if ($request->isPost()) { } if ($request->getParameter('btn_stop')) { // Stop button clicked. We need to finish an uncompleted record in progress. - $record = ttTimeHelper::getRecord($uncompleted['id'], $user->getUser()); + $record = ttTimeHelper::getRecord($uncompleted['id']); // Can we complete this record? if (ttTimeHelper::isValidInterval($record['start'], $cl_finish) // finish time is greater than start time @@ -284,7 +283,7 @@ if ($request->isPost()) { } } // isPost -$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $cl_date); +$week_total = ttTimeHelper::getTimeForWeek($cl_date); $smarty->assign('week_total', $week_total); $smarty->assign('uncompleted', $uncompleted); @@ -292,7 +291,7 @@ $smarty->assign('uncompleted', $uncompleted); $smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date)); -$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date)); +$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date)); $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list); $smarty->assign('task_list', $task_list);