Yaniv Dary has uploaded a new change for review. Change subject: reports: fixed date display on br13 (#870720) ......................................................................
reports: fixed date display on br13 (#870720) Had missing field in date display that caused error. Changed query to contain the field required. bug-url: https://bugzilla.redhat.com/870720 Change-Id: Ia43c746403972bd6c461ab435955dead725595d4 Signed-off-by: Yaniv Dary <[email protected]> --- M reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data 1 file changed, 33 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/95/8895/1 diff --git a/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data index 0086c72..3f9c808 100644 --- a/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<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="report1" language="groovy" pageWidth="830" pageHeight="116" orientation="Landscape" columnWidth="830" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="ovirt_reports_bundle" whenResourceMissingType="Error"> +<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="report1" language="groovy" pageWidth="830" pageHeight="116" orientation="Landscape" columnWidth="830" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="ovirt_reports_bundle" whenResourceMissingType="Error" uuid="b11d0209-ceb6-4c76-8ad4-2a2c86ed18e7"> <property name="ireport.zoom" value="1.0"/> - <property name="ireport.x" value="0"/> + <property name="ireport.x" value="10"/> <property name="ireport.y" value="0"/> <property name="ireport.jasperserver.reportUnit" value="/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13"/> - <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver/services/repository"/> + <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver-pro/services/repository"/> <parameter name="is_deleted" class="java.lang.String"> <defaultValueExpression><![CDATA["AND delete_date IS NULL"]]></defaultValueExpression> </parameter> @@ -55,11 +55,10 @@ WHERE v3_0_enum_translator_view.enum_key = $P{P_VM_Type} AND v3_0_enum_translator_view.enum_type = 'VM_TYPE'), 'All') as vm_type, CASE - WHEN $P{P_Period} = 'Daily' THEN $P{P_Start_Date} - WHEN $P{P_Period} = 'Monthly' THEN $P{P_Start_Date} || ' - ' || CAST(CAST(cast($P{P_Start_Date} as date) + interval '1 month' - interval '1 day' as date) as varchar) - WHEN $P{P_Period} = 'Quarterly' THEN $P{P_Start_Date} || ' - ' || CAST(CAST(cast($P{P_Start_Date} as date) + interval '3 month' - interval '1 day' as date) as varchar) - WHEN $P{P_Period} = 'Yearly' THEN $P{P_Start_Date} || ' - ' || CAST(CAST(cast($P{P_Start_Date} as date) + interval '1 year' - interval '1 day' as date) as varchar) - END as display_dates + WHEN $P{P_Period} = 'Monthly' THEN CAST(cast($P{P_Start_Date} as date) + interval '1 month' - interval '1 day' as date) + WHEN $P{P_Period} = 'Quarterly' THEN CAST(cast($P{P_Start_Date} as date) + interval '3 month' - interval '1 day' as date) + WHEN $P{P_Period} = 'Yearly' THEN CAST(cast($P{P_Start_Date} as date) + interval '1 year' - interval '1 day' as date) + END as end_date FROM v3_0_datacenter_configuration_view WHERE v3_0_datacenter_configuration_view.datacenter_id = cast($P{P_DataCenter_ID} as uuid) and v3_0_datacenter_configuration_view.history_id in (SELECT max(a.history_id) @@ -71,7 +70,7 @@ <field name="cluster_name" class="java.lang.String"/> <field name="cluster_delete_date" class="java.sql.Timestamp"/> <field name="vm_type" class="java.lang.String"/> - <field name="display_dates" class="java.lang.String"/> + <field name="end_date" class="java.sql.Date"/> <variable name="datacenter_star" class="java.lang.String" resetType="None"> <variableExpression><![CDATA[$F{datacenter_delete_date} != null ? "*" : ""]]></variableExpression> </variable> @@ -81,7 +80,7 @@ <title> <band height="89" splitType="Stretch"> <frame> - <reportElement mode="Opaque" x="0" y="30" width="828" height="40"/> + <reportElement uuid="65919112-79d7-4c9e-bb6d-62a1371ac677" mode="Opaque" x="0" y="30" width="828" height="40"/> <box> <pen lineWidth="1.0" lineColor="#CCCCCC"/> <topPen lineWidth="1.0" lineColor="#CCCCCC"/> @@ -90,23 +89,23 @@ <rightPen lineWidth="1.0" lineColor="#CCCCCC"/> </box> <textField> - <reportElement positionType="Float" x="487" y="0" width="108" height="20"/> + <reportElement uuid="f2fe79bc-cd83-43f0-93bd-5b839f033a20" positionType="Float" x="487" y="0" width="108" height="20"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["<b>" + $R{full.details.period} + ":</b> " + $P{P_Period}]]></textFieldExpression> + <textFieldExpression><![CDATA["<b>" + $R{full.details.period} + ":</b> " + $P{P_Period}]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$P{P_Period}]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement x="77" y="0" width="290" height="20"/> + <reportElement uuid="fe62fc42-3a46-419e-a0e1-599db9287d65" x="77" y="0" width="290" height="20"/> <textElement verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["<b>" + $R{full.details.datacenter} + ": </b>" + $F{datacenter_name} + $V{datacenter_star}]]></textFieldExpression> + <textFieldExpression><![CDATA["<b>" + $R{full.details.datacenter} + ": </b>" + $F{datacenter_name} + $V{datacenter_star}]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$F{datacenter_name} + $V{datacenter_star}]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement positionType="Float" x="603" y="0" width="225" height="20"/> + <reportElement uuid="c4e79dcf-e2b8-43b7-a8af-d22e2f88608a" positionType="Float" x="603" y="0" width="225" height="20"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> @@ -114,68 +113,68 @@ <hyperlinkTooltipExpression><![CDATA[$P{P_Period} == "Daily" ? DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{P_Start_Date}) : DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{P_Start_Date}) + " - " + DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{end_date})]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement positionType="Float" x="519" y="20" width="139" height="20"/> + <reportElement uuid="bf678a37-6c4b-4a2b-acec-5357a245f501" positionType="Float" x="519" y="20" width="139" height="20"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["<b>"+ $R{full.details.cpu.threshold} + ": </b>" + $P{P_CPU_Threshold}.toString() + "%"]]></textFieldExpression> + <textFieldExpression><![CDATA["<b>"+ $R{full.details.cpu.threshold} + ": </b>" + $P{P_CPU_Threshold}.toString() + "%"]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$P{P_CPU_Threshold}.toString() + "%"]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement positionType="Float" x="662" y="20" width="157" height="20"/> + <reportElement uuid="c49725b1-61b2-42ff-9387-c19f2895fd65" positionType="Float" x="662" y="20" width="157" height="20"/> <textElement textAlignment="Left" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["<b>" + $R{full.details.memory.threshold} + ": </b>" + $P{P_MEM_Threshold}.toString() + "%"]]></textFieldExpression> + <textFieldExpression><![CDATA["<b>" + $R{full.details.memory.threshold} + ": </b>" + $P{P_MEM_Threshold}.toString() + "%"]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$P{P_MEM_Threshold}.toString() + "%"]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement positionType="Float" x="77" y="20" width="290" height="20"/> + <reportElement uuid="8a53dd37-787c-4056-84ec-b9352c6559d1" positionType="Float" x="77" y="20" width="290" height="20"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$F{cluster_name} != "all" ? "<b>" + $R{full.details.cluster} + ":</b> " + $F{cluster_name} + $V{cluster_star} : "<b>" + $R{full.details.cluster} + ":</b> "+ $R{full.details.all}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{cluster_name} != "all" ? "<b>" + $R{full.details.cluster} + ":</b> " + $F{cluster_name} + $V{cluster_star} : "<b>" + $R{full.details.cluster} + ":</b> "+ $R{full.details.all}]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$F{cluster_name} != "all" ? $F{cluster_name} + $V{cluster_star} : $R{full.details.all}]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement positionType="Float" x="369" y="0" width="111" height="20"/> + <reportElement uuid="4ff8e3ba-7af9-4eb6-8fd7-284b21326bc9" positionType="Float" x="369" y="0" width="111" height="20"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$F{vm_type} != "All" ? "<b>" + $R{full.details.vm.type} + ":</b> " + $F{vm_type} : "<b>" + $R{full.details.vm.type} + ":</b> " + $R{full.details.all}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{vm_type} != "All" ? "<b>" + $R{full.details.vm.type} + ":</b> " + $F{vm_type} : "<b>" + $R{full.details.vm.type} + ":</b> " + $R{full.details.all}]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$F{vm_type} != "All" ? $F{vm_type} : $R{full.details.all}]]></hyperlinkTooltipExpression> </textField> <textField> - <reportElement mode="Opaque" x="2" y="2" width="69" height="36" forecolor="#666666" backcolor="#E6E6E6"/> + <reportElement uuid="e5c38868-512f-40c6-a021-09bef2601aff" mode="Opaque" x="2" y="2" width="69" height="36" forecolor="#666666" backcolor="#E6E6E6"/> <textElement textAlignment="Left" verticalAlignment="Middle" markup="none"> <font fontName="DejaVu Sans" size="13" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$R{full.details.criteria} + ":"]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{full.details.criteria} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="369" y="20" width="145" height="20"/> + <reportElement uuid="a739eb54-af24-4c12-9a5a-65dbcfccdfdd" positionType="Float" x="369" y="20" width="145" height="20"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <textFieldExpression><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> - <reportElement x="0" y="0" width="830" height="25" forecolor="#666666"/> + <reportElement uuid="e7e13a9d-d746-4bbd-bfd2-34165497c260" x="0" y="0" width="830" height="25" forecolor="#666666"/> <textElement textAlignment="Left" verticalAlignment="Top" markup="html"> <font fontName="DejaVu Sans" size="17" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[msg($R{br13.title}, $F{cluster_name} == "all" ? $R{full.details.clusters} : msg($R{full.details.cluster.and.name}, $F{cluster_name}) + $V{cluster_star}, $F{datacenter_name} + $V{datacenter_star})]]></textFieldExpression> + <textFieldExpression><![CDATA[msg($R{br13.title}, $F{cluster_name} == "all" ? $R{full.details.clusters} : msg($R{full.details.cluster.and.name}, $F{cluster_name}) + $V{cluster_star}, $F{datacenter_name} + $V{datacenter_star})]]></textFieldExpression> </textField> <image> - <reportElement x="12" y="73" width="10" height="11"> + <reportElement uuid="951d282c-f6e5-4a6c-93df-bf236780be98" x="12" y="73" width="10" height="11"> <printWhenExpression><![CDATA[$F{cluster_delete_date} != null || $F{datacenter_delete_date} != null]]></printWhenExpression> </reportElement> - <imageExpression class="java.lang.String"><![CDATA["repo:trash-icon"]]></imageExpression> + <imageExpression><![CDATA["repo:trash-icon"]]></imageExpression> </image> <staticText> - <reportElement x="5" y="73" width="5" height="16" forecolor="#666666"> + <reportElement uuid="7db56949-3ce0-45bb-871e-20349e544564" x="5" y="73" width="5" height="16" forecolor="#666666"> <printWhenExpression><![CDATA[$F{cluster_delete_date} != null || $F{datacenter_delete_date} != null]]></printWhenExpression> </reportElement> <textElement verticalAlignment="Middle"> @@ -184,11 +183,11 @@ <text><![CDATA[*]]></text> </staticText> <textField> - <reportElement x="29" y="73" width="735" height="13" forecolor="#666666"/> + <reportElement uuid="7694dd30-992a-45ec-af52-7c0615d00df3" x="29" y="73" width="735" height="13" forecolor="#666666"/> <textElement markup="html"> <font fontName="DejaVu Sans"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$F{cluster_delete_date} != null ? + <textFieldExpression><![CDATA[$F{cluster_delete_date} != null ? $F{datacenter_delete_date} != null ? msg($R{full.details.deleted.comment.datacenter.and.cluster}, DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{datacenter_delete_date}), DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{cluster_delete_date})) : msg($R{full.details.deleted.comment.cluster}, DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{cluster_delete_date})) : $F{datacenter_delete_date} != null ? msg($R{full.details.deleted.comment.datacenter}, DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{datacenter_delete_date})) : ""]]></textFieldExpression> -- To view, visit http://gerrit.ovirt.org/8895 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia43c746403972bd6c461ab435955dead725595d4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
