New field replanned time with for pm integration, also icons in list view to diferentiate real, planned and replanned times.

infolog/inc/class.datasource_infolog.inc.php

@@ -39,7 +39,7 @@ class datasource_infolog extends datasource
 	{
 		$this->datasource('infolog');
 		
-		$this->valid = PM_COMPLETION|PM_PLANNED_START|PM_PLANNED_END|PM_REAL_END|PM_PLANNED_TIME|PM_USED_TIME|PM_RESOURCES;
+		$this->valid = PM_COMPLETION|PM_PLANNED_START|PM_PLANNED_END|PM_REAL_END|PM_PLANNED_TIME|PM_REPLANNED_TIME|PM_USED_TIME|PM_RESOURCES;
 
 		// we use $GLOBALS['boinfolog'] as an already running instance might be availible there
 		if (!is_object($GLOBALS['boinfolog']))
@@ -75,6 +75,7 @@ class datasource_infolog extends datasource
 			'pe_planned_end'  => $data['info_enddate'] ? $data['info_enddate'] : null,
 			'pe_real_end'     => $data['info_datecompleted'] ? $data['info_datecompleted'] : null,
 			'pe_planned_time' => $data['info_planned_time'],
+			'pe_replanned_time' => $data['info_replanned_time'],
 			'pe_used_time'    => $data['info_used_time'],
 			'pe_resources'    => count($data['info_responsible']) ? $data['info_responsible'] : array($data['info_owner']),
 			'pe_details'      => $data['info_des'] ? nl2br($data['info_des']) : '',

infolog/setup/egw_en.lang

@@ -41,6 +41,7 @@ add:	infolog	en	Add:
 all	infolog	en	All
 all links and attachments	infolog	en	all links and attachments
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	en	allows to set the status of an entry, eg. set a ToDo to done if it's finished (values depend on entry-type)
+applies the changes	infolog	en	applies the changes
 apply the changes	infolog	en	Apply the changes
 archive	infolog	en	archive
 are you shure you want to delete this entry ?	infolog	en	Are you sure you want to delete this entry ?
@@ -56,6 +57,7 @@ cancel	infolog	en	Cancel
 cancelled	infolog	en	cancelled
 categories	infolog	en	Categories
 category	infolog	en	Category
+change history	infolog	en	Change history
 change the status of an entry, eg. close it	infolog	en	Change the status of an entry, eg. close it
 charset of file	infolog	en	Charset of file
 check to set startday	infolog	en	check to set startday
@@ -150,6 +152,7 @@ from	infolog	en	From
 general	infolog	en	General
 group owner for	infolog	en	Group owner for
 high	infolog	en	high
+history	infolog	en	History
 history logging	infolog	en	History logging
 history logging and deleting of items	infolog	en	History logging and deleting of items
 id	infolog	en	Id
@@ -176,6 +179,7 @@ invalid filename	infolog	en	Invalid filename
 label<br>helptext	infolog	en	Label<br>Helptext
 last changed	infolog	en	Last changed
 last modified	infolog	en	Last modified
+leave blank to get the used time calculated by timesheet entries	infolog	en	Leave blank to get the used time calculated by timesheet entries
 leave it empty	infolog	en	leave it empty
 leave without saveing the entry	infolog	en	leave without saveing the entry
 leaves without saveing	infolog	en	leaves without saveing
@@ -247,6 +251,9 @@ priority	infolog	en	Priority
 private	infolog	en	Private
 project	infolog	en	Project
 project settings: price, times	infolog	en	Project settings: price, times
+projectmanager	infolog	en	Projectmanager
+re-planned	infolog	en	Re-planned
+re-planned time	infolog	en	Re-planned time
 re:	infolog	en	Re:
 read one record by passing its id.	infolog	en	Read one record by passing its id.
 read rights (default)	infolog	en	read rights (default)

infolog/setup/egw_es-es.lang

@@ -41,6 +41,7 @@ add:	infolog	es-es	Añadir:
 all	infolog	es-es	Todos
 all links and attachments	infolog	es-es	todos los enlaces y ficheros adjuntos
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	es-es	permite establecer el estado de una entrada, p.e. poner una tarea pendiente cono finalizada si está terminada (los valores dependen del tipo de entrada)
+applies the changes	infolog	es-es	Aplica los cambios
 apply the changes	infolog	es-es	Aplicar los cambios
 archive	infolog	es-es	archivar
 are you shure you want to delete this entry ?	infolog	es-es	¿Está seguro de querer borrar esta entrada?
@@ -56,6 +57,7 @@ cancel	infolog	es-es	Cancelar
 cancelled	infolog	es-es	Cancelado
 categories	infolog	es-es	Categorías
 category	infolog	es-es	Categoría
+change history	infolog	es-es	Cambiar historial
 change the status of an entry, eg. close it	infolog	es-es	Cambiar el estado de una entrada, p. ej. cerrarlo
 charset of file	infolog	es-es	Juego de caracteres del fichero
 check to set startday	infolog	es-es	marcar para establecer fecha de inicio
@@ -150,6 +152,7 @@ from	infolog	es-es	De
 general	infolog	es-es	General
 group owner for	infolog	es-es	Propietario de grupo para
 high	infolog	es-es	alta
+history	infolog	es-es	Historial
 history logging	infolog	es-es	Registro histórico
 history logging and deleting of items	infolog	es-es	Registro histórico y borrado de elementos
 id	infolog	es-es	Id
@@ -176,6 +179,7 @@ invalid filename	infolog	es-es	El nombre de archivo no es válido
 label<br>helptext	infolog	es-es	Etiqueta<br>Texto de ayuda
 last changed	infolog	es-es	Último cambio
 last modified	infolog	es-es	Última modificación
+leave blank to get the used time calculated by timesheet entries	infolog	es-es	Dejar en blanco para conseguir el tiempo acumulado por las hojas de presencia
 leave it empty	infolog	es-es	dejar en blanco
 leave without saveing the entry	infolog	es-es	abandonar sin guardar la entrada
 leaves without saveing	infolog	es-es	abandonar sin guardar
@@ -239,7 +243,7 @@ phone	infolog	es-es	Llamada telefónica
 phone/email	infolog	es-es	Teléfono o correo electrónico
 phonecall	infolog	es-es	Llamada telefónica
 planned	infolog	es-es	planificada
-planned time	infolog	es-es	hora planificada
+planned time	infolog	es-es	Tiempo Planificado
 price	infolog	es-es	Precio
 pricelist	infolog	es-es	Lista de precios
 primary link	infolog	es-es	enlace primario
@@ -247,6 +251,9 @@ priority	infolog	es-es	Prioridad
 private	infolog	es-es	Privado
 project	infolog	es-es	Proyecto
 project settings: price, times	infolog	es-es	Configuración del proyecto: precio, tiempos
+projectmanager	infolog	es-es	Administrador de Proyectos
+re-planned	infolog	es-es	Replanificado
+re-planned time	infolog	es-es	Tiempo Replanificado
 re:	infolog	es-es	Re:
 read one record by passing its id.	infolog	es-es	Leer un registro pasando su id.
 read rights (default)	infolog	es-es	derecho de lectura (predeterminado)
@@ -339,6 +346,7 @@ urgency	infolog	es-es	Urgencia
 urgent	infolog	es-es	urgente
 used time	infolog	es-es	tiempo utilizado
 valid path on clientside<br>eg. \servershare or e:	infolog	es-es	ruta válida en el cliente<br>p. ej. \\seridor\recurso o e:\
+valid path on clientside<br>eg. servershare or e:	infolog	es-es	ruta válida en el cliente<br>p. ej. \\seridor\recurso o e:\
 values for selectbox	infolog	es-es	Valores para lista desplegable
 view all subs of this entry	infolog	es-es	Ver todos los subs de esta entrada
 view other subs	infolog	es-es	ver otros subs

infolog/setup/setup.inc.php

@@ -12,7 +12,7 @@
  */
 
 $setup_info['infolog']['name']      = 'infolog';
-$setup_info['infolog']['version']   = '1.5.003';
+$setup_info['infolog']['version']   = '1.5.004';
 $setup_info['infolog']['app_order'] = 5;
 $setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra');
 $setup_info['infolog']['enable']    = 1;

infolog/setup/tables_current.inc.php

@@ -29,6 +29,7 @@
 				'info_enddate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
 				'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
 				'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_replanned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
 				'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
 				'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done'),
 				'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),

