[evolvis-commits] r18188: theme-mypage pending merges:↵ Thorsten Glaser 2012-03-14 [#2364] order SQL results↵ Thorsten Glaser 2012-03-14 indent the SQL (no code changes)↵ Thorsten Glaser 2012-03-14 [#2364] order trackers by group then tracker name (human-readable)

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Mar 14 19:58:50 CET 2012


Author: mirabilos
Date: 2012-03-14 19:58:49 +0100 (Wed, 14 Mar 2012)
New Revision: 18188

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyArtifacts.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyTasks.class.php
Log:
theme-mypage pending merges:
  Thorsten Glaser 2012-03-14 [#2364] order SQL results
    Thorsten Glaser 2012-03-14 indent the SQL (no code changes)
    Thorsten Glaser 2012-03-14 [#2364] order trackers by group then tracker name (human-readable)


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyArtifacts.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyArtifacts.class.php	2012-03-14 18:58:43 UTC (rev 18187)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyArtifacts.class.php	2012-03-14 18:58:49 UTC (rev 18188)
@@ -96,7 +96,18 @@
 		$atf = new ArtifactsForUser(@UserManager::instance()->getCurrentUser());
 		$assigned = $atf->getAssignedArtifactsByGroup();
 		$submitted = $atf->getSubmittedArtifactsByGroup();
-		$all = $atf->getArtifactsFromSQLWithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR  av.assigned_to=$1) AND av.status_id=1 ORDER BY av.group_artifact_id, av.priority DESC, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID()));
+		$all = $atf->getArtifactsFromSQLwithParams('
+			SELECT av.*
+			FROM artifact_vw av, artifact_group_list agl
+			WHERE (av.submitted_by=$1 OR av.assigned_to=$1)
+			    AND av.status_id=1
+			    AND agl.group_artifact_id=av.group_artifact_id
+			ORDER BY
+			    agl.group_id,
+			    agl.name,
+			    av.priority DESC,
+			    av.artifact_id DESC',
+		    array(UserManager::instance()->getCurrentUser()->getID()));
 		if($this->_artifact_show == 'AS'){
 			$my_artifacts=$all;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyTasks.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyTasks.class.php	2012-03-14 18:58:43 UTC (rev 18187)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyTasks.class.php	2012-03-14 18:58:49 UTC (rev 18188)
@@ -36,16 +36,28 @@
         $this->content = '';
         $this->setOwner(user_getid(), WidgetLayoutManager::OWNER_TYPE_USER);
         $last_group=0;
-    
-        $sql = 'SELECT groups.group_id, groups.group_name, project_group_list.group_project_id, project_group_list.project_name '.
-            'FROM groups,project_group_list,project_task,project_assigned_to '.
-            'WHERE project_task.project_task_id=project_assigned_to.project_task_id '.
-            'AND project_assigned_to.assigned_to_id=$1'.
-            ' AND project_task.status_id IN (1, 4, 5, 6) AND project_group_list.group_id=groups.group_id '.
-            "AND project_group_list.is_public!='9' ".
-          'AND project_group_list.group_project_id=project_task.group_project_id GROUP BY groups.group_id, groups.group_name, project_group_list.project_name, project_group_list.group_project_id';
-    
-        $result=db_query_params($sql,array(user_getid()));
+
+        $result = db_query_params("
+	    SELECT
+		groups.group_id, groups.group_name,
+		project_group_list.group_project_id,
+		project_group_list.project_name
+	    FROM
+		groups, project_group_list, project_task, project_assigned_to
+	    WHERE
+		project_task.project_task_id=project_assigned_to.project_task_id
+	    AND project_assigned_to.assigned_to_id=$1
+	    AND project_task.status_id IN (1, 4, 5, 6)
+	    AND project_group_list.group_id=groups.group_id
+	    AND project_group_list.is_public!='9'
+	    AND project_group_list.group_project_id=project_task.group_project_id
+	    GROUP BY
+		groups.group_id, groups.group_name,
+		project_group_list.project_name,
+		project_group_list.group_project_id
+	    ORDER BY
+		groups.group_id, project_group_list.project_name
+	    ", array(user_getid()));
         $rows=db_numrows($result);
     
         if ($result && $rows >= 1) {
@@ -55,19 +67,33 @@
     
                 $group_id = db_result($result,$j,'group_id');
                 $group_project_id = db_result($result,$j,'group_project_id');
-        
-                $sql2 = 'SELECT project_task.project_task_id, project_task.priority, project_task.summary,project_task.percent_complete '.
-                    'FROM groups,project_group_list,project_task,project_assigned_to '.
-                    'WHERE project_task.project_task_id=project_assigned_to.project_task_id '.
-                    "AND project_assigned_to.assigned_to_id=$1 AND project_task.status_id IN (1, 4, 5, 6)  ".
-                    'AND project_group_list.group_id=groups.group_id '.
-                    "AND groups.group_id=$2 ".
-                    'AND project_group_list.group_project_id=project_task.group_project_id '.
-                    "AND project_group_list.is_public!='9' ".
-                   "AND project_group_list.group_project_id= $3 LIMIT 100";
-        
-        
-                $result2 = db_query_params($sql2,array(user_getid(),$group_id,$group_project_id));
+
+                $result2 = db_query_params("
+		    SELECT
+			project_task.project_task_id,
+			project_task.priority,
+			project_task.summary,
+			project_task.percent_complete
+		    FROM
+			groups, project_group_list, project_task,
+			project_assigned_to
+		    WHERE
+			project_task.project_task_id=project_assigned_to.project_task_id
+		    AND project_assigned_to.assigned_to_id=$1
+		    AND project_task.status_id IN (1, 4, 5, 6)
+		    AND project_group_list.group_id=groups.group_id
+		    AND groups.group_id=$2
+		    AND project_group_list.group_project_id=project_task.group_project_id
+		    AND project_group_list.is_public!='9'
+		    AND project_group_list.group_project_id=$3
+		    ORDER BY
+			project_task.priority DESC,
+			project_task.project_task_id DESC
+		    ", array(
+			user_getid(),
+			$group_id,
+			$group_project_id,
+		    ));
                 $rows2 = db_numrows($result2);
 
                 $vItemId = new Valid_UInt('hide_item_id');



More information about the evolvis-commits mailing list