Issue #60: Fix cvt Reports

Signed-off-by: Lucas Fernandes de Oliveira's avatarLucas Fernandes de Oliveira <lfoliveira@inf.ufpr.br>
parent db478486
Pipeline #22071 passed with stages
in 2 minutes and 26 seconds
......@@ -3,7 +3,7 @@ SELECT
, region AS "Região"
, state AS "Estado"
, city AS "Cidade"
, telecenter AS "Telecentro"
, telecenter AS "CVT"
, machine AS "Máquina"
, os_distro AS "Sistema Operacional"
, processor AS "Processador"
......
......@@ -3,7 +3,7 @@ SELECT
, region AS "Região"
, state AS "Estado"
, city AS "Cidade"
, initcap(regexp_replace(telecenter, '\n', '')) AS "Telecentro"
, initcap(regexp_replace(tech_vocational_center, '\n', '')) AS "CVT"
, machine AS "Máquina"
, to_char(last_contact, 'DD/MM/YYYY') AS "Data do último contato"
, days_last_contact AS "Dias desde o último contato"
......@@ -22,4 +22,4 @@ ORDER BY
region
, remove_accentuation(state)
, remove_accentuation(city)
, remove_accentuation(telecenter)
, remove_accentuation(tech_vocational_center)
......@@ -25,7 +25,7 @@ SELECT
, state AS "Estado"
, city AS "Cidade"
, id_city AS "ID da cidade"
, telecenter AS "Telecentro"
, telecenter AS "CVT"
, id_point AS "ID do ponto"
, machine AS "Máquina"
, os_distro AS "Sistema Operacional"
......
<?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="telecentroAlert" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<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="cvtAlert" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
......@@ -16,7 +16,7 @@ FROM
INNER JOIN state s ON a.state = s.id
INNER JOIN active_tech_vocational_center p ON a.id_point = p.id_point
WHERE
(id_city = $P{ID_CITY} OR $P{ID_CITY} is null)
(a.id_city = $P{ID_CITY} OR $P{ID_CITY} is null)
AND (a.state = $P{STATE} OR $P{STATE} is null)
AND (a.region = $P{REGION} OR $P{REGION} is null)
ORDER BY
......
<?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="telecentroAvail" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<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="cvtAvail" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
......@@ -11,7 +11,7 @@
<![CDATA[SELECT
s.name AS state
, *
, initcap(regexp_replace(telecenter, '\n', '')) AS t
, initcap(regexp_replace(tech_vocational_center, '\n', '')) AS t
FROM
availability_report_tech_vocational_center a
INNER JOIN state s ON a.state = s.id
......@@ -23,7 +23,7 @@ ORDER BY
a.region
, remove_accentuation(state)
, remove_accentuation(city)
, remove_accentuation(telecenter)]]>
, remove_accentuation(tech_vocational_center)]]>
</queryString>
<field name="state" class="java.lang.String"/>
<field name="id_point" class="java.lang.Integer"/>
......
<?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="telecentroInventory" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<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="cvtInventory" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
......
<?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="telecentroNetUsage" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<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="cvtNetUsage" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8aebead2-33a3-49b2-80db-ae7b6301ad20">
<property name="ireport.zoom" value="1.8181818181818192"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
......
......@@ -222,7 +222,6 @@ function simmcReports() {
report: report.report
, data: params
});
generateFile(params, 'pdf', pdf);
} else if (req.params.format == 'csv') {
parseParams(params, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment