From ff2ab603eeaf0b723187ef56ffca647dba874dba Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 27 Jan 2010 08:06:44 +0000 Subject: [PATCH] Works on enhancement of project tasks --- htdocs/projet/activity/index.php | 109 +++++++++++++++++-------------- 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 6374cdc0386..ebb527144bd 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -78,10 +78,11 @@ if ($socid) $sql.= " AND p.fk_soc = ".$socid; //if ($mode == 'mine') $sql.=" AND pta.fk_user = ".$user->id; $sql.= " GROUP BY p.rowid"; -$var=true; $resql = $db->query($sql); if ( $resql ) { + $var=true; + $num = $db->num_rows($resql); $i = 0; @@ -117,20 +118,22 @@ print ''.$langs->trans("Time").''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb"; -$sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task as t"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt"; -$sql .= " WHERE t.fk_projet = p.rowid"; -$sql .= " AND tt.fk_task = t.rowid"; -$sql .= " AND tt.fk_user = ".$user->id; -$sql .= " AND date_format(task_date,'%d%m%y') = ".strftime("%d%m%y",time()); -$sql .= " GROUP BY p.rowid"; +$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task as t"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt"; +$sql.= " WHERE t.fk_projet = p.rowid"; +$sql.= " AND p.entity = ".$conf->entity; +$sql.= " AND tt.fk_task = t.rowid"; +$sql.= " AND tt.fk_user = ".$user->id; +$sql.= " AND date_format(task_date,'%d%m%y') = ".strftime("%d%m%y",time()); +$sql.= " GROUP BY p.rowid"; -$var=true; -$total=0; $resql = $db->query($sql); if ( $resql ) { + $var=true; + $total=0; + while ($row = $db->fetch_object($resql)) { $var=!$var; @@ -165,20 +168,22 @@ print ''.$langs->trans("Time").''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb"; -$sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task as t"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt"; -$sql .= " WHERE t.fk_projet = p.rowid"; -$sql .= " AND tt.fk_task = t.rowid"; -$sql .= " AND tt.fk_user = ".$user->id; -$sql .= " AND date_format(date_add(task_date, INTERVAL 1 DAY),'%d%m%y') = ".strftime("%d%m%y",time()); -$sql .= " GROUP BY p.rowid"; +$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task as t"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt"; +$sql.= " WHERE t.fk_projet = p.rowid"; +$sql.= " AND p.entity = ".$conf->entity; +$sql.= " AND tt.fk_task = t.rowid"; +$sql.= " AND tt.fk_user = ".$user->id; +$sql.= " AND date_format(date_add(task_date, INTERVAL 1 DAY),'%d%m%y') = ".strftime("%d%m%y",time()); +$sql.= " GROUP BY p.rowid"; -$var=true; -$total=0; $resql = $db->query($sql); if ( $resql ) { + $var=true; + $total=0; + while ($row = $db->fetch_object($resql)) { $var=!$var; @@ -215,19 +220,22 @@ print ''.$langs->trans("Time").''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb"; -$sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task as t"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt"; -$sql .= " WHERE t.fk_projet = p.rowid"; -$sql .= " AND tt.fk_task = t.rowid"; -$sql .= " AND tt.fk_user = ".$user->id; -$sql .= " AND week(task_date) = ".strftime("%W",time()); -$sql .= " GROUP BY p.rowid"; -$total = 0; -$var=true; +$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; +$sql.= " , ".MAIN_DB_PREFIX."projet_task as t"; +$sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt"; +$sql.= " WHERE t.fk_projet = p.rowid"; +$sql.= " AND p.entity = ".$conf->entity; +$sql.= " AND tt.fk_task = t.rowid"; +$sql.= " AND tt.fk_user = ".$user->id; +$sql.= " AND week(task_date) = ".strftime("%W",time()); +$sql.= " GROUP BY p.rowid"; + $resql = $db->query($sql); if ( $resql ) { + $total = 0; + $var=true; + while ($row = $db->fetch_object($resql)) { $var=!$var; @@ -262,19 +270,21 @@ print ''.$langs->trans("Time").''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb"; -$sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task as t"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt"; -$sql .= " WHERE t.fk_projet = p.rowid"; -$sql .= " AND tt.fk_task = t.rowid"; -$sql .= " AND tt.fk_user = ".$user->id; -$sql .= " AND month(task_date) = ".strftime("%m",$now); -$sql .= " GROUP BY p.rowid"; +$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task as t"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt"; +$sql.= " WHERE t.fk_projet = p.rowid"; +$sql.= " AND p.entity = ".$conf->entity; +$sql.= " AND tt.fk_task = t.rowid"; +$sql.= " AND tt.fk_user = ".$user->id; +$sql.= " AND month(task_date) = ".strftime("%m",$now); +$sql.= " GROUP BY p.rowid"; -$var=false; $resql = $db->query($sql); if ( $resql ) { + $var=false; + while ($row = $db->fetch_object($resql)) { print ""; @@ -295,7 +305,7 @@ else } print ""; -/* Affichage de la liste des projets de l'ann�e */ +/* Affichage de la liste des projets de l'annee */ print '
'; print ''; print ''; @@ -303,14 +313,15 @@ print ''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb"; -$sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task as t"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt"; -$sql .= " WHERE t.fk_projet = p.rowid"; -$sql .= " AND tt.fk_task = t.rowid"; -$sql .= " AND tt.fk_user = ".$user->id; -$sql .= " AND YEAR(task_date) = ".strftime("%Y",$now); -$sql .= " GROUP BY p.rowid"; +$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task as t"; +$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt"; +$sql.= " WHERE t.fk_projet = p.rowid"; +$sql.= " AND p.entity = ".$conf->entity; +$sql.= " AND tt.fk_task = t.rowid"; +$sql.= " AND tt.fk_user = ".$user->id; +$sql.= " AND YEAR(task_date) = ".strftime("%Y",$now); +$sql.= " GROUP BY p.rowid"; $var=false; $resql = $db->query($sql);
'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).''.$langs->trans("Time").'