X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=reports.php;h=69e742351954e94a5e32e633b804b9e74a59aeea;hb=f270b1e143509303e32f65c3dda3fbecaee56c6b;hp=03dbb9be255b4278f30d9662b10a0b0a7dd2922f;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git

diff --git a/reports.php b/reports.php
index 03dbb9be..69e74235 100644
--- a/reports.php
+++ b/reports.php
@@ -43,7 +43,7 @@ if (!ttAccessCheck(right_view_reports)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);
@@ -59,17 +59,16 @@ $form->addInput(array('type'=>'combobox',
   'style'=>'width: 250px;',
   'data'=>$report_list,
   'datakeys'=>array('id','name'),
-  'empty'=>array('-1'=>$i18n->getKey('dropdown.no'))
-));
+  'empty'=>array('-1'=>$i18n->getKey('dropdown.no'))));
 $form->addInput(array('type'=>'hidden','name'=>'fav_report_changed'));
 // Generate and Delete buttons.
 $form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->getKey('button.generate')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete'),'onclick'=>"return confirm('".$i18n->getKey('form.reports.confirm_delete')."')"));
 
 // Dropdown for clients if the clients plugin is enabled.
-if (in_array('cl', explode(',', $user->plugins)) && !($user->isClient() && $user->client_id)) {
+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',
@@ -77,8 +76,7 @@ if (in_array('cl', explode(',', $user->plugins)) && !($user->isClient() && $user
     'style'=>'width: 250px;',
     'data'=>$client_list,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.all'))
-  ));
+    'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 }
 
 // If we have a TYPE_DROPDOWN custom field - add control to select an option.
@@ -87,14 +85,13 @@ if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['ty
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->getKey('dropdown.all'))
-    ));
+      'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 }
 
 // Add controls for projects and tasks.
 if ($user->canManageTeam()) {
   $project_list = ttProjectHelper::getProjects(); // Manager and co-managers can run reports on all active and inactive projects.
-} else if ($user->isClient()) {
+} elseif ($user->isClient()) {
   $project_list = ttProjectHelper::getProjectsForClient();
 } else {
   $project_list = ttProjectHelper::getAssignedProjects($user->id);	
@@ -105,8 +102,7 @@ $form->addInput(array('type'=>'combobox',
   'style'=>'width: 250px;',
   'data'=>$project_list,
   'datakeys'=>array('id','name'),
-  'empty'=>array(''=>$i18n->getKey('dropdown.all'))
-));
+  'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
   $task_list = ttTeamHelper::getActiveTasks($user->team_id);
   $form->addInput(array('type'=>'combobox',
@@ -114,36 +110,33 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
     'style'=>'width: 250px;',
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.all'))
-  ));
+    'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 }
 
-// Add include records control.  
+// Add include records control.
 $include_options = array('1'=>$i18n->getKey('form.reports.include_billable'),
   '2'=>$i18n->getKey('form.reports.include_not_billable'));
 $form->addInput(array('type'=>'combobox',
   'name'=>'include_records',
   'style'=>'width: 250px;',
   'data'=>$include_options,
-  'empty'=>array(''=>$i18n->getKey('dropdown.all'))
-));
+  'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 
-// Add invoiced / not invoiced selector.  
+// Add invoiced / not invoiced selector.
 $invoice_options = array('1'=>$i18n->getKey('form.reports.include_invoiced'),
   '2'=>$i18n->getKey('form.reports.include_not_invoiced'));
 $form->addInput(array('type'=>'combobox',
   'name'=>'invoice',
   'style'=>'width: 250px;',
   'data'=>$invoice_options,
-  'empty'=>array(''=>$i18n->getKey('dropdown.all'))
-));
+  'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
 
 $user_list = array();
 if ($user->canManageTeam() || $user->isClient()) {
   // Prepare user and assigned projects arrays.
   if ($user->canManageTeam())
     $users = ttTeamHelper::getUsers(); // Active and inactive users for managers.
-  else if ($user->isClient())
+  elseif ($user->isClient())
     $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
 
   foreach ($users as $single_user) {
@@ -161,52 +154,52 @@ if ($user->canManageTeam() || $user->isClient()) {
     'data'=>$user_list,
     'layout'=>'V',
     'groupin'=>$row_count,
-    'style'=>'width: 100%;'
-  ));
+    'style'=>'width: 100%;'));
 }
 
 // Add control for time period.
 $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')),
