class.timesheet_ui.inc.php

nathangray 2016-04-13 14:59:17 UTC #1

Author: nathangray
New Revision: 55736

URL: http://svn.stylite.de/viewvc/egroupware?rev=55736&view=rev
Log:

Clear header totals when no date filtering is applied
Avoid warnings about column list being string / array

Modified:
trunk/timesheet/inc/class.timesheet_ui.inc.php

Modified: trunk/timesheet/inc/class.timesheet_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/timesheet/inc/class.timesheet_ui.inc.php?rev=55736&r1=55735&r2=55736&view=diff

— trunk/timesheet/inc/class.timesheet_ui.inc.php (original)
+++ trunk/timesheet/inc/class.timesheet_ui.inc.php Wed Apr 13 16:59:17 2016
@@ -774,17 +774,25 @@
{
$rows += $this->summary;
}

```
  else
```
```
  {
```
```
  	// Clear summary
```

  	$rows += array('duration'=>'','price'=>'','quantity'=>'');

  }
  $rows['pm_integration'] = $this->pm_integration;
  $rows['ts_viewtype'] =  $rows['no_ts_quantity'] =  $rows['no_ts_unitprice'] =  $rows['no_ts_total'] = $this->ts_viewtype == 'short';
  if (!$rows['ts_viewtype'])
  {
  	#_debug_array($query['selectcols']);

  	if(!is_array($query['selectcols'])){

  		$query['selectcols'] = explode(',',$query['selectcols']);

  	}
  	#ts_quantity,ts_unitprice,ts_total

  	if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;

  	if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;

  	if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;

```
  }
```

  $rows['no_ts_status'] = strpos($query['selectcols'], 'ts_status') === false && !$this->config_data['history'] ||

  	if ($query['selectcols'] && in_array('ts_quantity',$query['selectcols'])===false) $rows['no_ts_quantity'] = 1;

  	if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false) $rows['no_ts_unitprice'] = 1;

  	if ($query['selectcols'] && in_array('ts_total',$query['selectcols'])===false) $rows['no_ts_total'] = 1;

```
  }
```

  $rows['no_ts_status'] = in_array('ts_status', $query['selectcols']) === false && !$this->config_data['history'] ||
  	$query['no_status'];

  if ($query['search'])

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs