R34301 - /trunk/projectmanager/inc/class.datasource.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 34301

URL: http://www.egroupware.org/viewvc/egroupware?rev=34301&view=rev
Log:

  • ProjectManager: use calculated start time to calculate end-times, eg. InfoLog DS returned only planned end-times before

Modified:
trunk/projectmanager/inc/class.datasource.inc.php

Modified: trunk/projectmanager/inc/class.datasource.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/projectmanager/inc/class.datasource.inc.php?rev=34301&r1=34300&r2=34301&view=diff

— trunk/projectmanager/inc/class.datasource.inc.php (original)
+++ trunk/projectmanager/inc/class.datasource.inc.php Mon Mar 21 20:16:40 2011
@@ -223,7 +223,7 @@
if ($ds[‘pe_planned_start’] && is_object($this->project))
{
$ds[‘pe_planned_end’] = $this->project->date_add($ds[‘pe_planned_start’],$ds[‘pe_planned_time’],$ds[‘pe_resources’][0]);

  •   			//echo "<p>$ds[pe_title] set planned end to ".date('D Y-m-d H:i',$ds['pe_planned_end'])."</p>\n";

  •   			//echo "<p>$ds[pe_title] set planned end to ".date('D Y-m-d H:i',$ds['pe_planned_end']).' '.__LINE__."</p>\n";
  			unset($ds['ignore_planned_end']);
  		}
  	}

@@ -232,41 +232,47 @@
if ($ds[‘pe_planned_start’] && is_object($this->project))
{
$ds[‘pe_planned_end’] = $this->project->date_add($ds[‘pe_planned_start’],$ds[‘pe_planned_time’],$ds[‘pe_resources’][0]);

  •   			//echo "<p>$ds[pe_title] set planned end to ".date('D Y-m-d H:i',$ds['pe_planned_end']).' '.__LINE__."</p>\n";
  			unset($ds['ignore_planned_end']);
  		}
  	}

  •   	// setting real or planned start-date, from each other if not set

  •   	if ((!isset($ds['pe_real_start']) || $ds['ignore_real_start']) && isset($ds['pe_planned_start']))

  •   	{

  •   		$ds['pe_real_start'] = $ds['pe_planned_start'];

  •   	}

  •   	elseif (!isset($ds['pe_planned_start']) && isset($ds['pe_real_start']))

  •   	{

  •   		$ds['pe_planned_start'] = $ds['pe_real_start'];

  •   	}

  •   	// calculating the real end-date from the real or planned/replanned time
  	if ((!$ds['pe_real_end'] || $ds['ignore_real_end']) && $ds['pe_real_start'] &&
  		($ds['pe_used_time'] && !$ds['ignore_used_time'] || $ds['pe_replanned_time']) && is_object($this->project))
  	{
  		$ds['pe_real_end'] = $this->project->date_add($ds['pe_real_start'],
  			($t = $ds['pe_used_time'] && !$ds['ignore_used_time'] ? $ds['pe_used_time'] : $ds['pe_replanned_time']),$ds['pe_resources'][0]);

  •   		//echo "<p>$ds[pe_title] set real end to ".date('D Y-m-d H:i',$ds['pe_real_end'])."</p>\n";

  •   		//echo "<p>$ds[pe_title] set real end to ".date('D Y-m-d H:i',$ds['pe_real_end']).' '.__LINE__."</p>\n";
  		unset($ds['ignore_real_end']);
  	}

  •                    elseif ((!$ds['pe_real_end'] || $ds['ignore_real_end']) && $ds['pe_real_start'] &&

  •                            ($ds['pe_used_time'] && !$ds['ignore_used_time'] || $ds['pe_planned_time']) && is_object($this->project))

  •                    {

  •                            $ds['pe_real_end'] = $this->project->date_add($ds['pe_real_start'],

  •                                    ($t = $ds['pe_used_time'] && !$ds['ignore_used_time'] ? $ds['pe_used_time'] : $ds['pe_planned_time']),$ds['pe_resources'][0]);

  •                            //echo "<p>$ds[pe_title] set real end to ".date('D Y-m-d H:i',$ds['pe_real_end'])."</p>\n";

  •                            unset($ds['ignore_real_end']);

  •                    }

  •   	// setting real or planned start- or end-date, from each other if not set

  •   	foreach(array('start','end') as $name)

  •   	{

  •   		if ((!isset($ds['pe_real_'.$name]) || $ds['ignore_real_'.$name]) && isset($ds['pe_planned_'.$name]) /*&&

  •   		// setting the real dates only if the completion is more then 0% (if supported by the datasource)

  •   			(!isset($ds['pe_completion']) || $ds['pe_completion'] > 0)*/)

  •   		{

  •   			$ds['pe_real_'.$name] = $ds['pe_planned_'.$name];

  •   		}

  •   		elseif (!isset($ds['pe_planned_'.$name]) && isset($ds['pe_real_'.$name]))

  •   		{

  •   			$ds['pe_planned_'.$name] = $ds['pe_real_'.$name];

  •   		}

  •   	}

  •   	elseif ((!$ds['pe_real_end'] || $ds['ignore_real_end']) && $ds['pe_real_start'] &&

  •   		($ds['pe_used_time'] && !$ds['ignore_used_time'] || $ds['pe_planned_time']) && is_object($this->project))

  •   	{

  •   		$ds['pe_real_end'] = $this->project->date_add($ds['pe_real_start'],

  •   			($t = $ds['pe_used_time'] && !$ds['ignore_used_time'] ? $ds['pe_used_time'] : $ds['pe_planned_time']),$ds['pe_resources'][0]);

  •   		//echo "<p>$ds[pe_title] set real end to ".date('D Y-m-d H:i',$ds['pe_real_end']).' '.__LINE__."</p>\n";

  •   		unset($ds['ignore_real_end']);

  •   	}

  •   	// setting real or planned end-date, from each other if not set

  •   	if ((!isset($ds['pe_real_end']) || $ds['ignore_real_end']) && isset($ds['pe_planned_end']))

  •   	{

  •   		$ds['pe_real_end'] = $ds['pe_planned_end'];

  •   	}

  •   	elseif (!isset($ds['pe_planned_end']) && isset($ds['pe_real_end']))

  •   	{

  •   		$ds['pe_planned_end'] = $ds['pe_real_end'];

  •   	}

  •   	// try calculating a (second) completion from the times
  	if (!empty($ds['pe_used_time']) && (int) $ds['pe_planned_time'] > 0)
  	{

@@ -338,6 +344,7 @@
}
}
}

  •   //_debug_array($ds);
  return $ds;
    }

Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

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