ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/reports/DBReporter/IscreamLayout.java
(Generate patch)

Comparing projects/cms/source/reports/DBReporter/IscreamLayout.java (file contents):
Revision 1.8 by pjm2, Sun Jan 7 13:49:54 2001 UTC vs.
Revision 1.9 by pjm2, Sun Jan 7 13:55:13 2001 UTC

# Line 71 | Line 71 | public class IscreamLayout {
71          String xAxisTitle = "Time";
72          String yAxisTitle = "Value";
73          String scaleRow = " <tr><td>&nbsp;</td><td align=\"left\">"+DateUtils.dateString(startDate)+"</td><td align=\"right\">"+DateUtils.dateString(endDate)+"</td></tr>";
74 +        int colspan = 2;
75          
76          switch (type) {
77              case ReportPage.HOUR:
78                  graphTitle = "Hourly report from "+DateUtils.dateString(startDate)+" to "+DateUtils.dateString(endDate);
79 <                scaleRow = " <tr>";
79 >                scaleRow = " <tr><td>&nbsp;</td>";
80                  for (long i = startDate; i < endDate; i+=DateUtils.secsPerHour/6){
81                      scaleRow += "<td>"+DateUtils.timeString(i)+"</td>";
82                  }
83                  scaleRow += "</tr>";
84 +                colspan = 6;
85                  break;
86              case ReportPage.DAY:
87                  graphTitle = "24 hour report from "+DateUtils.dateString(startDate)+" to "+DateUtils.dateString(endDate);
88 <                scaleRow = " <tr>";
88 >                scaleRow = " <tr><td>&nbsp;</td>";
89                  for (int i = 0; i < 24; i++){
90                      scaleRow += "<td>"+i+"</td>";
91                  }
92                  scaleRow += "</tr>";
93 +                colspan = 24;
94                  break;
95              case ReportPage.WEEK:
96                  graphTitle = "7 day report from "+DateUtils.shortDateString(startDate)+" to "+DateUtils.shortDateString(endDate);
97 <                scaleRow = " <tr>";
97 >                scaleRow = " <tr><td>&nbsp;</td>";
98                  for (long i = startDate; i < endDate; i+=DateUtils.secsPerDay){
99                      scaleRow += "<td>"+i+"</td>";
100                  }
101                  scaleRow += "</tr>";
102 +                colspan = 7;
103                  break;
104              case ReportPage.MONTH:
105                  graphTitle = "30 day report from "+DateUtils.shortDateString(startDate)+" to "+DateUtils.shortDateString(endDate);
106                  scaleRow = " <tr><td>&nbsp;</td><td align=\"left\">"+DateUtils.shortDateString(startDate)+"</td><td align=\"right\">"+DateUtils.shortDateString(endDate)+"</td></tr>";
107 +                colspan = 2;
108                  break;
109              default:
110                  // Do nothing, leave values as they are.
111          }
112          
113          bw.write("<table border=\"0\">");
114 <        bw.write(" <tr><td>&nbsp;</td><td colspan=\"2\"><b>"+graphTitle+"</b></td></tr>");
115 <        bw.write(" <tr><td>"+yAxisTitle+"</td><td colspan=\"2\"><img src=\""+filename+"\" width=\""+width+"\" height=\""+height+"\"></td></tr>");
114 >        bw.write(" <tr><td>&nbsp;</td><td colspan=\""+colspan+"\"><b>"+graphTitle+"</b></td></tr>");
115 >        bw.write(" <tr><td>"+yAxisTitle+"</td><td colspan=\""+colspan+"\"><img src=\""+filename+"\" width=\""+width+"\" height=\""+height+"\"></td></tr>");
116          bw.write(scaleRow);
117          bw.write("</table>");
118          bw.newLine();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines