Index: trunk/web-app/reports/immediateCallouts.jrxml
===================================================================
--- trunk/web-app/reports/immediateCallouts.jrxml	(revision 542)
+++ trunk/web-app/reports/immediateCallouts.jrxml	(revision 544)
@@ -5,7 +5,7 @@
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="384"/>
+	<property name="ireport.y" value="218"/>
+	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
-	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
 	<style name="Crosstab Data Text" isDefault="false" hAlign="Center"/>
@@ -63,8 +63,11 @@
 		<field name="name" class="java.lang.String"/>
 		<field name="immediateCalloutCount" class="java.lang.Integer"/>
-		<field name="immediateCalloutTaskList" class="java.util.List"/>
 		<field name="downTime" class="java.lang.Integer"/>
+		<field name="tasks" class="java.lang.String"/>
 		<variable name="immediateCalloutSum" class="java.lang.Integer" calculation="Sum">
 			<variableExpression><![CDATA[$F{immediateCalloutCount}]]></variableExpression>
+		</variable>
+		<variable name="downTimeSum" class="java.lang.Integer" calculation="Sum">
+			<variableExpression><![CDATA[$F{downTime}]]></variableExpression>
 		</variable>
 		<group name="assetName">
@@ -84,4 +87,5 @@
 	<field name="totalAssetsOnTasksCount" class="java.lang.String"/>
 	<field name="assetList" class="java.util.List"/>
+	<field name="totalDownTime" class="java.util.LinkedHashMap"/>
 	<background>
 		<band splitType="Stretch"/>
@@ -112,118 +116,11 @@
 	<detail>
 		<band height="394" splitType="Stretch">
-			<componentElement>
-				<reportElement key="table" style="table" x="0" y="0" width="377" height="394"/>
-				<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
-					<datasetRun subDataset="dataset1">
-						<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{assetList})]]></dataSourceExpression>
-					</datasetRun>
-					<jr:column width="160">
-						<jr:columnHeader style="table_CH" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="160" height="30"/>
-								<textElement verticalAlignment="Middle">
-									<font fontName="Serif" size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA["Asset"]]></textFieldExpression>
-							</textField>
-						</jr:columnHeader>
-						<jr:columnFooter style="table_CF" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="160" height="30"/>
-								<textElement verticalAlignment="Middle">
-									<font fontName="Serif" size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA["Total"]]></textFieldExpression>
-							</textField>
-						</jr:columnFooter>
-						<jr:detailCell style="table_TD" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="160" height="30"/>
-								<textElement verticalAlignment="Middle">
-									<font fontName="Serif" isBold="false" isItalic="false"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{name}]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-					<jr:column width="55">
-						<jr:columnHeader height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="55" height="30"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font fontName="Serif" size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA["Callouts"]]></textFieldExpression>
-							</textField>
-						</jr:columnHeader>
-						<jr:columnFooter style="table_CF" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="55" height="30"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font fontName="Serif" size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression class="java.lang.Integer"><![CDATA[$V{immediateCalloutSum}]]></textFieldExpression>
-							</textField>
-						</jr:columnFooter>
-						<jr:detailCell style="table_TD" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="55" height="30"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font fontName="Serif" isBold="false"/>
-								</textElement>
-								<textFieldExpression class="java.lang.Integer"><![CDATA[$F{immediateCalloutCount}]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-					<jr:column width="159">
-						<jr:columnHeader style="table_CH" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="159" height="30"/>
-								<textElement verticalAlignment="Middle">
-									<font fontName="Serif" size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA["Tasks"]]></textFieldExpression>
-							</textField>
-						</jr:columnHeader>
-						<jr:columnFooter style="table_CF" height="30" rowSpan="1"/>
-						<jr:detailCell style="table_TD" height="30" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="159" height="30"/>
-								<textElement verticalAlignment="Middle">
-									<font fontName="Serif" size="10" isBold="false"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{immediateCalloutTaskList}]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-				</jr:table>
-			</componentElement>
-			<pie3DChart>
-				<chart>
-					<reportElement x="416" y="0" width="366" height="301"/>
-					<chartTitle/>
-					<chartSubtitle/>
-					<chartLegend/>
-				</chart>
-				<pieDataset>
-					<dataset>
-						<datasetRun subDataset="dataset1">
-							<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{assetList})]]></dataSourceExpression>
-						</datasetRun>
-					</dataset>
-					<keyExpression><![CDATA[$F{name}]]></keyExpression>
-					<valueExpression><![CDATA[$F{immediateCalloutCount}]]></valueExpression>
-				</pieDataset>
-				<pie3DPlot depthFactor="0.1" isCircular="false" labelFormat="{2}">
-					<plot/>
-					<itemLabel color="#000000" backgroundColor="#FFFFFF"/>
-				</pie3DPlot>
-			</pie3DChart>
-		</band>
-		<band height="394">
 			<bar3DChart>
 				<chart>
