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.4 by pjm2, Sun Jan 7 13:05:21 2001 UTC vs.
Revision 1.8 by pjm2, Sun Jan 7 13:49:54 2001 UTC

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

Diff Legend

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