Menu
▾
▴
[Tikiwiki-cvs] tiki/lib/Galaxia/src/ProcessMonitor ProcessMonitor.php,1.12.4.1,1.12.4.2
|
From: <geo...@us...> - 2006-01-26 19:34:43
|
Update of /cvsroot/tikiwiki/tiki/lib/Galaxia/src/ProcessMonitor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17242 Modified Files: Tag: BRANCH-1-9 ProcessMonitor.php Log Message: Add Instance name and status and fix elapsed time in Monitor workitems screen Index: ProcessMonitor.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/Galaxia/src/ProcessMonitor/ProcessMonitor.php,v retrieving revision 1.12.4.1 retrieving revision 1.12.4.2 diff -u -d -r1.12.4.1 -r1.12.4.2 --- ProcessMonitor.php 1 Feb 2005 16:13:53 -0000 1.12.4.1 +++ ProcessMonitor.php 26 Jan 2006 19:34:33 -0000 1.12.4.2 @@ -372,9 +372,16 @@ $mid.=" and (`properties` like $findesc)"; } // TODO: retrieve instance status as well - $query = "select `itemId`,`ended`-`started` as duration,ga.`isInteractive`, ga.`type`,gp.`name` as procname,gp.`version`,ga.`name` as actname,"; - $query.= "ga.`activityId`,`instanceId`,`orderId`,`properties`,`started`,`ended`,`user` from `".GALAXIA_TABLE_PREFIX."workitems` gw,`".GALAXIA_TABLE_PREFIX."activities` ga,`".GALAXIA_TABLE_PREFIX."processes` gp "; - $query.= "where gw.`activityId`=ga.`activityId` and ga.`pId`=gp.`pId` $mid order by gp.`pId` desc,".$this->convert_sortmode($sort_mode); + $query = "SELECT `itemId`, DATEDIFF(FROM_UNIXTIME(gw.`started`), FROM_UNIXTIME(gw.`ended`)) AS duration, "; + $query .= "ga.`isInteractive`, ga.`type`, gp.`name` AS procname, gp.`version`, ga.`name` AS actname, "; + $query .= "ga.`activityId`, gw.`instanceId`, gi.`name` AS iname, `orderId`, gw.`properties`, gw.`started`, "; + $query .= "gi.`status`, gw.`ended`, `user` FROM "; + $query .= "`" . GALAXIA_TABLE_PREFIX . "workitems` gw, `" . GALAXIA_TABLE_PREFIX . "activities` ga, "; + $query .= "`" . GALAXIA_TABLE_PREFIX . "processes` gp, `" . GALAXIA_TABLE_PREFIX . "instances` gi "; + $query .= "WHERE gw.`activityId` = ga.`activityId` AND ga.`pId` = gp.`pId` "; + $query .= "AND gw.`instanceId` = gi.`instanceId` $mid ORDER BY gp.`pId` DESC, "; + $query .= $this->convert_sortmode($sort_mode); + $query_cant = "select count(*) from `".GALAXIA_TABLE_PREFIX."workitems` gw,`".GALAXIA_TABLE_PREFIX."activities` ga,`".GALAXIA_TABLE_PREFIX."processes` gp where gw.`activityId`=ga.`activityId` and ga.`pId`=gp.`pId` $mid"; $result = $this->query($query,$wherevars,$maxRecords,$offset); $cant = $this->getOne($query_cant,$wherevars); |