[Gforge-commits] gforge/common/pm ProjectTask.class, 1.31, 1.32 ProjectTasksForUser.class, 1.3, 1.4

[ruben]

Update of /cvsroot/gforge/gforge/common/pm
In directory db.perdue.net:/tmp/cvs-serv15734/common/pm

Modified Files:
        ProjectTask.class ProjectTasksForUser.class 
Log Message:
added option to delete a task or artifact

Index: ProjectTask.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/pm/ProjectTask.class,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ProjectTask.class   8 Dec 2004 19:08:24 -0000       1.31
+++ ProjectTask.class   20 Dec 2004 16:53:24 -0000      1.32
@@ -182,6 +182,7 @@
                                db_rollback();
                                return false;
                        } elseif (!$this->setAssignedTo($assigned_arr)) {
+                               print_r($assigned_arr);
                                db_rollback();
                                return false;
                        } else {
@@ -491,27 +492,50 @@
                        return false;
                }
                db_begin();
-               db_query("DELETE FROM project_assigned_to
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '4'.db_error();
-               db_query("DELETE FROM project_dependencies
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '5'.db_error();
-               db_query("DELETE FROM project_history
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '6'.db_error();
-               db_query("DELETE FROM project_messages
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '7'.db_error();
-               db_query("DELETE FROM project_task_artifact
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '8'.db_error();
-               db_query("DELETE FROM rep_time_tracking
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '9'.db_error();
-               db_query("DELETE FROM project_task
-                       WHERE project_task_id='".$this->getID()."'");
-//echo '11'.db_error();
+
+               $res = db_query("DELETE FROM project_assigned_to WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting assigned users 
relationship: '.db_error());
+                       db_rollback();
+                       return false;
+               }
+               $res = db_query("DELETE FROM project_dependencies WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting dependencies: 
'.db_error());
+                       db_rollback();
+                       return false;
+               }
+               $res = db_query("DELETE FROM project_history WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting history: '.db_error());
+                       db_rollback();
+                       return false;
+               }
+               $res = db_query("DELETE FROM project_messages WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting messages: '.db_error());
+                       db_rollback();
+                       return false;
+               }
+               $res = db_query("DELETE FROM project_task_artifact      WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting artifacts: 
'.db_error());
+                       db_rollback();
+                       return false;
+               }
+               $res = db_query("DELETE FROM rep_time_tracking  WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting time tracking report: 
'.db_error());
+                       db_rollback();
+                       return false;
+               }
+               $res = db_query("DELETE FROM project_task WHERE 
project_task_id='".$this->getID()."'");
+               if (!$res) {
+                       $this->setError('Error deleting task: '.db_error());
+                       db_rollback();
+                       return false;
+               }
+
                if ($this->getStatusID() == 3) {
                        //no need to update project_counts_agg
                } else {
@@ -527,6 +551,7 @@
                        }
                }
                db_commit();
+               return true;
        }
 
        /**

Index: ProjectTasksForUser.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/pm/ProjectTasksForUser.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ProjectTasksForUser.class   23 Jun 2003 19:54:05 -0000      1.3
+++ ProjectTasksForUser.class   20 Dec 2004 16:53:24 -0000      1.4
@@ -84,5 +84,24 @@
                        ORDER BY group_name,project_name";
                return $this->getTasksFromSQL($sql);
        }
+       
+       function getTasksForToday() {
+               $now = getdate();
+               $today = mktime (18, 00, 00, $now['mon'], $now['mday'], 
$now['year']);
+               
+               $sql = "SELECT ptv.*,g.group_name,pgl.project_name 
+                       FROM project_task_vw ptv,
+                               project_assigned_to pat,
+                               groups g,
+                               project_group_list pgl
+                       WHERE ptv.project_task_id=pat.project_task_id
+                               AND pgl.group_id=g.group_id
+                               AND pgl.group_project_id=ptv.group_project_id
+                               AND ptv.start_date < '$today'
+                               AND ptv.status_id=1
+                               AND 
pat.assigned_to_id='".$this->User->getID()."'
+                       ORDER BY group_name,project_name";
+               return $this->getTasksFromSQL($sql);
+       }
 }
 ?>