diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index c565dff3352..5950f7ab43b 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -107,7 +107,7 @@ print ''.$langs->trans('ActivityOnProjectToday').''; print ''.$langs->trans("Time").''; print "\n"; -$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb"; +$sql = "SELECT p.rowid, p.ref, p.title, p.public, 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"; @@ -117,7 +117,7 @@ $sql.= " AND tt.fk_task = t.rowid"; $sql.= " AND tt.fk_user = ".$user->id; $sql.= " AND date_format(task_date,'%y-%m-%d') = '".strftime("%y-%m-%d",$now)."'"; $sql.= " AND p.rowid in (".$projectsListId.")"; -$sql.= " GROUP BY p.rowid, p.ref, p.title"; +$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; $resql = $db->query($sql); if ( $resql ) @@ -133,6 +133,7 @@ if ( $resql ) $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; $projectstatic->title=$row->title; + $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; print ''.convertSecondToTime($row->nb, 'allhourmin').''; @@ -163,7 +164,7 @@ if ($db->type != 'pgsql') print ''.$langs->trans("Time").''; print "\n"; - $sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb"; + $sql = "SELECT p.rowid, p.ref, p.title, p.public, 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"; @@ -173,7 +174,7 @@ if ($db->type != 'pgsql') $sql.= " AND tt.fk_user = ".$user->id; $sql.= " AND date_format(date_add(task_date, INTERVAL 1 DAY),'%y-%m-%d') = '".strftime("%y-%m-%d",$now)."'"; $sql.= " AND p.rowid in (".$projectsListId.")"; - $sql.= " GROUP BY p.rowid, p.ref, p.title"; + $sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; $resql = $db->query($sql); if ( $resql ) @@ -189,6 +190,7 @@ if ($db->type != 'pgsql') $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; $projectstatic->title=$row->title; + $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; print ''.convertSecondToTime($row->nb, 'allhourmin').''; @@ -222,7 +224,7 @@ if ($db->type != 'pgsql') print ''.$langs->trans("Time").''; print "\n"; - $sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb"; + $sql = "SELECT p.rowid, p.ref, p.title, p.public, 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"; @@ -248,6 +250,7 @@ if ($db->type != 'pgsql') $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; $projectstatic->title=$row->title; + $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; print ''.convertSecondToTime($row->nb, 'allhourmin').''; @@ -279,7 +282,7 @@ print ''.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($no print ''.$langs->trans("Time").''; print "\n"; -$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb"; +$sql = "SELECT p.rowid, p.ref, p.title, p.public, 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"; @@ -289,7 +292,7 @@ $sql.= " AND tt.fk_task = t.rowid"; $sql.= " AND tt.fk_user = ".$user->id; $sql.= " AND task_date BETWEEN '".$db->idate(dol_get_first_day($year, $month))."' AND '".$db->idate(dol_get_last_day($year, $month))."'"; $sql.= " AND p.rowid in (".$projectsListId.")"; -$sql.= " GROUP BY p.rowid, p.ref, p.title"; +$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; $resql = $db->query($sql); if ( $resql ) @@ -305,6 +308,7 @@ if ( $resql ) $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; $projectstatic->title=$row->title; + $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; print ''.convertSecondToTime($row->nb, 'allhourmin').''; @@ -333,7 +337,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) print ''.$langs->trans("Time").''; print "\n"; - $sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb"; + $sql = "SELECT p.rowid, p.ref, p.title, p.public, 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"; @@ -343,7 +347,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) $sql.= " AND tt.fk_user = ".$user->id; $sql.= " AND YEAR(task_date) = '".strftime("%Y",$now)."'"; $sql.= " AND p.rowid in (".$projectsListId.")"; - $sql.= " GROUP BY p.rowid, p.ref, p.title"; + $sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; $var=false; $resql = $db->query($sql); @@ -356,6 +360,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; $projectstatic->title=$row->title; + $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; print ''.convertSecondToTime($row->nb, 'allhourmin').''; @@ -418,7 +423,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) $max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA); - $sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent"; + $sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; @@ -436,7 +441,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) } if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; $sql.= " AND p.fk_statut=1"; - $sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee"; + $sql.= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee"; $sql.= " ORDER BY t.dateo desc, t.rowid desc, t.datee"; $sql.= $db->plimit($max+1); // We want more to know if we have more than limit @@ -484,6 +489,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) $projectstatic->id=$obj->projectid; $projectstatic->ref=$obj->ref; $projectstatic->title=$obj->title; + $projectstatic->public=$obj->public; print $projectstatic->getNomUrl(1,'',16,'','
'); //print ''.$obj->title.''; print '';