holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing project manager time units

Browse Source
This commit is contained in:
Nathan Gray 2013-11-12 21:38:25 +00:00
parent 85aa7c76e3
commit de64622b99
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_ui.inc.php
View File

@ -110,7 +110,8 @@ class infolog_ui
if ($GLOBALS['egw_info']['apps']['projectmanager'])
{
$pm_config = config::read('projectmanager');
$this->duration_format = str_replace(',','',$pm_config['duration_units']).','.$pm_config['hours_per_workday'];
$this->duration_format = str_replace(',','',implode('',$pm_config['duration_units']));
$this->hours_per_workday = $pm_config['hours_per_workday'];
unset($pm_config);
}
$this->filters =& $this->bo->filters;
@ -1983,6 +1984,7 @@ class infolog_ui
!isset($GLOBALS['egw_info']['user']['apps']['admin']);
$content['duration_format'] = $this->duration_format;
$content['hours_per_workday'] = $this->hours_per_workday;
if ($this->prefs['show_id']) $content['info_number'] = $info_id;
$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];

4
infolog/templates/default/edit.xet
View File

@ -115,11 +115,11 @@
</row>
<row class="row">
<description value="planned time" for="info_planned_time"/>
<date-duration id="info_planned_time" options=",$cont[duration_format]"/>
<date-duration id="info_planned_time" display_format="$cont[duration_format]" hours_per_day="$cont[hours_per_workday]"/>
</row>
<row class="row">
<description value="Re-planned time" for="info_replanned_time"/>
<date-duration id="info_replanned_time" options=",$cont[duration_format]"/>
<date-duration id="info_replanned_time" display_format="$cont[duration_format]" hours_per_day="$cont[hours_per_workday]"/>
</row>
<row class="row" valign="top" height="60%">
<description statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"/>