Update the database
*/
- $period_threshold = time() - period2seconds($period, $span) ;
+ $period_threshold = period2timestamp($period, $span) ;
if ($what=="aging") {
$start = getIntFromRequest('start');
FROM project_group_list,project_task
WHERE project_group_list.group_project_id=project_task.group_project_id
AND project_task.status_id = 1
-AND project_group_list.group_id=$1
-AND start_date >= $2
-GROUP BY subproject',
- array ($group_id,
- $period_threshold)) ;
- $qpa2 = db_construct_qpa(false, 'SELECT project_group_list.project_name AS Subproject, count(*) AS Count
+AND project_group_list.group_id=$1', array ($group_id));
+ if ($period_threshold) {
+ $qpa1 = db_construct_qpa($qpa1, ' AND start_date >= $1 ', array ($period_threshold));
+ }
+ $qpa1 = db_construct_qpa($qpa1, ' GROUP BY subproject');
+
+ $qpa2 = db_construct_qpa(false, 'SELECT project_group_list.project_name AS subproject, count(*) AS Count
FROM project_group_list,project_task
WHERE project_group_list.group_project_id=project_task.group_project_id
AND project_task.status_id <> 3
-AND project_group_list.group_id=$1
-AND start_date >= $2
-GROUP BY subproject',
- array ($group_id,
- $period_threshold)) ;
+AND project_group_list.group_id=$1', array ($group_id));
+ if ($period_threshold) {
+ $qpa2 = db_construct_qpa($qpa2, ' AND start_date >= $1 ', array ($period_threshold));
+ }
+ $qpa2 = db_construct_qpa($qpa2, ' GROUP BY subproject');
pm_quick_report($group_id,
_('Tasks By Category'),
AND project_assigned_to.project_task_id=project_task.project_task_id
AND project_task.group_project_id=project_group_list.group_project_id
AND project_task.status_id = 1
-AND project_group_list.group_id=$1
-AND start_date >= $2
-GROUP BY technician',
- array ($group_id,
- $period_threshold)) ;
+AND project_group_list.group_id=$1', array ($group_id));
+ if ($period_threshold) {
+ $qpa1 = db_construct_qpa($qpa1, ' AND start_date >= $1 ', array ($period_threshold));
+ }
+ $qpa1 = db_construct_qpa($qpa1, ' GROUP BY technician');
$qpa2 = db_construct_qpa(false, 'SELECT users.user_name AS technician, count(*) AS Count
FROM users,project_group_list,project_task,project_assigned_to
AND project_assigned_to.project_task_id=project_task.project_task_id
AND project_task.group_project_id=project_group_list.group_project_id
AND project_task.status_id <> 3
-AND project_group_list.group_id=$1
-AND start_date >= $2
-GROUP BY technician',
- array ($group_id,
- $period_threshold)) ;
+AND project_group_list.group_id=$1', array ($group_id));
+ if ($period_threshold) {
+ $qpa2 = db_construct_qpa($qpa2, ' AND start_date >= $1 ', array ($period_threshold));
+ }
+ $qpa2 = db_construct_qpa($qpa2, ' GROUP BY technician');
pm_quick_report($group_id,
_('Tasks By Assignee'),