infolog/setup/tables_update.inc.php

@@ -632,3 +632,21 @@
 
 		return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.003';
 	}
+
+	$test[] = '1.5.003';
+	/**
+	 * Add re-planned time column
+	 *
+	 * @return string version
+	 */
+	function infolog_upgrade1_5_003()
+	{
+		$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_replanned_time',array(
+			'type' => 'int',
+			'precision' => '4',
+			'nullable' => False,
+			'default' => '0'
+		));		
+
+		return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.004';
+	}	

infolog/templates/default/index.xet

@@ -13,7 +13,7 @@
 			<button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;type=note&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
 		</hbox>
 	</template>
-	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.4.002">
+	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.5.004">
 		<grid>
 			<columns>
 				<column width="2%"/>
@@ -58,6 +58,7 @@
 					<vbox>
 						<description value="Times"/>
 						<description class="planned" value="planned"/>
+						<description class="replanned" value="Re-planned"/>
 					</vbox>
 					<vbox>
 						<description value="Owner"/>
@@ -90,9 +91,19 @@
 						<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
 					</vbox>
 					<vbox rows="3" cols="1">
-						<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+						<hbox options="1,0" id="l_used_time">
-						<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
+							<image label="Times" src="timesheet"/>
-						<date-duration id="${row}[info_planned_time]" span="all" class="planned" 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"/>
+						</hbox>
+						<hbox options="1,0" id="lplanified">
+							<image label="planned time" src="k_alarm.png" readonly="true"/>
+							<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
+						</hbox>
+						<hbox options="1,0" id="replanified">
+							<image label="Re-planned time" src="agt_reload.png"/>
+							<date-duration id="${row}[info_replanned_time]" span="all" class="replanned" readonly="true" options="@duration_format"/>
+						</hbox>
 					</vbox>
 					<vbox options="0,0">
 						<menulist>
