diff --git a/htdocs/projet/activity/myactivity.php b/htdocs/projet/activity/myactivity.php
index a19aa4fb0dd..3adf5e24813 100644
--- a/htdocs/projet/activity/myactivity.php
+++ b/htdocs/projet/activity/myactivity.php
@@ -94,9 +94,96 @@ else
}
print "";
+/* Affichage de la liste des projets de la semaine */
+print '
';
+print '';
+print '| '.$langs->trans('Today').' | ';
+print 'Temps | ';
+print "
\n";
+
+$sql = "SELECT p.title, p.rowid, sum(tt.task_duration)";
+$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";
+
+$var=true;
+$total=0;
+$resql = $db->query($sql);
+if ( $resql )
+{
+ while ($row = $db->fetch_row($resql))
+ {
+ print "";
+ print '| '.$row[0].' | ';
+ print ''.$row[2].' | ';
+ print "
\n";
+ $total += $row[2];
+ $var=!$var;
+ }
+
+ $db->free($resql);
+}
+else
+{
+ dolibarr_print_error($db);
+}
+print "";
+print '| '.$langs->trans('Total').' | ';
+print ''.$total.' | ';
+print "
\n";
+print "
";
+
+print '
';
+print '';
+print '| '.$langs->trans('Yesterday').' | ';
+print 'Temps | ';
+print "
\n";
+
+$sql = "SELECT p.title, p.rowid, sum(tt.task_duration)";
+$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";
+
+$var=true;
+$total=0;
+$resql = $db->query($sql);
+if ( $resql )
+{
+ while ($row = $db->fetch_row($resql))
+ {
+ print "";
+ print '| '.$row[0].' | ';
+ print ''.$row[2].' | ';
+ print "
\n";
+ $total += $row[2];
+ $var=!$var;
+ }
+
+ $db->free($resql);
+}
+else
+{
+ dolibarr_print_error($db);
+}
+print "";
+print '| '.$langs->trans('Total').' | ';
+print ''.$total.' | ';
+print "
\n";
+print "
";
+
print '';
-/* Affichage de la liste des projets du mois */
+/* Affichage de la liste des projets de la semaine */
print '';
print '';
print '| Activité sur les projets cette semaine | ';
@@ -112,23 +199,19 @@ $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;
$resql = $db->query($sql);
if ( $resql )
{
- $num = $db->num_rows($resql);
- $i = 0;
-
- while ($i < $num)
+ while ($row = $db->fetch_row( $resql))
{
- $row = $db->fetch_row( $resql);
$var=!$var;
print " ";
print '| '.$row[0].' | ';
print ''.$row[2].' | ';
print " \n";
- $i++;
+ $total += $row[2];
}
$db->free($resql);
@@ -137,6 +220,10 @@ else
{
dolibarr_print_error($db);
}
+print "";
+print '| '.$langs->trans('Total').' | ';
+print ''.$total.' | ';
+print " \n";
print " ";
/* Affichage de la liste des projets du mois */
|