-  'empty'=>array(''=>$i18n->getKey('dropdown.select'))
-));
+  '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'));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
 // Add checkboxes for fields.
-if (in_array('cl', explode(',', $user->plugins)))
-  $form->addInput(array('type'=>'checkbox','name'=>'chclient','data'=>1));	
-if (($user->canManageTeam() || $user->isClient()) && in_array('iv', explode(',', $user->plugins)))
-  $form->addInput(array('type'=>'checkbox','name'=>'chinvoice','data'=>1));	
+if ($user->isPluginEnabled('cl'))
+  $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
+if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
+  $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));
+$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
+$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
 if (defined('COST_ON_REPORTS') && isTrue(COST_ON_REPORTS))
-  $form->addInput(array('type'=>'checkbox','name'=>'chcost','data'=>1));
+  $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'));
 
 // 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');
 if ($user->canManageTeam() || $user->isClient())
   $group_by_options['user'] = $i18n->getKey('form.reports.group_by_user');
-if (in_array('cl', explode(',', $user->plugins)) && !($user->isClient() && $user->client_id))
-  $group_by_options['client'] = $i18n->getKey('form.reports.group_by_client');	
+if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
+  $group_by_options['client'] = $i18n->getKey('form.reports.group_by_client');
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $group_by_options['project'] = $i18n->getKey('form.reports.group_by_project');
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
@@ -215,69 +208,69 @@ 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;'));
 // Save button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-  
+
 $form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->getKey('button.generate')));
 
 // Create a bean (which is a mechanism to remember form values in session).
 $bean = new ActionForm('reportBean', $form, $request);
-// At this point form values are obtained from session if they are there...
+// At this point form values are obtained from session if they are there.
 
 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);
-  $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('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->getMethod() == 'POST') {
+if ($request->isPost()) {
   if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {
       // This loads new favorite report options into the bean (into our form).
       ttFavReportHelper::loadReport($user->id, $bean);
-      
+
       // If user selected no favorite report - mark all user checkboxes (most probable scenario).
       if ($bean->getAttribute('favorite_report') == -1)
         $form->setValueByElement('users', array_keys($user_list));
-       
+
       // Save form data in session for future use.
       $bean->saveBean();
       header('Location: reports.php');
-	  exit();
-	}
+      exit();
+    }
   } elseif ($bean->getAttribute('btn_save')) {
-  	// User clicked the Save button. We need to save form options as new favorite report.
-  	if (!ttValidString($bean->getAttribute('new_fav_report'))) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite'));
-  	
-    if ($errors->isEmpty()) {
+    // User clicked the Save button. We need to save form options as new favorite report.
+    if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite'));
+
+    if ($err->no()) {
       $id = ttFavReportHelper::saveReport($user->id, $bean);
       if (!$id)
-        $errors->add($i18n->getKey('error.db'));
-      if ($errors->isEmpty()) {
+        $err->add($i18n->getKey('error.db'));
+      if ($err->no()) {
         $bean->setAttribute('favorite_report', $id);
         $bean->saveBean();
         header('Location: reports.php');
@@ -295,33 +288,33 @@ if ($request->getMethod() == 'POST') {
       $form->setValueByElement('users', array_keys($user_list));
       $bean->saveBean();
       header('Location: reports.php');
-	  exit();
-	}
+      exit();
+    }
   } else {
     // Generate button pressed. Check some values.
     if (!$bean->getAttribute('period')) {
       $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
-      
+
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
-        
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
+
       $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
       if ($end_date->isError() || !$bean->getAttribute('end_date'))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
-        
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
+
       if ($start_date->compare($end_date) > 0)
-        $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date'));
+        $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date'));
     }
-    
+
     $bean->saveBean();
-    
-    if ($errors->isEmpty()) {
+
+    if ($err->no()) {
       // Now we can go ahead and create a report.
       header('Location: report.php');
       exit();
     }
   }
-}
+} // isPost
 
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);