X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=reports.php;h=27a722446f1ab3a010f0a13dd11345d08c52e122;hb=a46ca9f2c279305fc8a6c7456e23f4ef46fd6fe4;hp=add2b43f326102245776e7fc9fc842e108d49632;hpb=05b0f8e4762b8a2ca2002a8f7545b7ff68cc3925;p=timetracker.git

diff --git a/reports.php b/reports.php
index add2b43f..27a72244 100644
--- a/reports.php
+++ b/reports.php
@@ -68,7 +68,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getK
 // Dropdown for clients if the clients plugin is enabled.
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) {
   if ($user->canManageTeam() || ($user->isClient() && !$user->client_id))
-    $client_list = ttClientHelper::getClients($user->team_id);
+    $client_list = ttClientHelper::getClients();
   else
     $client_list = ttClientHelper::getClientsForUser();
   $form->addInput(array('type'=>'combobox',
@@ -122,6 +122,16 @@ $form->addInput(array('type'=>'combobox',
   'data'=>$include_options,
   'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 
+if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'paid_status',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid')),
+   'empty'=>array(''=>$i18n->getKey('dropdown.all'))
+ ));
+}
+
+
 // Add invoiced / not invoiced selector.
 $invoice_options = array('1'=>$i18n->getKey('form.reports.include_invoiced'),
   '2'=>$i18n->getKey('form.reports.include_not_invoiced'));
@@ -161,10 +171,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'));
@@ -172,25 +184,25 @@ $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'))
 
 // Add checkboxes for fields.
 if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'checkbox','name'=>'chclient','data'=>1));
+  $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
 if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'chinvoice','data'=>1));
+  $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-  $form->addInput(array('type'=>'checkbox','name'=>'chproject','data'=>1));
+  $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-  $form->addInput(array('type'=>'checkbox','name'=>'chtask','data'=>1));
+  $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-  $form->addInput(array('type'=>'checkbox','name'=>'chstart','data'=>1));
-  $form->addInput(array('type'=>'checkbox','name'=>'chfinish','data'=>1));
+  $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
+  $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
 }
-$form->addInput(array('type'=>'checkbox','name'=>'chduration','data'=>1));
-$form->addInput(array('type'=>'checkbox','name'=>'chnote','data'=>1));
-if (defined('COST_ON_REPORTS') && isTrue(COST_ON_REPORTS))
-  $form->addInput(array('type'=>'checkbox','name'=>'chcost','data'=>1));
+$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
+$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
+$form->addInput(array('type'=>'checkbox','name'=>'chcost'));
 // If we have a custom field - add a checkbox for it.
 if ($custom_fields && $custom_fields->fields[0])
-  $form->addInput(array('type'=>'checkbox','name'=>'chcf_1','data'=>1));
-
+  $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
+if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+  $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->getKey('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->getKey('form.reports.group_by_date');
@@ -206,7 +218,7 @@ if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['ty
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
 }
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
-$form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly','data'=>1));
+$form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.
 $form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30','style'=>'width: 250px;'));
@@ -219,30 +231,31 @@ $form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->ge
 $bean = new ActionForm('reportBean', $form, $request);
 // At this point form values are obtained from session if they are there.
 
-if (($request->getMethod() == 'GET') && !$bean->isSaved()) {
+if ($request->isGet() && !$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);
-  $form->setValueByElement('chproject', 1);
-  $form->setValueByElement('chstart', 1);  
-  $form->setValueByElement('chduration', 1);
-  $form->setValueByElement('chcost', 0);
-  $form->setValueByElement('chtask', 1);
-  $form->setValueByElement('chfinish', 1);
-  $form->setValueByElement('chnote', 1);
-  $form->setValueByElement('chcf_1', 0);
-  $form->setValueByElement('chtotalsonly', 0);
+  $form->setValueByElement('chclient', '1');
+  $form->setValueByElement('chinvoice', '0');
+  $form->setValueByElement('chproject', '1');
+  $form->setValueByElement('chstart', '1');
+  $form->setValueByElement('chduration', '1');
+  $form->setValueByElement('chcost', '0');
+  $form->setValueByElement('chtask', '1');
+  $form->setValueByElement('chfinish', '1');
+  $form->setValueByElement('chnote', '1');
+  $form->setValueByElement('chcf_1', '0');
+  $form->setValueByElement('chpaid', '0');
+  $form->setValueByElement('chtotalsonly', '0');
 }
 
 $form->setValueByElement('fav_report_changed','');
 
 // Disable the Delete button when no favorite report is selected.
 if (!$bean->getAttribute('favorite_report') || ($bean->getAttribute('favorite_report') == -1))
-  $form->getElement('btn_delete')->setEnable(false);
+  $form->getElement('btn_delete')->setEnabled(false);
 
 if ($request->isPost()) {
   if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {