[icinga-checkins] icinga.org: icinga-reports/mluebben/avail-report-parser: Make changes in reports

git at icinga.org git at icinga.org
Wed Nov 16 14:26:01 CET 2011


Module: icinga-reports
Branch: mluebben/avail-report-parser
Commit: 4501cad7e7c3765096de5daf75b537677161d62b
URL:    https://git.icinga.org/?p=icinga-reports.git;a=commit;h=4501cad7e7c3765096de5daf75b537677161d62b

Author: Michael Luebben <michael_luebben at web.de>
Date:   Wed Nov 16 09:47:57 2011 +0100

Make changes in reports

---

 .../main/service/detailedAvailabilityReport.jrxml  |    2 +-
 .../detailedAvailabilityReport_example1.jrxml      |   23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport.jrxml b/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport.jrxml
index 9d3d3f9..50a6002 100644
--- a/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport.jrxml
+++ b/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport.jrxml
@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Detailed service availability report" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isTitleNewPage="true">
 	<property name="ireport.zoom" value="1.3310000000000006"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="1277"/>
+	<property name="ireport.y" value="1037"/>
 	<template><![CDATA["repo:/icinga/styles/IcingaStyleBase.jrtx"]]></template>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["repo:/icinga/templates/sub/"]]></defaultValueExpression>
diff --git a/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport_example1.jrxml b/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport_example1.jrxml
index b9cb641..9f1f8d1 100644
--- a/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport_example1.jrxml
+++ b/AvailReportParser/jasperreports/templates/main/service/detailedAvailabilityReport_example1.jrxml
@@ -3,19 +3,20 @@
 	<property name="ireport.zoom" value="1.000000000000005"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="965"/>
-	<template><![CDATA["repo:/Icinga/styles/IcingaStyleBase.jrtx"]]></template>
+	<template><![CDATA["repo:/icinga/styles/IcingaStyleBase.jrtx"]]></template>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["repo:/icingadev/templates/sub/"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["repo:/icinga/templates/sub/"]]></defaultValueExpression>
 	</parameter>
-	<parameter name="p_report_id" class="java.lang.Integer"/>
+	<parameter name="p_service_report_id" class="java.lang.Integer"/>
 	<queryString>
 		<![CDATA[SELECT
 	date,
 	hostname,
 	service_description,
-	timeperiod
+	timeperiod,
+	report_description
 FROM	reports
-WHERE	id = $P{p_report_id}]]>
+WHERE	id = $P{p_service_report_id}]]>
 	</queryString>
 	<field name="date" class="java.sql.Timestamp"/>
 	<field name="hostname" class="java.lang.String"/>
@@ -31,7 +32,7 @@ WHERE	id = $P{p_report_id}]]>
 			</rectangle>
 			<image>
 				<reportElement x="5" y="37" width="545" height="116" backcolor="#404040"/>
-				<imageExpression><![CDATA["/home/mluebben/Desktop/icinga_header.jpg"]]></imageExpression>
+				<imageExpression><![CDATA["repo:/icinga/images/icinga_header"]]></imageExpression>
 			</image>
 			<rectangle>
 				<reportElement x="61" y="192" width="9" height="570" forecolor="#C0C0C0" backcolor="#808080"/>
@@ -139,7 +140,7 @@ WHERE	id = $P{p_report_id}]]>
 		<band height="37" splitType="Stretch">
 			<image>
 				<reportElement x="461" y="0" width="94" height="35"/>
-				<imageExpression><![CDATA["repo:/Icinga/images/icinga_logo_small.png"]]></imageExpression>
+				<imageExpression><![CDATA["repo:/icinga/images/icinga_logo_small.png"]]></imageExpression>
 			</image>
 			<rectangle radius="3">
 				<reportElement x="0" y="0" width="440" height="35" backcolor="#FAFADC"/>
@@ -226,10 +227,10 @@ WHERE	id = $P{p_report_id}]]>
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="p_report_id">
-					<subreportParameterExpression><![CDATA[$P{p_report_id}]]></subreportParameterExpression>
+					<subreportParameterExpression><![CDATA[$P{p_service_report_id}]]></subreportParameterExpression>
 				</subreportParameter>
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "service/piechartStates"]]></subreportExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "service/pieChartStates"]]></subreportExpression>
 			</subreport>
 			<rectangle radius="2">
 				<reportElement x="77" y="22" width="400" height="20" backcolor="#F1F1F1"/>
@@ -250,7 +251,7 @@ WHERE	id = $P{p_report_id}]]>
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="p_report_id">
-					<subreportParameterExpression><![CDATA[$P{p_report_id}]]></subreportParameterExpression>
+					<subreportParameterExpression><![CDATA[$P{p_service_report_id}]]></subreportParameterExpression>
 				</subreportParameter>
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} +"service/allStateBreakdowns"]]></subreportExpression>
@@ -276,7 +277,7 @@ WHERE	id = $P{p_report_id}]]>
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="p_report_id">
-					<subreportParameterExpression><![CDATA[$P{p_report_id}]]></subreportParameterExpression>
+					<subreportParameterExpression><![CDATA[$P{p_service_report_id}]]></subreportParameterExpression>
 				</subreportParameter>
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "other/logentries"]]></subreportExpression>





More information about the icinga-checkins mailing list