From b784c171d59acb666ce4ee76f7ac3c895fa824ce Mon Sep 17 00:00:00 2001
From: cfapress <cfapress>
Date: Thu, 22 Jan 2009 18:04:04 +0000
Subject: [PATCH] cleaned up report display

---
 interface/forms/ros/report.php | 67 ++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 28 deletions(-)
 rewrite interface/forms/ros/report.php (73%)

diff --git a/interface/forms/ros/report.php b/interface/forms/ros/report.php
dissimilarity index 73%
index 0c3e69bfc..42bf7fb91 100755
--- a/interface/forms/ros/report.php
+++ b/interface/forms/ros/report.php
@@ -1,28 +1,39 @@
-<?php
-//------------Forms generated from formsWiz
-include_once("../../globals.php");
-include_once($GLOBALS["srcdir"]."/api.inc");
-function ros_report( $pid, $encounter, $cols, $id) {
-$count = 0;
-$data = formFetch("form_ros", $id);
-if ($data) {
-
-foreach($data as $key => $value) {
-if ($key == "id" || $key == "pid" || $key == "user" || $key == "groupname" || $key == "authorized" ||  $key == "date" || $value == "" || $value == "0000-00-00 00:00:00") {
-	continue;
-}
-if ($value == "on") {
-$value = "yes";
-}
-$key=ucwords(str_replace("_"," ",$key));
-print "<td><span class=bold>$key: </span><span class=text>$value</span></td>";
-$count++;
-if ($count == $cols) {
-$count = 0;
-print "</tr><tr>\n";
-}
-}
-}
-print "</tr></table>";
-}
-?> 
+<?php
+//------------Forms generated from formsWiz
+include_once("../../globals.php");
+include_once($GLOBALS["srcdir"]."/api.inc");
+
+function ros_report( $pid, $encounter, $cols, $id) {
+
+    $count = 0;
+    
+    $data = formFetch("form_ros", $id);
+
+    if ($data) {
+        print "<div id='form_ros_values' style='border: 1px solid black;'><table><tr>";
+    
+        foreach($data as $key => $value) {
+            if ($key == "id" || $key == "pid" || $key == "user" || $key == "groupname" || 
+                $key == "authorized" ||  $key == "date" || $value == "" || $value == "0000-00-00 00:00:00")
+            {
+    	        continue;
+            }
+
+            // skip the N/A values -- cfapress, Jan 2009
+            if ($value == "N/A") { continue; }
+            
+            if ($value == "on") { $value = "yes"; }
+    
+            $key=ucwords(str_replace("_"," ",$key));
+            print "<td><span class=bold>$key: </span><span class=text>$value</span></td>";
+            $count++;
+            
+            if ($count == $cols) {
+                $count = 0;
+                print "</tr><tr>\n";
+            }
+        }
+    }
+    print "</tr></table></div>";
+}
+?> 
-- 
2.11.4.GIT