[Fusionforge-commits] r7869 - in trunk/gforge/www/pm: . reporting
Roland Mas
lolando at libremir.placard.fr.eu.org
Fri Jun 19 11:56:40 CEST 2009
Author: lolando
Date: 2009-06-19 11:56:40 +0200 (Fri, 19 Jun 2009)
New Revision: 7869
Modified:
trunk/gforge/www/pm/detail_task.php
trunk/gforge/www/pm/reporting/index.php
Log:
Semi-automated db_query_params() transition for simple cases
Modified: trunk/gforge/www/pm/detail_task.php
===================================================================
--- trunk/gforge/www/pm/detail_task.php 2009-06-19 09:56:32 UTC (rev 7868)
+++ trunk/gforge/www/pm/detail_task.php 2009-06-19 09:56:40 UTC (rev 7869)
@@ -77,8 +77,9 @@
to pass into multiple select box
*/
- $result2=db_query("SELECT users.user_name AS User_Name FROM users,project_assigned_to
- WHERE users.user_id=project_assigned_to.assigned_to_id AND project_task_id='$project_task_id'");
+ $result2=db_query_params ('SELECT users.user_name AS User_Name FROM users,project_assigned_to
+ WHERE users.user_id=project_assigned_to.assigned_to_id AND project_task_id=$1',
+ array($project_task_id));
ShowResultSet($result2,_('Assigned to'), false, false);
?>
</td>
@@ -88,9 +89,10 @@
Get the list of ids this is dependent on and convert to array
to pass into multiple select box
*/
- $result2=db_query("SELECT project_task.summary FROM project_dependencies,project_task
+ $result2=db_query_params ('SELECT project_task.summary FROM project_dependencies,project_task
WHERE is_dependent_on_task_id=project_task.project_task_id
- AND project_dependencies.project_task_id='$project_task_id'");
+ AND project_dependencies.project_task_id=$1',
+ array($project_task_id));
ShowResultSet($result2,_('Dependent on task'), false, false);
?>
</td>
Modified: trunk/gforge/www/pm/reporting/index.php
===================================================================
--- trunk/gforge/www/pm/reporting/index.php 2009-06-19 09:56:32 UTC (rev 7868)
+++ trunk/gforge/www/pm/reporting/index.php 2009-06-19 09:56:40 UTC (rev 7869)
@@ -112,13 +112,13 @@
$start=($time_now-($counter*$sub_duration));
$end=($time_now-(($counter-1)*$sub_duration));
- $sql="SELECT avg((end_date-start_date)/(24*60*60)) ".
- "FROM project_task,project_group_list ".
- "WHERE end_date > 0 ".
- "AND (start_date >= '$start' AND start_date <= '$end') ".
- "AND project_task.status_id=2 ".
- "AND project_group_list.group_project_id=project_task.group_project_id ".
- "AND project_group_list.group_id='$group_id' ";
+ $sql="SELECT avg((end_date-start_date)/(24*60*60))
+FROM project_task,project_group_list
+WHERE end_date > 0
+AND (start_date >= '$start' AND start_date <= '$end')
+AND project_task.status_id=2
+AND project_group_list.group_project_id=project_task.group_project_id
+AND project_group_list.group_id='$group_id' ";
$result = db_query($sql);
@@ -135,12 +135,12 @@
$start=($time_now-($counter*$sub_duration));
$end=($time_now-(($counter-1)*$sub_duration));
- $sql="SELECT count(*) ".
- "FROM project_task,project_group_list ".
- "WHERE start_date >= '$start' ".
- "AND start_date <= '$end' ".
- "AND project_group_list.group_project_id=project_task.group_project_id ".
- "AND project_group_list.group_id='$group_id' ";
+ $sql="SELECT count(*)
+FROM project_task,project_group_list
+WHERE start_date >= '$start'
+AND start_date <= '$end'
+AND project_group_list.group_project_id=project_task.group_project_id
+AND project_group_list.group_id='$group_id' ";
$result = db_query($sql);
@@ -157,12 +157,12 @@
$start=($time_now-($counter*$sub_duration));
$end=($time_now-(($counter-1)*$sub_duration));
- $sql="SELECT count(*) ".
- "FROM project_task,project_group_list ".
- "WHERE start_date <= '$end' ".
- "AND (end_date >= '$end' OR end_date < 1 OR end_date is null) ".
- "AND project_group_list.group_project_id=project_task.group_project_id ".
- "AND project_group_list.group_id='$group_id' ";
+ $sql="SELECT count(*)
+FROM project_task,project_group_list
+WHERE start_date <= '$end'
+AND (end_date >= '$end' OR end_date < 1 OR end_date is null)
+AND project_group_list.group_project_id=project_task.group_project_id
+AND project_group_list.group_id='$group_id' ";
$result = db_query($sql);
@@ -178,18 +178,18 @@
} else if ($what=="subproject") {
- $sql1="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 = '1' ".
- "AND project_group_list.group_id='$group_id' ".
+ $sql1="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 = '1'
+AND project_group_list.group_id='$group_id' ".
$period_clause .
"GROUP BY Subproject";
- $sql2="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='$group_id' ".
+ $sql2="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='$group_id' ".
$period_clause .
"GROUP BY Subproject";
@@ -200,23 +200,23 @@
} else if ($what=="tech") {
- $sql1="SELECT users.user_name AS Technician, count(*) AS Count ".
- "FROM users,project_group_list,project_task,project_assigned_to ".
- "WHERE users.user_id=project_assigned_to.assigned_to_id ".
- "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='$group_id' ".
+ $sql1="SELECT users.user_name AS Technician, count(*) AS Count
+FROM users,project_group_list,project_task,project_assigned_to
+WHERE users.user_id=project_assigned_to.assigned_to_id
+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='$group_id' ".
$period_clause .
"GROUP BY Technician";
- $sql2="SELECT users.user_name AS Technician, count(*) AS Count ".
- "FROM users,project_group_list,project_task,project_assigned_to ".
- "WHERE users.user_id=project_assigned_to.assigned_to_id ".
- "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='$group_id' ".
+ $sql2="SELECT users.user_name AS Technician, count(*) AS Count
+FROM users,project_group_list,project_task,project_assigned_to
+WHERE users.user_id=project_assigned_to.assigned_to_id
+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='$group_id' ".
$period_clause .
"GROUP BY Technician";
More information about the Fusionforge-commits
mailing list