@@ -121,7 +132,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.index.rows" template="" lang="" group="0" version="1.5.001">
+	<template id="infolog.index.rows" template="" lang="" group="0" version="1.5.004">
 		<grid>
 			<columns>
 				<column width="2%"/>
@@ -172,6 +183,7 @@
 					<vbox rows="2" cols="1" options="2">
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/>
+						<nextmatch-sortheader id="info_replanned_time" class="replanned" label="Re-planned"/>
 					</vbox>
 					<vbox options="0,0">
 						<nextmatch-accountfilter id="info_owner" options="Owner" statustext="Select to filter by owner" class="user_filter"/>
@@ -207,9 +219,19 @@
 						<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
 					</vbox>
 					<vbox rows="3" cols="1">
-						<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+						<hbox options="1,0" id="r_used_time">
-						<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
+							<image label="Times" src="timesheet"/>
-						<date-duration id="${row}[info_planned_time]" span="all" class="planned" 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"/>
+						</hbox>
+						<hbox options="1,0" id="planified">
+							<image label="planned time" src="k_alarm.png" readonly="true"/>
+							<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
+						</hbox>
+						<hbox options="1,0" id="replanified">
+							<image label="Re-planned time" src="agt_reload.png"/>
+							<date-duration id="${row}[info_replanned_time]" span="all" class="replanned" readonly="true" options="@duration_format"/>
+						</hbox>
 					</vbox>
 					<vbox options="0,0">
 						<menulist>
@@ -227,7 +249,7 @@
 						<button image="new" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;action=sp&amp;action_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
 						<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
 						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
-						<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.uitimesheet.edit&amp;link_app[]=infolog&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
+						<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.uitimesheet.edit&amp;link_app[]=infolog&amp;cat_id=$row_cont[info_cat]&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
 					</vbox>
 					<hbox class="noPrint">
 						<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
@@ -238,7 +260,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.index" template="" lang="" group="0" version="1.5.001">
+	<template id="infolog.index" template="" lang="" group="0" version="1.5.004">
 		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="90%"/>