Yaniv Dary has uploaded a new change for review. Change subject: reports: fixed issue with text in br46\8 (#912302) ......................................................................
reports: fixed issue with text in br46\8 (#912302) Bug-Url: https://bugzilla.redhat.com/912302 Change-Id: Ice8d3372595ae7ad294c6055396e85c84c4cf549 Signed-off-by: Yaniv Dary <yd...@redhat.com> --- M reports/repository_files/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data M reports/repository_files/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data M reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data 3 files changed, 81 insertions(+), 81 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/08/12408/1 diff --git a/reports/repository_files/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data b/reports/repository_files/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data index 5bca335..5d5e28e 100644 --- a/reports/repository_files/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data @@ -1,7 +1,7 @@ <?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="BR8" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="832" leftMargin="5" rightMargin="5" topMargin="5" bottomMargin="5" 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="BR8" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="832" leftMargin="5" rightMargin="5" topMargin="5" bottomMargin="5" resourceBundle="ovirt_reports_bundle" whenResourceMissingType="Error" uuid="d5aafd4b-a538-43f1-8c2d-f942d2d94b6f"> <property name="ireport.jasperserver.reportUnit" value="/Reports/Service_level/Hosts/single_host_uptime_br8"/> - <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"/> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> <property name="ireport.y" value="0"/> @@ -32,12 +32,12 @@ <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> <defaultValueExpression><![CDATA["C:\\Clients\\BO Client Folders\\oVirt\\iReports\\"]]></defaultValueExpression> </parameter> - <parameter name="table_name" class="java.lang.String"> - <defaultValueExpression><![CDATA[$P{P_Period} == 0 ? "hourly" : "daily"]]></defaultValueExpression> - </parameter> - <parameter name="calendar_column" class="java.lang.String"> - <defaultValueExpression><![CDATA[$P{P_Period} == 0 ? "the_datetime" : "the_date"]]></defaultValueExpression> - </parameter> + <parameter name="table_name" class="java.lang.String"> + <defaultValueExpression><![CDATA[$P{P_Period} == 0 ? "hourly" : "daily"]]></defaultValueExpression> + </parameter> + <parameter name="calendar_column" class="java.lang.String"> + <defaultValueExpression><![CDATA[$P{P_Period} == 0 ? "the_datetime" : "the_date"]]></defaultValueExpression> + </parameter> <queryString> <![CDATA[SELECT SUM(CASE WHEN v3_2_statistics_hosts_resources_usage_$P!{table_name}.host_status = 2 THEN coalesce(v3_2_statistics_hosts_resources_usage_$P!{table_name}.minutes_in_status,0) ELSE 0 END)AS planned_downtime_mins ,SUM(CASE WHEN v3_2_statistics_hosts_resources_usage_$P!{table_name}.host_status = 3 THEN coalesce(v3_2_statistics_hosts_resources_usage_$P!{table_name}.minutes_in_status,0) ELSE 0 END)AS unplanned_downtime_mins @@ -71,31 +71,31 @@ <group name="Datacenter"> <groupExpression><![CDATA[$P{P_DataCenter_ID}]]></groupExpression> <groupFooter> - <band height="300"> + <band height="320"> <textField> - <reportElement x="254" y="263" width="183" height="15"/> - <textElement markup="none"> + <reportElement uuid="13709f8a-94bd-493f-98e3-22e0f332cb64" x="254" y="267" width="183" height="20"/> + <textElement verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$R{br8.meter.planned.downtime} + ":"]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{br8.meter.planned.downtime} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement x="254" y="282" width="183" height="15"/> - <textElement markup="none"> + <reportElement uuid="2d1e2729-8888-4fee-87fa-0ff60d3f4252" x="254" y="290" width="183" height="20"/> + <textElement verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$R{br8.meter.unplanned.downtime} + ":"]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{br8.meter.unplanned.downtime} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement x="305" y="10" width="222" height="17" forecolor="#3A5E75"/> + <reportElement uuid="5deb4ba2-776f-40b5-9f16-0109a99a7f3b" x="305" y="10" width="222" height="17" forecolor="#3A5E75"/> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="13" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$R{br8.meter.title}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{br8.meter.title}]]></textFieldExpression> </textField> <meterChart> <chart evaluationTime="Report" renderType="draw" theme="default"> - <reportElement mode="Transparent" x="319" y="34" width="200" height="200"/> + <reportElement uuid="d8aa3deb-7b7f-43b3-a9d3-36a51e145039" mode="Transparent" x="319" y="34" width="200" height="200"/> <box> <pen lineWidth="0.0"/> <topPen lineWidth="0.0"/> @@ -114,7 +114,6 @@ </valueDataset> <meterPlot shape="dial" tickInterval="5.0" needleColor="#000000" tickColor="#000000"> <plot/> - <tickLabelFont/> <valueDisplay mask="0"/> <dataRange> <lowExpression><![CDATA[0]]></lowExpression> @@ -129,115 +128,115 @@ </meterPlot> </meterChart> <textField> - <reportElement x="254" y="244" width="183" height="15" forecolor="#3A5E75"/> - <textElement markup="none"> + <reportElement uuid="e8af15d4-f2c0-4856-9987-ebf6ba2c0c17" x="254" y="244" width="183" height="20" forecolor="#3A5E75"/> + <textElement verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$R{br8.meter.uptime} + ":"]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{br8.meter.uptime} + ":"]]></textFieldExpression> </textField> <frame> - <reportElement x="444" y="244" width="150" height="15"/> + <reportElement uuid="25d79fc2-2888-4967-9d8d-e43b42552c3a" x="444" y="244" width="150" height="20"/> <textField> - <reportElement x="0" y="0" width="32" height="15" forecolor="#3A5E75"> + <reportElement uuid="58e1cf10-11b5-4fba-a854-420bff0d7f2e" x="0" y="0" width="32" height="20" forecolor="#3A5E75"> <printWhenExpression><![CDATA[((($F{uptime_mins}/60)/24).intValue()) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[((($F{uptime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> + <textFieldExpression><![CDATA[((($F{uptime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> </textField> <textField> - <reportElement x="35" y="0" width="30" height="15" forecolor="#3A5E75"> + <reportElement uuid="61a82816-88e4-44da-934c-2b232a0a9db2" x="35" y="0" width="30" height="20" forecolor="#3A5E75"> <printWhenExpression><![CDATA[((($F{uptime_mins}/60)/24).intValue()) != 0 || (($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24)) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[(($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> + <textFieldExpression><![CDATA[(($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> </textField> <textField> - <reportElement x="65" y="0" width="30" height="15" forecolor="#3A5E75"/> + <reportElement uuid="8c90bc40-398e-4f05-8c8b-f50aeefc37d5" x="65" y="0" width="30" height="20" forecolor="#3A5E75"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[($F{uptime_mins} - ((($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24))*60)-(((($F{uptime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> + <textFieldExpression><![CDATA[($F{uptime_mins} - ((($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24))*60)-(((($F{uptime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> </textField> <textField> - <reportElement x="100" y="0" width="50" height="15" forecolor="#3A5E75"/> + <reportElement uuid="124ab677-0441-46cc-9585-0f5e307bb718" x="100" y="0" width="50" height="20" forecolor="#3A5E75"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["(" + (100-(($F{planned_downtime_mins}/$F{total})*100).intValue()-(($F{unplanned_downtime_mins}/$F{total})*100).intValue()).toString() + "%)"]]></textFieldExpression> + <textFieldExpression><![CDATA["(" + (100-(($F{planned_downtime_mins}/$F{total})*100).intValue()-(($F{unplanned_downtime_mins}/$F{total})*100).intValue()).toString() + "%)"]]></textFieldExpression> </textField> </frame> <frame> - <reportElement x="450" y="263" width="144" height="15"/> + <reportElement uuid="bec4b45d-1240-4bd7-b138-d926a7487642" x="450" y="267" width="144" height="20"/> <textField> - <reportElement x="0" y="0" width="27" height="15"> + <reportElement uuid="2dad066d-2c5a-4804-8f00-16b58a46edac" x="0" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> + <textFieldExpression><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> </textField> <textField> - <reportElement x="31" y="0" width="27" height="15"> + <reportElement uuid="d7a787d4-1401-419a-b2fe-a39b9f77ff5f" x="31" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()) != 0 || (($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24)) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[(($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> + <textFieldExpression><![CDATA[(($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> </textField> <textField> - <reportElement x="62" y="0" width="27" height="15"/> + <reportElement uuid="58d8f8e0-72d4-4d2a-99ec-c9c15b22051d" x="62" y="0" width="27" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[($F{planned_downtime_mins} - ((($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24))*60)-(((($F{planned_downtime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> + <textFieldExpression><![CDATA[($F{planned_downtime_mins} - ((($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24))*60)-(((($F{planned_downtime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> </textField> <textField> - <reportElement x="94" y="0" width="50" height="15"/> + <reportElement uuid="c29fed8c-70e2-43c1-9427-d5108ae46d73" x="94" y="0" width="50" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["(" + (($F{planned_downtime_mins}/$F{total})*100).intValue().toString() + "%)"]]></textFieldExpression> + <textFieldExpression><![CDATA["(" + (($F{planned_downtime_mins}/$F{total})*100).intValue().toString() + "%)"]]></textFieldExpression> </textField> </frame> <frame> - <reportElement x="450" y="282" width="145" height="15"/> + <reportElement uuid="f4b47fc8-92cd-4d36-b023-87b6613034be" x="450" y="290" width="145" height="20"/> <textField> - <reportElement x="0" y="0" width="27" height="15"> + <reportElement uuid="b099bf3b-3983-4a17-ad53-c1923c2da94e" x="0" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> + <textFieldExpression><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> </textField> <textField> - <reportElement x="31" y="0" width="27" height="15"> + <reportElement uuid="6fae2fc1-4ffb-4711-856a-6716e70a32fb" x="31" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()) != 0 || (($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24)) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[(($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> + <textFieldExpression><![CDATA[(($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> </textField> <textField> - <reportElement x="62" y="0" width="27" height="15"/> + <reportElement uuid="de615754-f0d5-4e2e-b06a-6df78f9b3c2c" x="62" y="0" width="27" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[($F{unplanned_downtime_mins} - ((($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24))*60)-(((($F{unplanned_downtime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> + <textFieldExpression><![CDATA[($F{unplanned_downtime_mins} - ((($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24))*60)-(((($F{unplanned_downtime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement x="94" y="0" width="50" height="15"/> + <reportElement uuid="a92ade4d-fbd3-4e1e-a3f3-37e0bbe5def2" x="94" y="0" width="50" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["(" + (($F{unplanned_downtime_mins}/$F{total})*100).intValue().toString() + "%)"]]></textFieldExpression> + <textFieldExpression><![CDATA["(" + (($F{unplanned_downtime_mins}/$F{total})*100).intValue().toString() + "%)"]]></textFieldExpression> </textField> </frame> </band> @@ -246,7 +245,7 @@ <pageHeader> <band height="190" splitType="Prevent"> <subreport> - <reportElement x="1" y="45" width="830" height="145"/> + <reportElement uuid="91ea4d77-abd7-40bb-9294-45977d66f693" x="1" y="45" width="830" height="145"/> <subreportParameter name="P_Cluster_ID"> <subreportParameterExpression><![CDATA[$P{P_Cluster_ID}]]></subreportParameterExpression> </subreportParameter> @@ -269,32 +268,32 @@ <subreportParameterExpression><![CDATA[$P{P_Host_Type}]]></subreportParameterExpression> </subreportParameter> <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> - <subreportExpression class="java.lang.String"><![CDATA["repo:br8 full details.jrxml"]]></subreportExpression> + <subreportExpression><![CDATA["repo:br8 full details.jrxml"]]></subreportExpression> </subreport> <textField pattern=""> - <reportElement x="509" y="27" width="323" height="15"/> + <reportElement uuid="cdcef0de-fd00-4901-98ad-431231378c51" x="509" y="27" width="323" height="15"/> <textElement textAlignment="Right"> <font fontName="SansSerif" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression> + <textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression> </textField> <line> - <reportElement x="0" y="43" width="832" height="1"/> + <reportElement uuid="6af9d8a9-487c-476a-ba37-998d6cbeb801" x="0" y="43" width="832" height="1"/> </line> <image> - <reportElement x="0" y="0" width="228" height="42"/> - <imageExpression class="java.lang.String"><![CDATA["repo:ovirt-icon"]]></imageExpression> + <reportElement uuid="0b232af8-8a6c-43cf-8bbc-25725eb50b47" x="0" y="0" width="228" height="42"/> + <imageExpression><![CDATA["repo:ovirt-icon"]]></imageExpression> </image> </band> </pageHeader> <pageFooter> <band height="15" splitType="Stretch"> <textField evaluationTime="Auto"> - <reportElement x="291" y="0" width="250" height="15"/> + <reportElement uuid="eedbb97f-0c06-4713-83c0-97f73de43d40" x="291" y="0" width="250" height="15"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="SansSerif"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[msg($R{footer.pagination}, $V{CURRENT_PAGE_NUMBER}, $V{PAGE_NUMBER})]]></textFieldExpression> + <textFieldExpression><![CDATA[msg($R{footer.pagination}, $V{CURRENT_PAGE_NUMBER}, $V{PAGE_NUMBER})]]></textFieldExpression> </textField> </band> </pageFooter> diff --git a/reports/repository_files/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data b/reports/repository_files/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data index 29327db..e4fbb3d 100644 --- a/reports/repository_files/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data @@ -70,17 +70,17 @@ <group name="Datacenter"> <groupExpression><![CDATA[$P{P_DataCenter_ID}]]></groupExpression> <groupFooter> - <band height="300"> + <band height="320"> <textField> - <reportElement uuid="210a1512-5049-435c-8cd8-91681089b101" x="254" y="263" width="183" height="15"/> - <textElement markup="none"> + <reportElement uuid="210a1512-5049-435c-8cd8-91681089b101" x="254" y="267" width="183" height="20"/> + <textElement verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{br8.meter.planned.downtime} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2c9f4e90-bf84-4b9a-a123-2e7eef83ad63" x="254" y="282" width="183" height="15"/> - <textElement markup="none"> + <reportElement uuid="2c9f4e90-bf84-4b9a-a123-2e7eef83ad63" x="254" y="290" width="183" height="20"/> + <textElement verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{br8.meter.unplanned.downtime} + ":"]]></textFieldExpression> @@ -90,7 +90,7 @@ <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="13" isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$R{br8.meter.title}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{br46.meter.title}]]></textFieldExpression> </textField> <meterChart> <chart evaluationTime="Report" renderType="draw" theme="default"> @@ -127,16 +127,16 @@ </meterPlot> </meterChart> <textField> - <reportElement uuid="7eda181a-96f2-450c-9c98-bd4ba4ea49a2" x="254" y="244" width="183" height="15" forecolor="#3A5E75"/> - <textElement markup="none"> + <reportElement uuid="7eda181a-96f2-450c-9c98-bd4ba4ea49a2" x="254" y="244" width="183" height="20" forecolor="#3A5E75"/> + <textElement verticalAlignment="Middle" markup="none"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{br8.meter.uptime} + ":"]]></textFieldExpression> </textField> <frame> - <reportElement uuid="023a9d15-d09e-4b62-afe4-79f30cdc6615" x="444" y="244" width="150" height="15"/> + <reportElement uuid="023a9d15-d09e-4b62-afe4-79f30cdc6615" x="444" y="244" width="150" height="20"/> <textField> - <reportElement uuid="bee201b4-b883-4876-b4a9-4b6e280f9f59" x="0" y="0" width="32" height="15" forecolor="#3A5E75"> + <reportElement uuid="bee201b4-b883-4876-b4a9-4b6e280f9f59" x="0" y="0" width="32" height="20" forecolor="#3A5E75"> <printWhenExpression><![CDATA[((($F{uptime_mins}/60)/24).intValue()) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -145,7 +145,7 @@ <textFieldExpression><![CDATA[((($F{uptime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="ace42702-aaa7-4aa2-97cf-76c81a1267aa" x="35" y="0" width="30" height="15" forecolor="#3A5E75"> + <reportElement uuid="ace42702-aaa7-4aa2-97cf-76c81a1267aa" x="35" y="0" width="30" height="20" forecolor="#3A5E75"> <printWhenExpression><![CDATA[((($F{uptime_mins}/60)/24).intValue()) != 0 || (($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24)) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -154,14 +154,14 @@ <textFieldExpression><![CDATA[(($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="064b51f3-4ab0-4ff1-b805-0038e534254e" x="65" y="0" width="30" height="15" forecolor="#3A5E75"/> + <reportElement uuid="064b51f3-4ab0-4ff1-b805-0038e534254e" x="65" y="0" width="30" height="20" forecolor="#3A5E75"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[($F{uptime_mins} - ((($F{uptime_mins}/60).intValue()-(((($F{uptime_mins}/60)/24).intValue())*24))*60)-(((($F{uptime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fedb4ae3-a819-4eb8-a2ba-8d4cf1be4ffd" x="100" y="0" width="50" height="15" forecolor="#3A5E75"/> + <reportElement uuid="fedb4ae3-a819-4eb8-a2ba-8d4cf1be4ffd" x="100" y="0" width="50" height="20" forecolor="#3A5E75"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="true"/> </textElement> @@ -169,9 +169,9 @@ </textField> </frame> <frame> - <reportElement uuid="00855d57-30a2-4350-b6c0-35cf51d5bfa4" x="450" y="263" width="144" height="15"/> + <reportElement uuid="00855d57-30a2-4350-b6c0-35cf51d5bfa4" x="450" y="267" width="144" height="20"/> <textField> - <reportElement uuid="f942afb7-886c-4e33-9e52-87d387976c8f" x="0" y="0" width="27" height="15"> + <reportElement uuid="f942afb7-886c-4e33-9e52-87d387976c8f" x="0" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -180,7 +180,7 @@ <textFieldExpression><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="468fe497-5fe2-4cb9-9010-addd0d83df61" x="31" y="0" width="27" height="15"> + <reportElement uuid="468fe497-5fe2-4cb9-9010-addd0d83df61" x="31" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{planned_downtime_mins}/60)/24).intValue()) != 0 || (($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24)) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -189,14 +189,14 @@ <textFieldExpression><![CDATA[(($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="8206bb9f-3625-43af-9c35-f77daee20b59" x="62" y="0" width="27" height="15"/> + <reportElement uuid="8206bb9f-3625-43af-9c35-f77daee20b59" x="62" y="0" width="27" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> <textFieldExpression><![CDATA[($F{planned_downtime_mins} - ((($F{planned_downtime_mins}/60).intValue()-(((($F{planned_downtime_mins}/60)/24).intValue())*24))*60)-(((($F{planned_downtime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c5d7a7a9-309d-4ac1-87cb-65aff9957c4f" x="94" y="0" width="50" height="15"/> + <reportElement uuid="c5d7a7a9-309d-4ac1-87cb-65aff9957c4f" x="94" y="0" width="50" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> @@ -204,9 +204,9 @@ </textField> </frame> <frame> - <reportElement uuid="4e60c78c-64f1-448d-9776-92991bb5b8d9" x="450" y="282" width="145" height="15"/> + <reportElement uuid="4e60c78c-64f1-448d-9776-92991bb5b8d9" x="450" y="290" width="145" height="20"/> <textField> - <reportElement uuid="840103d4-9f5c-466a-90de-c1528d83c2ab" x="0" y="0" width="27" height="15"> + <reportElement uuid="840103d4-9f5c-466a-90de-c1528d83c2ab" x="0" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -215,7 +215,7 @@ <textFieldExpression><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()).toString() + "d"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="356126fd-b6a1-4432-acec-0ef365745cc3" x="31" y="0" width="27" height="15"> + <reportElement uuid="356126fd-b6a1-4432-acec-0ef365745cc3" x="31" y="0" width="27" height="20"> <printWhenExpression><![CDATA[((($F{unplanned_downtime_mins}/60)/24).intValue()) != 0 || (($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24)) != 0]]></printWhenExpression> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -224,14 +224,14 @@ <textFieldExpression><![CDATA[(($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24)).toString() + "h"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0ba05d57-ff10-49ef-9b22-d2be91a120e7" x="62" y="0" width="27" height="15"/> + <reportElement uuid="0ba05d57-ff10-49ef-9b22-d2be91a120e7" x="62" y="0" width="27" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> <textFieldExpression><![CDATA[($F{unplanned_downtime_mins} - ((($F{unplanned_downtime_mins}/60).intValue()-(((($F{unplanned_downtime_mins}/60)/24).intValue())*24))*60)-(((($F{unplanned_downtime_mins}/60)/24).intValue())*60*24)).intValue().toString() + "m"]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement uuid="acae7374-52d9-4997-89d1-b6a424c126a5" x="94" y="0" width="50" height="15"/> + <reportElement uuid="acae7374-52d9-4997-89d1-b6a424c126a5" x="94" y="0" width="50" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="SansSerif" size="12" isBold="false"/> </textElement> diff --git a/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data b/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data index 60a828a..82a9bbb 100644 --- a/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data +++ b/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data @@ -320,6 +320,7 @@ br45.title=Users'' Spice Sessions Activity in <b>{0}</b> of <b>Data Center {1}</b> dr.count.list.storage.domains=Storage Domains br46.title=Uptime of <b>Virtual Machine {0}</b> +br46.meter.title=Virtual Machine Uptime full.details.storage.domain.type=Storage Domain Type full.details.show.deleted.storage.domains=Show Deleted Storage Domains br47.title=Storage Domains Inventory of <b>Data Center {0}</b> -- To view, visit http://gerrit.ovirt.org/12408 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice8d3372595ae7ad294c6055396e85c84c4cf549 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <yd...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
