X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=reports.php;h=69e742351954e94a5e32e633b804b9e74a59aeea;hb=741660d57d2e740b472c10a9763d535a74cff09c;hp=08ac64fef92500172c5b8c704b0e410592e0fb55;hpb=ad707342d0ab5a7f6fc6ceda9ba3deb408f5ac08;p=timetracker.git diff --git a/reports.php b/reports.php index 08ac64fe..69e74235 100644 --- a/reports.php +++ b/reports.php @@ -161,10 +161,12 @@ if ($user->canManageTeam() || $user->isClient()) { $form->addInput(array('type'=>'combobox', 'name'=>'period', 'style'=>'width: 250px;', - 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.this_month'), - INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.last_month'), - INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.this_week'), - INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.last_week')), + 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.current_month'), + INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.previous_month'), + INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.current_week'), + INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.previous_week'), + INTERVAL_THIS_DAY=>$i18n->getKey('dropdown.current_day'), + INTERVAL_LAST_DAY=>$i18n->getKey('dropdown.previous_day')), 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); // Add controls for start and end dates. $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date')); @@ -223,7 +225,7 @@ if (($request->getMethod() == 'GET') && !$bean->isSaved()) { // No previous form data were found in session. Use the following default values. $form->setValueByElement('users', array_keys($user_list)); $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format)); - $form->setValueByElement('start_date', $period->getBeginDate()); + $form->setValueByElement('start_date', $period->getStartDate()); $form->setValueByElement('end_date', $period->getEndDate()); $form->setValueByElement('chclient', '1'); $form->setValueByElement('chinvoice', '0');