From 44d32af65250cecb49926da806a5bfb124fe8d22 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Wed, 9 Sep 2009 12:44:06 +0000 Subject: [PATCH] Cosmetics on the run query page SVN:trunk[123] --- pages/run_query.php | 73 ++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/pages/run_query.php b/pages/run_query.php index 76cd4bad8..4539213be 100644 --- a/pages/run_query.php +++ b/pages/run_query.php @@ -10,49 +10,60 @@ login_web_page::DoLogin(); // Check user rights and prompt if needed function ShowExamples($oP, $sExpression) { + $bUsingExample = false; + $aExamples = array( - "Applications" => "SELECT bizApplication", - "Changes planned on new year's day" => "SELECT bizChangeTicket AS ch WHERE ch.start_date >= '2009-12-31' AND ch.end_date <= '2010-01-01'", - "Person having an 'A' in their name" => "SELECT bizPerson AS B WHERE B.name LIKE '%A%'", - "NW interfaces of equipment in production for customer 'Demo'" => "SELECT bizInterface AS if JOIN bizDevice AS dev ON if.device_id = dev.id WHERE if.status = 'production' AND dev.status = 'production' AND dev.org_name = 'Demo' AND if.physical_type = 'ethernet'", - "My tickets" => "SELECT bizIncidentTicket AS i WHERE i.agent_id = :current_contact_id", - "People being owner of an active ticket" => "SELECT bizPerson AS p JOIN bizIncidentTicket AS i ON i.agent_id = p.id WHERE i.ticket_status != 'Closed'", - "Contracts terminating in the next thirty days" => "SELECT bizContract AS c WHERE c.end_prod > NOW() AND c.end_prod < DATE_ADD(NOW(), INTERVAL 30 DAY)", - "Orphan tickets (opened one hour ago, still not assigned)" => "SELECT bizIncidentTicket AS i WHERE i.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND i.ticket_status = 'New'", - "Long lasting incidents (duration > 8 hours)" => "SELECT bizIncidentTicket AS i WHERE i.end_date > DATE_ADD(i.start_date, INTERVAL 8 HOUR)", + 'Pedagogic examples' => array( + "Applications" => "SELECT bizApplication", + "Person having an 'A' in their name" => "SELECT bizPerson AS B WHERE B.name LIKE '%A%'", + "Changes planned on new year's day" => "SELECT bizChangeTicket AS ch WHERE ch.start_date >= '2009-12-31' AND ch.end_date <= '2010-01-01'", + ), + 'Usefull examples' => array( + "Applications" => "SELECT bizApplication", + "NW interfaces of equipment in production for customer 'Demo'" => "SELECT bizInterface AS if JOIN bizDevice AS dev ON if.device_id = dev.id WHERE if.status = 'production' AND dev.status = 'production' AND dev.org_name = 'Demo' AND if.physical_type = 'ethernet'", + "My tickets" => "SELECT bizIncidentTicket AS i WHERE i.agent_id = :current_contact_id", + "People being owner of an active ticket" => "SELECT bizPerson AS p JOIN bizIncidentTicket AS i ON i.agent_id = p.id WHERE i.ticket_status != 'Closed'", + "Contracts terminating in the next thirty days" => "SELECT bizContract AS c WHERE c.end_prod > NOW() AND c.end_prod < DATE_ADD(NOW(), INTERVAL 30 DAY)", + "Orphan tickets (opened one hour ago, still not assigned)" => "SELECT bizIncidentTicket AS i WHERE i.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND i.ticket_status = 'New'", + "Long lasting incidents (duration > 8 hours)" => "SELECT bizIncidentTicket AS i WHERE i.end_date > DATE_ADD(i.start_date, INTERVAL 8 HOUR)", + ), ); $aDisplayData = array(); - foreach($aExamples as $sDescription => $sOql) + foreach($aExamples as $sTopic => $aQueries) { - $sHighlight = ''; - $sDisable = ''; - if ($sOql == $sExpression) + foreach($aQueries as $sDescription => $sOql) { - // this one is currently being tested, highlight it - $sHighlight = "background-color:yellow;"; - $sDisable = 'disabled'; + $sHighlight = ''; + $sDisable = ''; + if ($sOql == $sExpression) + { + // this one is currently being tested, highlight it + $sHighlight = "background-color:yellow;"; + $sDisable = 'disabled'; + // and remember we are testing a query of the list + $bUsingExample = true; + } + //$aDisplayData[$sTopic][] = array( + $aDisplayData['Query examples'][] = array( + 'desc' => "
".htmlentities($sDescription)."
", + 'oql' => "
".htmlentities($sOql)."
", + 'go' => "
\n", + ); } - $aDisplayData[] = array( - 'desc' => "
$sDescription
", - 'oql' => "
$sOql
", - 'go' => "
\n", - ); } $aDisplayConfig = array(); $aDisplayConfig['desc'] = array('label' => 'Target', 'description' => ''); $aDisplayConfig['oql'] = array('label' => 'OQL Expression', 'description' => ''); $aDisplayConfig['go'] = array('label' => '', 'description' => ''); - $sStyle = "SearchDrawer DrawerClosed"; - $oP->add_ready_script("\$(\"#examples_drawer_handle_id\").click(function() {\$(\"#examples_contents_id\").slideToggle('normal'); $(\"#examples_drawer_handle_id\").toggleClass('open');});"); - $oP->add("
\n"); - - $oP->table($aDisplayConfig, $aDisplayData); - - $oP->add("
\n"); - $oP->add("
\n"); - $oP->add("
Some examples
\n"); + foreach ($aDisplayData as $sTopic => $aQueriesDisplayData) + { + $bShowOpened = $bUsingExample; + $oP->StartCollapsibleSection($sTopic, $bShowOpened); + $oP->table($aDisplayConfig, $aQueriesDisplayData); + $oP->EndCollapsibleSection(); + } } $sOperation = utils::ReadParam('operation', 'menu'); @@ -87,7 +98,7 @@ try $oP->add("
\n"); $oP->add("Expression to evaluate:
\n"); - $oP->add("\n"); + $oP->add("\n"); $oP->add("\n"); $oP->add("
\n");