Changeset 570

Timestamp:

03/21/11 23:38:18 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-web/trunk/src/main

Files:

• java/uk/ac/cardiff/raptorweb/engine/reports/GraphAndChartPDFReportGenerator.java (modified) (3 diffs)
• java/uk/ac/cardiff/raptorweb/engine/reports/beans/DynamicTableModel.java (modified) (2 diffs)
• java/uk/ac/cardiff/raptorweb/engine/reports/beans/SimpleRowBean.java (added)
• webapp/report-templates/generic-report.xml (modified) (3 diffs)
• webapp/report-templates/standard-report.xml (added)

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/reports/GraphAndChartPDFReportGenerator.java

@@ -50 +50 @@
 import uk.ac.cardiff.raptorweb.engine.reports.beans.DynamicTableModel;
 import uk.ac.cardiff.raptorweb.engine.reports.beans.GenericReportBean;
+import uk.ac.cardiff.raptorweb.engine.reports.beans.SimpleRowBean;
 import uk.ac.cardiff.raptorweb.model.ManyRow;
 import uk.ac.cardiff.raptorweb.model.RaptorTableChartModel;
@@ -156 +157 @@
 
         BufferedImage image = ChartProcessor.extractBufferedImage(session.getGraphmodel().getCurrentJFreeGraph().getChart(),session.getGraphmodel().getChartOptions());
-        model.setImage(image);
-
-        FastReportBuilder drb = new FastReportBuilder();
-        //drb.setTemplateFile(reportTemplateXMLFile.getCanonicalPath());
-        //drb.addField("image", java.awt.image.BufferedImage.class.getName());
+
+        //FastReportBuilder drb = new FastReportBuilder();
+        DynamicReportBuilder drb = new DynamicReportBuilder();
+        drb.setTemplateFile(reportTemplateXMLFile.getCanonicalPath());
+//      drb.addField("image", java.awt.image.BufferedImage.class.getName());
+
         Style columDetail = new Style();
         columDetail.setBorder(Border.THIN);
@@ -191 +193 @@
 
         }
-        drb.setTitle("Sample Report").setTitleStyle(titleStyle).setTitleHeight(new Integer(30)).setSubtitleHeight(new Integer(20)).setDetailHeight(new Integer(15))
-        // .setLeftMargin(margin)
-                // .setRightMargin(margin)
-                // .setTopMargin(margin)
-                // .setBottomMargin(margin)
-                .setPrintBackgroundOnOddRows(true).setOddRowBackgroundStyle(oddRowStyle).setColumnsPerPage(new Integer(1)).setUseFullPageWidth(true).setColumnSpace(new Integer(5));
+        //drb.setTitle("Sample Report").setTitleStyle(titleStyle).setTitleHeight(new Integer(30)).setSubtitleHeight(new Integer(20)).setDetailHeight(new Integer(15))
+        //      .setPrintBackgroundOnOddRows(true).setOddRowBackgroundStyle(oddRowStyle).setColumnsPerPage(new Integer(1)).setUseFullPageWidth(true).setColumnSpace(new Integer(5));
+        drb.setPrintBackgroundOnOddRows(true).setOddRowBackgroundStyle(oddRowStyle).setColumnsPerPage(new Integer(1)).setUseFullPageWidth(true).setColumnSpace(new Integer(5));
+        
+//      ArrayList beans = new ArrayList();
+//      SimpleRowBean a1 = new SimpleRowBean("header1","row1","VALUE1");
+//      SimpleRowBean a2 = new SimpleRowBean("header2","row1","VALUE2");
+//      SimpleRowBean a3 = new SimpleRowBean("header3","row1","VALUE3");
+//      beans.add(a1);
+//      beans.add(a2);
+//      beans.add(a3);
+//
+//      SimpleRowBean b1 = new SimpleRowBean("header1","row2","VALUE1");
+//      SimpleRowBean b2 = new SimpleRowBean("header2","row2","VALUE2");
+//      SimpleRowBean b3 = new SimpleRowBean("header3","row2","VALUE3");
+//      beans.add(b1);
+//      beans.add(b2);
+//      beans.add(b3);
+        
+        reportBean.setImage(image);
+        //beans.add(reportBean);
+        //JRBeanCollectionDataSource ds = new JRBeanCollectionDataSource(beans);
+        Map parameters = new HashMap();
+        parameters.put("image", image);
+        log.debug("Map: "+parameters);
+//      JasperReport jasperReport = JasperCompileManager.compileReport(reportTemplateXMLFile.getCanonicalPath());
+        
+//      JasperPrint jp = JasperFillManager.fillReport(jasperReport, parameters, ds);
+
         DynamicReport dr = drb.build();
-
         JRDataSource ds = new JRTableModelDataSource(model);
-        JasperPrint jp = DynamicJasperHelper.generateJasperPrint(dr, new ClassicLayoutManager(), ds);
+        JasperPrint jp = DynamicJasperHelper.generateJasperPrint(dr, new ClassicLayoutManager(), ds,parameters);
         return jp;
     }

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/reports/beans/DynamicTableModel.java

@@ -29 +29 @@
     /** The data. */
     private Object[][] data;
-
-    /** the graph of the image*/
-    private BufferedImage image;
 
 
@@ -115 +112 @@
 
 
-
-    public void setImage(BufferedImage image) {
-        this.image = image;
-    }
-
-
-
-    public BufferedImage getImage() {
-        return image;
-    }
-
 }

raptor-web/trunk/src/main/webapp/report-templates/generic-report.xml

@@ -4 +4 @@
         <style name="Sans_Bold" isDefault="false" fontName="DejaVu Sans" fontSize="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
         <style name="Sans_Italic" isDefault="false" fontName="DejaVu Sans" fontSize="12" isBold="false" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
-        <field name="image" class="java.awt.image.BufferedImage"/>
+        <parameter name="image" class="java.awt.Image"/>
         <field name="description" class="java.lang.String"/>
+
          <title>
-    <band height="50">
+ <!--  <band height="50">
       <staticText>
         <reportElement x="0" y="0" width="180" height="15"/>
@@ -14 +15 @@
         </textElement>
         <text><![CDATA[RaptorWeb Report]]></text>
-      </staticText>
-    </band>
-        </title>
-        <pageHeader>
-    <band/>
-        </pageHeader>
-        <detail>
-                <band height="600">
+      </staticText> 
+    </band>-->
+    <band height="600">
                         <staticText>
                                 <reportElement x="0" y="10" width="311" height="20"/>
@@ -31 +27 @@
                         <image scaleImage="RetainShape" hAlign="Center" isUsingCache="true" isLazy="true">
                                 <reportElement x="0" y="30" width="500" height="500"/>
-                                <imageExpression class="java.awt.Image"><![CDATA[$F{image}]]></imageExpression>
+                                <imageExpression class="java.awt.Image"><![CDATA[$P{image}]]></imageExpression>
                         </image>
                 </band>
+        </title>
+        <pageHeader>
+    <band/>
+        </pageHeader>
+        
+        <detail>
+                <band>
+                        <staticText>
+        <reportElement x="0" y="0" width="40" height="15"/>
+        <textElement>
+            <font fontName="DejaVu Sans" size="8"/>
+        </textElement>
+        <text><![CDATA[Page:]]></text>
+      </staticText>
+                </band>
+                
         </detail>