From 947c1b932a42ef613fba77dc7f249a9234797e87 Mon Sep 17 00:00:00 2001 From: arjen Date: Tue, 15 Jul 2003 11:06:45 +0000 Subject: [PATCH] Removed parameters are displayed in a shaded style. --- src/web/gnucomo.css | 6 +++++ src/web/parameter.php | 52 ++++++++++++++++++++++++++----------------- src/web/parameter_compare.php | 41 ++++++++++++++++++++++++---------- 3 files changed, 66 insertions(+), 33 deletions(-) diff --git a/src/web/gnucomo.css b/src/web/gnucomo.css index 5e495f3..e155053 100644 --- a/src/web/gnucomo.css +++ b/src/web/gnucomo.css @@ -105,6 +105,12 @@ td.both font-family : sans-serif ; } +td.shaded +{ + color : lightgray ; + font-family : sans-serif ; +} + textarea { width : 60em ; diff --git a/src/web/parameter.php b/src/web/parameter.php index ce19381..d612b4d 100644 --- a/src/web/parameter.php +++ b/src/web/parameter.php @@ -9,7 +9,7 @@ *********************** ** FILE NAME : parameter.php ** SYSTEM NAME : Gnucomo - Gnu Computer Monitoring -** VERSION NUMBER : $Revision: 1.4 $ +** VERSION NUMBER : $Revision: 1.5 $ ** ** DESCRIPTION : ** @@ -27,7 +27,10 @@ /***************************** $Log: parameter.php,v $ - Revision 1.4 2003-02-21 08:50:12 arjen + Revision 1.5 2003-07-15 11:06:45 arjen + Removed parameters are displayed in a shaded style. + + Revision 1.4 2003/02/21 08:50:12 arjen Database optimizations. Revision 1.3 2003/02/13 09:01:29 arjen @@ -38,7 +41,7 @@ ******************************/ -// RCSID = "$Id: parameter.php,v 1.4 2003-02-21 08:50:12 arjen Exp $"; +// RCSID = "$Id: parameter.php,v 1.5 2003-07-15 11:06:45 arjen Exp $"; ini_set('include_path', '.:./classes:../phpclasses'); @@ -94,25 +97,32 @@ class param_page extends page while ($row < pg_numrows($res)) { $par = pg_fetch_object($res, $row); - ?> - - class?> - - name?> - - description?> - - database, "SELECT name, value FROM property - WHERE paramid=CAST('" . $par->paramid . "' AS BIGINT)"); - for ($p = 0; $p < pg_numrows($r); $p++) - { - $prop = pg_fetch_object($r, $p); - echo $prop->name . "=" . $prop->value . " "; - } + $qry ="select change_nature from history where paramid= CAST('"; + $qry .= $par->paramid . "' AS BIGINT) order by modified desc"; + $rhist = pg_exec($this->database, $qry); + $hist = pg_fetch_object($rhist, 0); + if ($hist->change_nature != "REMOVED") + { ?> - - + class?> + + name?> + + description?> + + database, "SELECT name, value FROM property + WHERE paramid=CAST('" . $par->paramid . "' AS BIGINT)"); + for ($p = 0; $p < pg_numrows($r); $p++) + { + $prop = pg_fetch_object($r, $p); + echo $prop->name . "=" . $prop->value . " "; + } + ?> + + "; diff --git a/src/web/parameter_compare.php b/src/web/parameter_compare.php index 60df21c..9cc64bd 100644 --- a/src/web/parameter_compare.php +++ b/src/web/parameter_compare.php @@ -9,7 +9,7 @@ *********************** ** FILE NAME : parameter_compare.php ** SYSTEM NAME : Gnucomo - Gnu Computer Monitoring -** VERSION NUMBER : $Revision: 1.3 $ +** VERSION NUMBER : $Revision: 1.4 $ ** ** DESCRIPTION : ** @@ -27,7 +27,10 @@ /***************************** $Log: parameter_compare.php,v $ - Revision 1.3 2003-02-13 09:01:29 arjen + Revision 1.4 2003-07-15 11:06:45 arjen + Removed parameters are displayed in a shaded style. + + Revision 1.3 2003/02/13 09:01:29 arjen All web interface pages use the page class. Revision 1.2 2003/02/05 09:47:39 arjen @@ -35,7 +38,7 @@ ******************************/ -// RCSID = "$Id: parameter_compare.php,v 1.3 2003-02-13 09:01:29 arjen Exp $"; +// RCSID = "$Id: parameter_compare.php,v 1.4 2003-07-15 11:06:45 arjen Exp $"; ini_set('include_path', '.:./classes:../phpclasses'); @@ -83,8 +86,12 @@ function property_compare($prop, $comp) /* Display a parameter in two adjecent table cells */ -function display_parameter($name, $properties, $css_class = "") +function display_parameter($name, $properties, $css_class = "", $shaded = FALSE) { + if ($shaded) + { + $css_class = 'shaded'; + } echo "database, $qry); + $hist = pg_fetch_object($rhist, 0); + + return $hist->change_nature == "REMOVED"; + } + function Body() { if (!empty($_POST['oid'])) @@ -147,8 +164,8 @@ class param_diff extends page $prnext = param_properties($this->database, $nextpar->paramid); if (property_compare($pr, $prnext)) { - display_parameter($par->name, $pr); - display_parameter($nextpar->name, $prnext); + display_parameter($par->name, $pr, "", $this->is_removed($par->paramid)); + display_parameter($nextpar->name, $prnext, "", $this->is_removed($nextpar->paramid)); } else { @@ -157,13 +174,13 @@ class param_diff extends page if ($par->objectid == $obj->objectid) { - display_parameter($par->name, $pr, "both"); - display_parameter($nextpar->name, $prnext, "both"); + display_parameter($par->name, $pr, "both", $this->is_removed($par->paramid)); + display_parameter($nextpar->name, $prnext, "both", $this->is_removed($nextpar->paramid)); } else { - display_parameter($nextpar->name, $prnext, "both"); - display_parameter($par->name, $pr, "both"); + display_parameter($nextpar->name, $prnext, "both", $this->is_removed($nextpar->paramid)); + display_parameter($par->name, $pr, "both", $this->is_removed($par->paramid)); } } } @@ -177,7 +194,7 @@ class param_diff extends page { /* Parameter belongs to the object on the left */ - display_parameter($par->name, $pr, "left"); + display_parameter($par->name, $pr, "left", $this->is_removed($par->paramid)); echo "  "; } else @@ -186,7 +203,7 @@ class param_diff extends page echo ""; echo "  "; - display_parameter($par->name, $pr, "right"); + display_parameter($par->name, $pr, "right", $this->is_removed($par->paramid)); } } echo "\n"; -- 2.11.0