-					<reportElement x="0" y="0" width="782" height="212"/>
-					<chartTitle/>
+					<reportElement x="0" y="0" width="782" height="394"/>
+					<chartTitle position="Bottom">
+						<font isUnderline="false"/>
+						<titleExpression><![CDATA["Total: "+$F{totalAssetsOnTasksCount}]]></titleExpression>
+					</chartTitle>
 					<chartSubtitle/>
 					<chartLegend/>
@@ -258,10 +155,17 @@
 				</bar3DPlot>
 			</bar3DChart>
+		</band>
+		<band height="394">
 			<bar3DChart>
 				<chart>
-					<reportElement x="0" y="212" width="782" height="182"/>
-					<chartTitle/>
+					<reportElement x="0" y="0" width="782" height="394"/>
+					<chartTitle position="Bottom">
+						<font isBold="false" isUnderline="false"/>
+						<titleExpression><![CDATA["Total: "+$F{totalDownTime}.total+"min"+" ("+$F{totalDownTime}.hours+"h:"+$F{totalDownTime}.minutes+"m)"]]></titleExpression>
+					</chartTitle>
 					<chartSubtitle/>
-					<chartLegend/>
+					<chartLegend position="Bottom">
+						<font isUnderline="true"/>
+					</chartLegend>
 				</chart>
 				<categoryDataset>
@@ -272,5 +176,5 @@
 					</dataset>
 					<categorySeries>
-						<seriesExpression><![CDATA["Down Time"]]></seriesExpression>
+						<seriesExpression><![CDATA["Down Time (min)"]]></seriesExpression>
 						<categoryExpression><![CDATA[$F{name}]]></categoryExpression>
 						<valueExpression><![CDATA[$F{downTime}]]></valueExpression>
@@ -297,4 +201,34 @@
 			</bar3DChart>
 		</band>
+		<band height="394">
+			<componentElement>
+				<reportElement key="table 1" style="table" x="0" y="0" width="782" height="394"/>
+				<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
+					<datasetRun subDataset="dataset1">
+						<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{assetList})]]></dataSourceExpression>
+					</datasetRun>
+					<jr:column width="774">
+						<jr:groupHeader groupName="assetName">
+							<jr:cell height="30" rowSpan="1">
+								<textField>
+									<reportElement x="0" y="0" width="774" height="30"/>
+									<textElement verticalAlignment="Middle">
+										<font size="12" isBold="true"/>
+									</textElement>
+									<textFieldExpression class="java.lang.String"><![CDATA[$F{name}]]></textFieldExpression>
+								</textField>
+							</jr:cell>
+						</jr:groupHeader>
+						<jr:detailCell style="table_TD" height="40" rowSpan="1">
+							<textField isStretchWithOverflow="true">
+								<reportElement x="0" y="0" width="774" height="40"/>
+								<textElement verticalAlignment="Middle"/>
+								<textFieldExpression class="java.lang.String"><![CDATA[""+$F{tasks}]]></textFieldExpression>
+							</textField>
+						</jr:detailCell>
+					</jr:column>
+				</jr:table>
+			</componentElement>
+		</band>
 	</detail>
 	<columnFooter>