extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-06 05:20:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

used&planned time or used,planned&replanned time incl. icons

Browse Source
This commit is contained in:
Ralf Becker 2009-05-11 09:19:16 +00:00
parent 7209eac430
commit 1585a36fdf
3 changed files with 31 additions and 11 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

@ -337,12 +337,12 @@ class infolog_ui
if ($details) if ($details)
{ {
$query['columnselection_pref'] = (is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details'; $query['columnselection_pref'] = (is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details';
$query['default_cols'] = '!cat_id,info_used_time_info_planned_time_info_replanned_time,info_id'; $query['default_cols'] = '!cat_id,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
} }
else else
{ {
$query['columnselection_pref'] = 'infolog.index.rows'; $query['columnselection_pref'] = 'infolog.index.rows';
$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time_info_replanned_time,info_id'; $query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
} }
// set old show_times pref, that get_info calculates the cumulated time of the timesheets // set old show_times pref, that get_info calculates the cumulated time of the timesheets
$this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time_info_replanned_time') !== false; $this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time_info_replanned_time') !== false;

8
infolog/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

30
infolog/templates/default/index.xet
View File

@ -14,12 +14,13 @@
</hbox> </hbox>
</template> </template>
<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.001"> <template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.001">
<grid width="100%" class="my_form"> <grid>
<columns> <columns>
<column width="2%"/> <column width="2%"/>
<column/> <column/>
<column disabled="@no_customfields"/> <column disabled="@no_customfields"/>
<column width="120"/> <column width="120"/>
<column/>
<column disabled="@no_info_used_time_info_planned_time"/> <column disabled="@no_info_used_time_info_planned_time"/>
<column width="8%" disabled="@no_info_onwer_info_responsible"/> <column width="8%" disabled="@no_info_onwer_info_responsible"/>
<column width="12%" disabled="@no_info_datemodified"/> <column width="12%" disabled="@no_info_datemodified"/>
@ -58,6 +59,10 @@
<vbox> <vbox>
<description value="Times"/> <description value="Times"/>
<description class="planned" value="planned"/> <description class="planned" value="planned"/>
</vbox>
<vbox options="0,0">
<description value="Times"/>
<description class="planned" value="planned"/>
<description class="replanned" value="Re-planned"/> <description class="replanned" value="Re-planned"/>
</vbox> </vbox>
<vbox> <vbox>
@ -91,13 +96,17 @@
<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/> <date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
</vbox> </vbox>
<vbox rows="3" cols="1"> <vbox rows="3" cols="1">
<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
</vbox>
<vbox rows="3" cols="1" options="0,0">
<hbox options="1,0" id="l_used_time"> <hbox options="1,0" id="l_used_time">
<image label="Times" src="timesheet"/> <image label="Times" src="timesheet"/>
<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/> <date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/> <date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
</hbox> </hbox>
<hbox options="1,0" id="lplanified"> <hbox options="1,0" id="lplanified">
<image label="planned time" src="k_alarm.png" readonly="true"/> <image label="planned time" src="k_alarm.png"/>
<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/> <date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
</hbox> </hbox>
<hbox options="1,0" id="replanified"> <hbox options="1,0" id="replanified">
@ -149,6 +158,7 @@
<column/> <column/>
<column width="120"/> <column width="120"/>
<column/> <column/>
<column/>
<column width="8%" disabled="@no_info_owner_info_responsible"/> <column width="8%" disabled="@no_info_owner_info_responsible"/>
<column width="12%"/> <column width="12%"/>
<column width="3%" disabled="@no_actions"/> <column width="3%" disabled="@no_actions"/>
@ -188,7 +198,11 @@
<nextmatch-sortheader label="Enddate" id="info_enddate"/> <nextmatch-sortheader label="Enddate" id="info_enddate"/>
<nextmatch-sortheader id="info_datecompleted" label="Date completed"/> <nextmatch-sortheader id="info_datecompleted" label="Date completed"/>
</vbox> </vbox>
<vbox rows="2" cols="1" options="2"> <vbox rows="2" cols="1">
<nextmatch-sortheader label="Times" id="info_used_time"/>
<nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/>
</vbox>
<vbox rows="2" cols="1" options="0,0">
<nextmatch-sortheader label="Times" id="info_used_time"/> <nextmatch-sortheader label="Times" id="info_used_time"/>
<nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/> <nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/>
<nextmatch-sortheader id="info_replanned_time" class="replanned" label="Re-planned"/> <nextmatch-sortheader id="info_replanned_time" class="replanned" label="Re-planned"/>
@ -228,14 +242,18 @@
<date class="$row_cont[end_class] fixedHeight" id="${row}[info_enddate]" readonly="true"/> <date class="$row_cont[end_class] fixedHeight" id="${row}[info_enddate]" readonly="true"/>
<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/> <date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
</vbox> </vbox>
<vbox rows="3" cols="1"> <vbox rows="3" cols="1" options="0,0">
<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
</vbox>
<vbox rows="3" cols="1" options="0,0">
<hbox options="1,0" id="r_used_time"> <hbox options="1,0" id="r_used_time">
<image label="Times" src="timesheet"/> <image label="Times" src="timesheet"/>
<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/> <date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/> <date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
</hbox> </hbox>
<hbox options="1,0" id="planified"> <hbox options="1,0" id="planified">
<image label="planned time" src="k_alarm.png" readonly="true"/> <image label="planned time" src="k_alarm.png"/>
<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/> <date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
</hbox> </hbox>
<hbox options="1,0" id="replanified"> <hbox options="1,0" id="replanified">
@ -276,7 +294,7 @@
</rows> </rows>
</grid> </grid>
</template> </template>
<template id="infolog.index" template="" lang="" group="0" version="1.5.004"> <template id="infolog.index" template="" lang="" group="0" version="1.7.001">
<grid width="100%" border="0" spacing="0" padding="0"> <grid width="100%" border="0" spacing="0" padding="0">
<columns> <columns>
<column width="90%"/> <column width="90%"/>