[prev in list] [next in list] [prev in thread] [next in thread] 

List:       os-sim-commits
Subject:    [Os-sim-commits] os-sim/www/control_panel global_score.php, 1.104,
From:       Dominique Karg <dkarg () users ! sourceforge ! net>
Date:       2007-01-24 11:00:47
Message-ID: E1H9fs2-0002qZ-2q () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/os-sim/os-sim/www/control_panel
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25866

Modified Files:
	global_score.php 
Log Message:
Incidents start/end of event default value.


Index: global_score.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/control_panel/global_score.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- global_score.php	24 Jan 2007 09:55:53 -0000	1.104
+++ global_score.php	24 Jan 2007 11:00:45 -0000	1.105
@@ -22,6 +22,7 @@
 ////////////////////////////////////////////////////////////////
 
 $valid_range = array('day', 'week', 'month', 'year');
+
 $range = GET('range');
 if (!$range) {
     $range = 'day';
@@ -29,6 +30,7 @@
     die(ossim_error('Invalid range'));
 }
 
+
 if ($range == 'day') {
     $rrd_start = "N-1D";
 } elseif ($range == 'week') {
@@ -416,6 +418,14 @@
     $metric    = $GLOBALS['_max'];
     $threshold = $GLOBALS['_threshold'];
     $ac        = $GLOBALS['_ac'];
+    $max_date  = $GLOBALS['_max_date'];
+    global $range;
+
+    $range_translations = array("day" => "today", "week" => "this week", "month" => \
"this month", "year" => "this year"); +
+    if($max_date == 0){
+	$max_date = $range_translations[$range];
+    }
     
     $title = sprintf(_("Metric Threshold: %s level exceeded"), strtoupper($ac));
     $target = "$subject_type: $subject";
@@ -431,7 +441,9 @@
         "priority=$priority&" .
         "target=".urlencode($target)."&" .
         "metric_type=$type&" .
-        "metric_value=$metric'>".
+        "metric_value=$metric&".
+        "event_start=$max_date&" .
+        "event_end=$max_date'>".
         '<img src="../pixmaps/incident.png" width="12" alt="i" border="0"/>'.
         '</a>';
     return $html;


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Os-sim-commits mailing list
Os-sim-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/os-sim-commits


[prev in list] [next in list] [prev in thread] [next in thread]