From ceef4f53eeb44286ff828f576de5a036aebd469a Mon Sep 17 00:00:00 2001
From: Rafael de Lima Prado <rlp09@c3sl.ufpr.br>
Date: Thu, 18 Oct 2012 15:55:31 -0300
Subject: [PATCH] pentahofiles: Update some more graphics to work with the new
database model
Signed-off-by: Rafael de Lima Prado <rlp09@c3sl.ufpr.br>
---
.../proinfo/alertas/alertBarBrasil.xaction | 11 +-
.../proinfo/alertas/alertBarCidade.xaction | 16 +-
.../proinfo/alertas/alertBarEstado.xaction | 15 +-
.../proinfo/alertas/alertBarRegiao.xaction | 17 +-
.../proinfo/alertas/alertLineBrasil.xaction | 18 +-
.../proinfo/alertas/alertLineCidade.xaction | 17 +-
.../proinfo/alertas/alertLineEstado.xaction | 16 +-
.../proinfo/alertas/alertLineRegiao.xaction | 18 +-
.../proinfo/alertas/alertPieBrasil.xaction | 17 +-
.../proinfo/alertas/alertPieCidade.xaction | 56 +----
.../proinfo/alertas/alertPieEstado.xaction | 53 +----
.../proinfo/alertas/alertPieRegiao.xaction | 50 +----
.../proinfo/alertas/alertRelatorio.xaction | 107 +--------
.../proinfo/auditoria/auditBarBrasil.xaction | 21 +-
.../proinfo/auditoria/auditBarCidade.xaction | 51 +----
.../proinfo/auditoria/auditBarEstado.xaction | 43 +---
.../proinfo/auditoria/auditBarRegiao.xaction | 43 +---
.../proinfo/auditoria/auditLineBrasil.xaction | 66 +-----
.../proinfo/auditoria/auditLineCidade.xaction | 45 ++--
.../proinfo/auditoria/auditLineEstado.xaction | 29 +--
.../proinfo/auditoria/auditLineRegiao.xaction | 46 +---
.../proinfo/auditoria/auditPieBrasil.xaction | 31 +--
.../proinfo/auditoria/auditPieCidade.xaction | 28 +--
.../proinfo/auditoria/auditPieEstado.xaction | 26 +--
.../proinfo/auditoria/auditPieRegiao.xaction | 26 +--
.../proinfo/auditoria/auditRelatorio.xaction | 177 ++++++---------
.../auditoria/auditRelatorioRoxo.xaction | 175 ++++++---------
.../disponibilidade/dispBarBrasil.xaction | 12 +-
.../disponibilidade/dispBarCidade.xaction | 18 +-
.../disponibilidade/dispBarEstado.xaction | 16 +-
.../disponibilidade/dispBarRegiao.xaction | 18 +-
.../disponibilidade/dispLineBrasil.xaction | 20 +-
.../disponibilidade/dispLineCidade.xaction | 18 +-
.../disponibilidade/dispLineEstado.xaction | 17 +-
.../disponibilidade/dispLineRegiao.xaction | 19 +-
.../disponibilidade/dispPieBrasil.xaction | 11 +-
.../disponibilidade/dispPieCidade.xaction | 13 +-
.../disponibilidade/dispPieEstado.xaction | 12 +-
.../disponibilidade/dispPieRegiao.xaction | 11 +-
.../disponibilidade/dispRelatorio.xaction | 22 +-
.../proinfo/disponibilidade/dispRelatorio.xml | 26 +--
.../inventario/inventBarBrasil.xaction | 39 +---
.../inventario/inventBarCidade.xaction | 33 +--
.../inventario/inventBarEstado.xaction | 30 +--
.../inventario/inventBarRegiao.xaction | 30 +--
.../inventario/inventLineBrasil.xaction | 25 +--
.../inventario/inventLineCidade.xaction | 25 +--
.../inventario/inventLineEstado.xaction | 25 +--
.../inventario/inventLineRegiao.xaction | 24 +-
.../inventario/inventRelatorio.xaction | 207 ++++--------------
50 files changed, 392 insertions(+), 1497 deletions(-)
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarBrasil.xaction
index 34f4feb..0c7a219 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarBrasil.xaction
@@ -34,14 +34,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char((SELECT MAX(end_time) FROM control), 'DD/MM/YYYY') AS Brasil,
- SUM(hd_amount) AS "Máquinas com HD modificado",
- SUM(memory_amount) AS "Máquinas com memória modificada"
-FROM
- dm_alert_state
-WHERE
- project = 'proinfo'::project_enum
+ select to_char((select MAX(end_time) FROM control), 'DD/MM/YYYY') AS Brasil, sum(hd_amount) AS "Máquinas com HD modificado", sum(memory_amount) AS "Máquinas com memória modificada"
+ from dm_alert_state
+ where project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarCidade.xaction
index 75c8d0c..9f27ab5 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarCidade.xaction
@@ -53,18 +53,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- city AS Cidade,
- hd_amount AS "Máquinas com HD modificado",
- memory_amount AS "Máquinas com memória modificada"
-FROM
- dm_alert_city
-WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- project = 'proinfo'::project_enum
-ORDER BY
- city
+ select city AS Cidade, hd_amount AS "Máquinas com HD modificado", memory_amount AS "Máquinas com memória modificada"
+ from dm_alert_city
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND project = 'proinfo'
+ order by city
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarEstado.xaction
index d5c4615..312534c 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarEstado.xaction
@@ -44,17 +44,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- state AS Estado,
- hd_amount AS "Máquinas com HD modificado",
- memory_amount AS "Máquinas com memória modificada"
-FROM
- dm_alert_state
-WHERE
- region = '{REGIAO}' AND
- project = 'proinfo'::project_enum
-ORDER BY
- state ASC
+ select state AS Estado, hd_amount AS "Máquinas com HD modificado", memory_amount AS "Máquinas com memória modificada"
+ from dm_alert_state
+ where region = '{REGIAO}' AND project = 'proinfo'
+ order by state ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarRegiao.xaction
index 9e0bbff..e773181 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarRegiao.xaction
@@ -34,18 +34,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- region AS Regiao,
- SUM(hd_amount) AS "Máquinas com HD modificado",
- SUM(memory_amount) AS "Máquinas com memória modificada"
-FROM
- dm_alert_state
-WHERE
- project = 'proinfo'::project_enum
-GROUP BY
- region
-ORDER BY
- region ASC
+ select region AS Regiao, sum(hd_amount) AS "Máquinas com HD modificado", sum(memory_amount) AS "Máquinas com memória modificada"
+ from dm_alert_state
+ where project = 'proinfo'
+ group by region
+ order by region ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineBrasil.xaction
index b6de71c..16d8a72 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineBrasil.xaction
@@ -34,19 +34,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- sum(hd_amount) AS "Máquinas com HD modificado",
- sum(memory_amount) AS "Máquinas com memória modificada"
-FROM
- dm_alert_state_history
-WHERE
- project = 'proinfo'::project_enum
-GROUP BY
- contact_date
-ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, sum(hd_amount) AS "Máquinas com HD modificado", sum(memory_amount) AS "Máquinas com memória modificada"
+ from dm_alert_state_history
+ where project = 'proinfo'
+ group by contact_date
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineCidade.xaction
index c9d9c07..7562dd4 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineCidade.xaction
@@ -51,19 +51,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- hd_amount AS "Máquinas com HD modificado",
- memory_amount AS "Máquinas com memória modificada"
-FROM
- dm_alert_city_history
-WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- project = 'proinfo'::project_enum
-ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, hd_amount AS "Máquinas com HD modificado", memory_amount AS "Máquinas com memória modificada"
+ from dm_alert_city_history
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND project = 'proinfo'
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineEstado.xaction
index 31e96a4..b644f9d 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineEstado.xaction
@@ -44,18 +44,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- hd_amount AS "Máquinas com HD modificado",
- memory_amount AS "Máquinas com memória modificada"
-FROM
- dm_alert_state_history
-WHERE
- region = '{REGIAO}' AND
- project = 'proinfo'::project_enum
-ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, hd_amount AS "Máquinas com HD modificado", memory_amount AS "Máquinas com memória modificada"
+ from dm_alert_state_history
+ where region = '{REGIAO}' AND project = 'proinfo'
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineRegiao.xaction
index b76163c..0fd1499 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineRegiao.xaction
@@ -34,19 +34,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- sum(hd_amount) AS "Máquinas com HD modificado",
- sum(memory_amount) AS "Máquinas com memória modificada"
-FROM
- dm_alert_state_history
-WHERE
- project = 'proinfo'::project_enum
-GROUP BY
- contact_date
-ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, sum(hd_amount) AS "Máquinas com HD modificado", sum(memory_amount) AS "Máquinas com memória modificada"
+ from dm_alert_state_history
+ where project = 'proinfo'
+ group by contact_date
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieBrasil.xaction
index 1014346..b6d9f2a 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieBrasil.xaction
@@ -34,20 +34,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT SUM(ok) AS "OK", SUM(hd) AS "HD", SUM(mm) AS "MM"
-FROM
- ( SELECT
- CASE WHEN inv_alerta_hd = 'B0' AND inv_alerta_mem = 'B0' THEN 1 ELSE 0 END AS ok,
- CASE WHEN inv_alerta_hd = 'B1' THEN 1 ELSE 0 END AS hd,
- CASE WHEN inv_alerta_mem = 'B1' THEN 1 ELSE 0 END AS mm
- FROM mectb10_dm_inventario AS inn INNER JOIN
- ( SELECT MAX(inv_data) AS mdata, inv_inep, inv_maquina
- FROM mectb10_dm_inventario
- WHERE inv_projeto = 0
- GROUP BY inv_inep, inv_maquina) AS temp ON
- temp.inv_inep = inn.inv_inep AND
- temp.mdata = inn.inv_data AND
- temp.inv_maquina = inn.inv_maquina) AS temp2
+ select ((select sum(total) from dm_avail_state) - (sum(alert.memory_amount) + sum(alert.hd_amount))) AS "OK", sum(alert.hd_amount) AS "HD", sum(alert.memory_amount) AS "MM"
+ from dm_alert_state alert
+ where alert.project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieCidade.xaction
index 1eaec68..4455e75 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieCidade.xaction
@@ -51,59 +51,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_regiao = '{REGIAO}' AND
- inv_estado = '{ESTADO}' AND
- inv_alerta_hd = 'B0' AND
- inv_alerta_mem = 'B0' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "OK",
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_regiao = '{REGIAO}' AND
- inv_estado = '{ESTADO}' AND
- inv_alerta_hd = 'B1' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "HD",
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_regiao = '{REGIAO}' AND
- inv_estado = '{ESTADO}' AND
- inv_alerta_mem = 'B1' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "MM"
+ select ((select sum(total) from dm_avail_state) - (sum(alert.memory_amount) + sum(alert.hd_amount))) AS "OK", sum(alert.hd_amount) AS "HD", sum(alert.memory_amount) AS "MM"
+ from dm_alert_state alert
+ where alert.region = '{REGIAO}' AND alert.region = '{ESTADO}' AND alert.project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieEstado.xaction
index d964800..5bb8e0e 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieEstado.xaction
@@ -44,56 +44,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_regiao = '{REGIAO}' AND
- inv_alerta_hd = 'B0' AND
- inv_alerta_mem = 'B0' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "OK",
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_regiao = '{REGIAO}' AND
- inv_alerta_hd = 'B1' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "HD",
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_regiao = '{REGIAO}' AND
- inv_alerta_mem = 'B1' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "MM"
+ select ((select sum(total) from dm_avail_state) - (sum(alert.memory_amount) + sum(alert.hd_amount))) AS "OK", sum(alert.hd_amount) AS "HD", sum(alert.memory_amount) AS "MM"
+ from dm_alert_state alert
+ where alert.region = '{REGIAO}' AND alert.project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieRegiao.xaction
index 5f31e97..9964858 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertPieRegiao.xaction
@@ -34,53 +34,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_alerta_hd = 'B0' AND
- inv_alerta_mem = 'B0' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "OK",
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_alerta_hd = 'B1' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "HD",
- ( SELECT count(inv_maquina)
- FROM
- ( SELECT
- MAX(inv_data) as data,
- inv_maquina as maquina,
- inv_escola as escola
- FROM mectb10_dm_inventario
- GROUP BY escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- inv_alerta_mem = 'B1' AND
- mectb10_dm_inventario.inv_projeto = 0 ) AS "MM"
+ select ((select sum(total) from dm_avail_state) - (sum(alert.memory_amount) + sum(alert.hd_amount))) AS "OK", sum(alert.hd_amount) AS "HD", sum(alert.memory_amount) AS "MM"
+ from dm_alert_state alert
+ where alert.project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertRelatorio.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertRelatorio.xaction
index 2c7da2b..abe5909 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertRelatorio.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertRelatorio.xaction
@@ -72,110 +72,9 @@
<output-type>pdf</output-type>
<query>
<![CDATA[
- SELECT
- ORIGINAL.data_atual AS data_atual,
- ORIGINAL.regiao AS regiao,
- ORIGINAL.estado AS estado,
- ORIGINAL.cidade AS cidade,
- ORIGINAL.escola AS escola,
- ORIGINAL.maquina AS maquina,
- ORIGINAL.so AS so,
- ORIGINAL.processador AS processador,
- ORIGINAL.data AS data_original,
-
- CASE WHEN ORIGINAL.memoria < 1024
- THEN ORIGINAL.memoria || ' KiB'
- ELSE CASE WHEN ORIGINAL.memoria < 1048576
- THEN ORIGINAL.memoria / 1024 || ' MiB'
- ELSE CASE WHEN ORIGINAL.memoria < 1073741824
- THEN ORIGINAL.memoria / 1048576 || ' GiB'
- ELSE ORIGINAL.memoria / 1073741824 || ' TiB'
- END END END AS memoria_original,
-
- CASE WHEN ORIGINAL.hd < 1000
- THEN ORIGINAL.hd || ' GB'
- ELSE CASE WHEN ORIGINAL.hd < 1000000
- THEN ORIGINAL.hd / 1000 || ' TB'
- ELSE ORIGINAL.hd / 1000000 || ' PB'
- END END AS hd_original,
-
- CASE WHEN MODIFICADO.memoria < 1024
- THEN MODIFICADO.memoria || ' KiB'
- ELSE CASE WHEN MODIFICADO.memoria < 1048576
- THEN MODIFICADO.memoria / 1024 || ' MiB'
- ELSE CASE WHEN MODIFICADO.memoria < 1073741824
- THEN MODIFICADO.memoria / 1048576 || ' GiB'
- ELSE MODIFICADO.memoria / 1073741824 || ' TiB'
- END END END AS memoria_modificado,
-
- CASE WHEN MODIFICADO.hd < 1000
- THEN MODIFICADO.hd || ' GB'
- ELSE CASE WHEN MODIFICADO.hd < 1000000
- THEN MODIFICADO.hd / 1000 || ' TB'
- ELSE MODIFICADO.hd / 1000000 || ' PB'
- END END AS hd_modificado,
-
- MODIFICADO.data AS data_modificado,
- MODIFICADO.alerta_hd AS alerta_hd,
- MODIFICADO.alerta_mem AS alerta_mem
- FROM
- (SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS data_atual,
- initcap(inv_regiao) AS regiao,
- inv_estado AS estado,
- initcap(inv_cidade) AS cidade,
- initcap(inv_escola) AS escola,
- inv_maquina AS maquina,
- inv_so AS so,
- inv_modelo_proc AS processador,
- min(inv_data) AS data,
- inv_qtde_mem AS memoria,
- inv_tam_disco AS hd
- FROM mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_cidade = '{CIDADE}'
- AND mectb10_dm_inventario.inv_projeto = 0
- GROUP BY
- inv_regiao,
- inv_estado,
- inv_cidade,
- inv_escola,
- maquina,
- so,
- processador,
- memoria,
- hd
-) ORIGINAL
-
-RIGHT OUTER JOIN
- (SELECT
- max(inv_data) AS data,
- inv_maquina AS maquina,
- inv_qtde_mem AS memoria,
- inv_tam_disco AS hd,
- inv_alerta_hd AS alerta_hd,
- inv_alerta_mem AS alerta_mem
- FROM mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_cidade = '{CIDADE}'
- AND (inv_alerta_hd = 'B1' OR inv_alerta_mem = 'B1')
- AND mectb10_dm_inventario.inv_projeto = 0
- GROUP BY
- maquina,
- memoria,
- hd,
- alerta_hd,
- alerta_mem
-) MODIFICADO
-
- ON ORIGINAL.maquina = MODIFICADO.maquina AND
- ORIGINAL.data <> MODIFICADO.data
- ORDER BY
- escola ASC
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') AS load_date, region, state, city, school, machine, os_distro, processor, old_date, simplify_mem(old_memory_size) AS old_memory_size, simplify_hd(old_hd_size) AS old_hd_size, simplify_mem(new_memory_size) AS new_memory_size, simplify_hd(new_hd_size) AS new_hd_size, new_date, hd_alert, memory_alert
+ from dm_alert_machine
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND city = '{CIDADE}' AND project = 'proinfo' AND (hd_alert = true OR memory_alert = true)
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarBrasil.xaction
index 9784303..fce5775 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarBrasil.xaction
@@ -34,23 +34,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- to_char(aud_data, 'DD/MM/YYYY') AS Brasil,
- instaladas as "Instaladas",
- CASE WHEN previstas IS NULL THEN 0
- WHEN previstas - instaladas < 0 THEN 0
- ELSE previstas - instaladas
- END AS "Não instaladas"
- FROM
- (SELECT aud.aud_data, sum(aud_instaladas) AS instaladas, sum(aud_instaladas) AS previstas
- FROM
- (SELECT MAX(aud_data) AS aud_data, aud_inep FROM mectb11_dm_auditoria GROUP BY aud_inep) AS temp
- NATURAL JOIN mectb11_dm_auditoria AS aud
- WHERE aud_projeto = 0
- GROUP BY aud.aud_data)
- AS temp2
- ORDER BY brasil DESC
- LIMIT 1
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') as
+ Brasil, sum(total), 0
+ from dm_avail_state
+ where project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarCidade.xaction
index daee1be..1d23578 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarCidade.xaction
@@ -36,13 +36,10 @@
<action-definition>
<component-name>SQLLookupRule</component-name>
<action-type>Relational</action-type>
- <action-inputs>
- <ESTADO type="string"/>
- </action-inputs>
<action-inputs>
<REGIAO type="string"/>
+ <ESTADO type="string"/>
</action-inputs>
-
<action-outputs>
<query-result type="result-set" mapping="swresult"/>
</action-outputs>
@@ -54,50 +51,14 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- aud_cidade AS Cidade,
- to_char(CURRENT_DATE, 'DD/MM/YYYY') AS Brasil,
- sum(mectb11_dm_auditoria.aud_instaladas) as "Instaladas",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "Não instaladas"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria WHERE aud_regiao = '{REGIAO}' AND aud_estado = '{ESTADO}' group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
- GROUP BY
- Cidade
- ORDER BY
- Cidade ASC
+ select initcap(city), total, 0
+ from dm_avail_city
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}'
+ order by city
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- aud_cidade AS Cidade,
- sum("mectb11_dm_auditoria"."aud_instaladas") AS instaladas,
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
-sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
-sum("mectb11_dm_auditoria"."aud_previstas") -
-sum("mectb11_dm_auditoria"."aud_instaladas") END AS nao_instaladas
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_regiao = '{REGIAO}' AND
- aud_estado = '{ESTADO}' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
- GROUP BY
- aud_regiao,
- aud_estado,
- Cidade,
- aud_data
- ORDER BY
- Cidade ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarEstado.xaction
index 6325dd0..a8111d0 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarEstado.xaction
@@ -44,48 +44,13 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- aud_estado AS Estado,
- to_char(CURRENT_DATE, 'DD/MM/YYYY') AS Brasil,
- sum(mectb11_dm_auditoria.aud_instaladas) as "Instaladas",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "Não instaladas"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria WHERE aud_regiao = '{REGIAO}' group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
- GROUP BY
- Estado
- ORDER BY
- Estado ASC
+ select state, total, 0
+ from dm_avail_state
+ where project = 'proinfo' and region = '{REGIAO}'
+ order by state
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- aud_estado AS Estado,
- sum("mectb11_dm_auditoria"."aud_instaladas") AS instaladas,
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
-sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
-sum("mectb11_dm_auditoria"."aud_previstas") -
-sum("mectb11_dm_auditoria"."aud_instaladas") END AS nao_instaladas
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_regiao = '{REGIAO}' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
- GROUP BY
- aud_regiao,
- Estado,
- aud_data
- ORDER BY
- Estado ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarRegiao.xaction
index eb74159..3563265 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditBarRegiao.xaction
@@ -34,47 +34,14 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- aud_regiao AS Regiao,
- sum(mectb11_dm_auditoria.aud_instaladas) as "Instaladas",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "Não instaladas"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- aud_regiao <> 'NULL' AND
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
- GROUP BY
- Regiao
- ORDER BY
- Regiao ASC
+ select initcap(region), sum(total), 0
+ from dm_avail_state
+ where project = 'proinfo'
+ group by region
+ order by region
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- aud_regiao AS Regiao,
- sum("mectb11_dm_auditoria"."aud_instaladas") AS instaladas,
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
-sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
-sum("mectb11_dm_auditoria"."aud_previstas") -
-sum("mectb11_dm_auditoria"."aud_instaladas") END AS nao_instaladas
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_regiao <> 'NULL' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
- GROUP BY
- Regiao,
- aud_data
- ORDER BY
- Regiao ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineBrasil.xaction
index b871030..43b0998 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineBrasil.xaction
@@ -34,69 +34,15 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas,
- CASE WHEN sum(inst_previstas) -
- sum(inst_instaladas) < 0 THEN 0 ELSE
- sum(inst_previstas) -
- sum(inst_instaladas) END AS Nao_instaladas
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
- GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
- ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ select to_char(contact_date, 'TMMonth'), sum(total), 0
+ from dm_avail_state_history
+ where project = 'proinfo' and contact_date > current_date - interval
+ '6 months'
+ group by contact_date
+ order by contact_date
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- initcap("mectb11_dm_auditoria"."aud_mes_nm") AS mes,
- sum("mectb11_dm_auditoria"."aud_instaladas") AS instaladas,
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS nao_instaladas
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE)
- GROUP BY
- aud_mes_nm,
- aud_mes
- ORDER BY
- aud_mes ASC
-____________________________________
- SELECT
- initcap("mectb11_dm_auditoria"."aud_mes_nm") AS mes,
- sum(mectb11_dm_auditoria.aud_instaladas) as "Instaladas",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "Não instaladas"
- FROM
- (select aud_mes as mes, max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria where aud_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) group by mes, inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- temp.mes = mectb11_dm_auditoria.aud_mes
- GROUP BY
- aud_mes_nm,
- aud_mes
- ORDER BY
- aud_mes ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineCidade.xaction
index 984f5ac..496a155 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineCidade.xaction
@@ -12,18 +12,18 @@
</documentation>
<inputs>
- <ESTADO type="string">
- <sources>
- <request>ESTADO</request>
- </sources>
- <default-value><![CDATA[NULL]]></default-value>
- </ESTADO>
<REGIAO type="string">
<sources>
<request>REGIAO</request>
</sources>
<default-value><![CDATA[NULL]]></default-value>
</REGIAO>
+ <ESTADO type="string">
+ <sources>
+ <request>ESTADO</request>
+ </sources>
+ <default-value><![CDATA[NULL]]></default-value>
+ </ESTADO>
</inputs>
<outputs>
@@ -37,8 +37,8 @@
<component-name>SQLLookupRule</component-name>
<action-type>Relational</action-type>
<action-inputs>
- <ESTADO type="string"/>
<REGIAO type="string"/>
+ <ESTADO type="string"/>
</action-inputs>
<action-outputs>
<query-result type="result-set" mapping="swresult"/>
@@ -50,31 +50,12 @@
<user-id><![CDATA[]]></user-id>
<password><![CDATA[]]></password>
<query>
- <![CDATA[
- SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas,
- CASE WHEN sum(inst_previstas) -
- sum(inst_instaladas) < 0 THEN 0 ELSE
- sum(inst_previstas) -
- sum(inst_instaladas) END AS Nao_instaladas
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_regiao = '{REGIAO}' AND
- inst_estado = '{ESTADO}' AND
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
- GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
- ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ <![CDATA[
+ select to_char(contact_date, 'TMMonth'), total, 0
+ from dm_avail_state_history
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}' and contact_date > current_date - interval '6 months'
+ order by contact_date
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineEstado.xaction
index 83d3e9b..e03c8fa 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineEstado.xaction
@@ -44,29 +44,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas,
- CASE WHEN sum(inst_previstas) -
- sum(inst_instaladas) < 0 THEN 0 ELSE
- sum(inst_previstas) -
- sum(inst_instaladas) END AS Nao_instaladas
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_regiao = '{REGIAO}' AND
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
- GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
- ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ select to_char(contact_date, 'TMMonth'), sum(total), 0
+ from dm_avail_state_history
+ where project = 'proinfo' and region = '{REGIAO}' and contact_date >
+ current_date - interval '6 months'
+ group by contact_date
+ order by contact_date
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineRegiao.xaction
index ec5dc34..43b0998 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditLineRegiao.xaction
@@ -34,49 +34,15 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas,
- CASE WHEN sum(inst_previstas) -
- sum(inst_instaladas) < 0 THEN 0 ELSE
- sum(inst_previstas) -
- sum(inst_instaladas) END AS Nao_instaladas
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
- GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
- ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ select to_char(contact_date, 'TMMonth'), sum(total), 0
+ from dm_avail_state_history
+ where project = 'proinfo' and contact_date > current_date - interval
+ '6 months'
+ group by contact_date
+ order by contact_date
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- initcap("mectb11_dm_auditoria"."aud_mes_nm") AS mes,
- sum("mectb11_dm_auditoria"."aud_instaladas") AS instaladas,
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS nao_instaladas
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE)
- GROUP BY
- aud_mes_nm,
- aud_mes
- ORDER BY
- aud_mes ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieBrasil.xaction
index 817f555..74f5ce5 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieBrasil.xaction
@@ -33,34 +33,13 @@
<user-id><![CDATA[]]></user-id>
<password><![CDATA[]]></password>
<query>
- <![CDATA[
- SELECT
- sum(mectb11_dm_auditoria.aud_instaladas) AS "I",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "NI"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
+ <![CDATA[
+ select sum(total), 0
+ from dm_avail_state
+ where project = 'proinfo'
]]>
- </query>
+ </query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- sum("mectb11_dm_auditoria"."aud_instaladas") AS "Instaladas",
- sum("mectb11_dm_auditoria"."aud_previstas") - sum("mectb11_dm_auditoria"."aud_instaladas") AS "Não instaladas"
- FROM
- "mectb11_dm_auditoria"
- GROUP BY
- aud_data
- ORDER BY
- aud_data DESC limit 1
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieCidade.xaction
index fe179ba..e7d80ff 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieCidade.xaction
@@ -51,33 +51,13 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- sum(mectb11_dm_auditoria.aud_instaladas) as "I",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "NI"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria WHERE aud_regiao = '{REGIAO}' AND aud_estado = '{ESTADO}' group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
+ select total, 0
+ from dm_avail_state
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}'
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- sum("mectb11_dm_auditoria"."aud_instaladas") AS "Instaladas",
- sum("mectb11_dm_auditoria"."aud_previstas") - sum("mectb11_dm_auditoria"."aud_instaladas") AS "Não instaladas"
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_regiao = '{REGIAO}' AND
- aud_estado = '{ESTADO}' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieEstado.xaction
index cc56255..d0ccf5f 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieEstado.xaction
@@ -44,32 +44,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- sum(mectb11_dm_auditoria.aud_instaladas) as "I",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "NI"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria WHERE aud_regiao = '{REGIAO}' group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
+ select sum(total), 0
+ from dm_avail_state
+ where project = 'proinfo' and region = '{REGIAO}'
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- sum("mectb11_dm_auditoria"."aud_instaladas") AS "Instaladas",
- sum("mectb11_dm_auditoria"."aud_previstas") - sum("mectb11_dm_auditoria"."aud_instaladas") AS "Não instaladas"
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_regiao = '{REGIAO}' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieRegiao.xaction
index 94031e4..74f5ce5 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditPieRegiao.xaction
@@ -34,32 +34,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- sum(mectb11_dm_auditoria.aud_instaladas) AS "I",
- CASE WHEN sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") < 0 THEN 0 ELSE
- sum("mectb11_dm_auditoria"."aud_previstas") -
- sum("mectb11_dm_auditoria"."aud_instaladas") END AS "NI"
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
+ select sum(total), 0
+ from dm_avail_state
+ where project = 'proinfo'
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- sum("mectb11_dm_auditoria"."aud_instaladas") AS "Instaladas",
- sum("mectb11_dm_auditoria"."aud_previstas") - sum("mectb11_dm_auditoria"."aud_instaladas") AS "Não instaladas"
- FROM
- "mectb11_dm_auditoria"
- WHERE
- aud_regiao <> 'NULL' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorio.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorio.xaction
index a27d556..f3d6647 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorio.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorio.xaction
@@ -1,134 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
-<action-sequence>
+<action-sequence>
<title>Relatório</title>
<version>1</version>
<logging-level>ERROR</logging-level>
- <documentation>
- <author>C3SL</author>
- <description>.</description>
- <help/>
- <result-type/>
- <icon/>
+ <documentation>
+ <author>C3SL</author>
+ <description>.</description>
+ <help/>
+ <result-type/>
+ <icon/>
</documentation>
- <inputs>
- <output-type type="string">
- <default-value>pdf</default-value>
- <sources>
- <request>output-type</request>
- </sources>
- </output-type>
- <ESTADO type="string">
- <sources>
- <request>ESTADO</request>
- </sources>
+ <inputs>
+ <output-type type="string">
+ <default-value>pdf</default-value>
+ <sources>
+ <request>output-type</request>
+ </sources>
+ </output-type>
+ <REGIAO type="string">
+ <sources>
+ <request>REGIAO</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </ESTADO>
- <REGIAO type="string">
- <sources>
- <request>REGIAO</request>
- </sources>
+ </REGIAO>
+ <ESTADO type="string">
+ <sources>
+ <request>ESTADO</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </REGIAO>
- <CIDADE type="string">
- <sources>
- <request>CIDADE</request>
- </sources>
+ </ESTADO>
+ <CIDADE type="string">
+ <sources>
+ <request>CIDADE</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </CIDADE>
+ </CIDADE>
</inputs>
<outputs/>
- <resources>
- <ReportFile>
- <solution-file>
- <location>auditRelatorio.xml</location>
- <mime-type>text/xml</mime-type>
- </solution-file>
- </ReportFile>
+ <resources>
+ <ReportFile>
+ <solution-file>
+ <location>auditRelatorio.xml</location>
+ <mime-type>text/xml</mime-type>
+ </solution-file>
+ </ReportFile>
</resources>
-
- <actions>
- <action-definition>
+
+ <actions>
+ <action-definition>
<component-name>JFreeReportComponent</component-name>
<action-type>JFree Report</action-type>
- <action-inputs>
- <ESTADO type="string"/>
- <REGIAO type="string"/>
- <CIDADE type="string"/>
- <output-type type="string"/>
+ <action-inputs>
+ <REGIAO type="string"/>
+ <ESTADO type="string"/>
+ <CIDADE type="string"/>
+ <output-type type="string"/>
</action-inputs>
- <action-resources>
- <report-definition type="resource" mapping="ReportFile"/>
+ <action-resources>
+ <report-definition type="resource" mapping="ReportFile"/>
</action-resources>
- <component-definition>
- <live><![CDATA[false]]></live>
- <driver><![CDATA[org.postgresql.Driver]]></driver>
- <connection><![CDATA[jdbc:postgresql://]]></connection>
- <user-id><![CDATA[]]></user-id>
- <password><![CDATA[]]></password>
- <source>sql</source>
+ <component-definition>
+ <live><![CDATA[false]]></live>
+ <driver><![CDATA[org.postgresql.Driver]]></driver>
+ <connection><![CDATA[jdbc:postgresql://]]></connection>
+ <user-id><![CDATA[]]></user-id>
+ <password><![CDATA[]]></password>
+ <source>sql</source>
<output-type>pdf</output-type>
- <query> <![CDATA[
- SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS data_atual,
- initcap(aud_regiao) AS regiao,
- aud_estado,
- initcap(aud_cidade) AS cidade,
- initcap(aud_escola) AS escola,
- aud_data,
- aud_instaladas AS instaladas,
- CASE WHEN aud_previstas-aud_instaladas < 0 THEN 0 ELSE
- aud_previstas-aud_instaladas END AS nao_instaladas
- FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria
- WHERE aud_regiao = '{REGIAO}' AND aud_estado = '{ESTADO}' AND
- aud_cidade = '{CIDADE}' AND
- mectb11_dm_auditoria.aud_projeto = 0
- group by inep) temp,
- mectb11_dm_auditoria
- WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- mectb11_dm_auditoria.aud_projeto = 0
-ORDER BY
- aud_escola ASC,
- instaladas ASC,
- nao_instaladas ASC
- ]]> </query>
+ <query>
+ <![CDATA[
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') as
+ data_atual, region as regiao, state as aud_estado, city as
+ cidade, school as escola, count(machine) as aud_instaladas, 0 as
+ nao_instaladas
+ from dm_avail_machine
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}' and city = '{CIDADE}'
+ group by school
+ order by school
+ ]]>
+ </query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
-SELECT
- to_char(CURRENT_DATE,'DD/MM/YYYY') AS data_atual,
- initcap(aud_regiao) AS regiao,
- aud_estado,
- initcap(aud_cidade) AS cidade,
- initcap(aud_escola) AS escola,
- aud_data,
- aud_instaladas AS instaladas,
- CASE WHEN aud_previstas-aud_instaladas < 0 THEN 0 ELSE
-aud_previstas-aud_instaladas END AS nao_instaladas
-FROM
- "mectb11_dm_auditoria" mectb11_dm_auditoria
-WHERE
- aud_regiao = '{REGIAO}' AND
- aud_estado = '{ESTADO}' AND
- aud_cidade = '{CIDADE}' AND
- aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
-GROUP BY
- aud_regiao,
- aud_estado,
- aud_cidade,
- aud_escola,
- instaladas,
- nao_instaladas,
- aud_data
-ORDER BY
- aud_escola ASC,
- instaladas ASC,
- nao_instaladas ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorioRoxo.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorioRoxo.xaction
index f86995c..6374110 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorioRoxo.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/auditoria/auditRelatorioRoxo.xaction
@@ -1,134 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
-<action-sequence>
+<action-sequence>
<title>Relatório</title>
<version>1</version>
<logging-level>ERROR</logging-level>
- <documentation>
- <author>C3SL</author>
- <description>.</description>
- <help/>
- <result-type/>
- <icon/>
+ <documentation>
+ <author>C3SL</author>
+ <description>.</description>
+ <help/>
+ <result-type/>
+ <icon/>
</documentation>
- <inputs>
- <output-type type="string">
- <default-value>pdf</default-value>
- <sources>
- <request>output-type</request>
- </sources>
- </output-type>
- <ESTADO type="string">
- <sources>
- <request>ESTADO</request>
- </sources>
+ <inputs>
+ <output-type type="string">
+ <default-value>pdf</default-value>
+ <sources>
+ <request>output-type</request>
+ </sources>
+ </output-type>
+ <REGIAO type="string">
+ <sources>
+ <request>REGIAO</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </ESTADO>
- <REGIAO type="string">
- <sources>
- <request>REGIAO</request>
- </sources>
+ </REGIAO>
+ <ESTADO type="string">
+ <sources>
+ <request>ESTADO</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </REGIAO>
- <CIDADE type="string">
- <sources>
- <request>CIDADE</request>
- </sources>
+ </ESTADO>
+ <CIDADE type="string">
+ <sources>
+ <request>CIDADE</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </CIDADE>
+ </CIDADE>
</inputs>
<outputs/>
- <resources>
- <ReportFile>
- <solution-file>
- <location>auditRelatorioRoxo.xml</location>
- <mime-type>text/xml</mime-type>
- </solution-file>
- </ReportFile>
+ <resources>
+ <ReportFile>
+ <solution-file>
+ <location>auditRelatorioRoxo.xml</location>
+ <mime-type>text/xml</mime-type>
+ </solution-file>
+ </ReportFile>
</resources>
-
- <actions>
- <action-definition>
+
+ <actions>
+ <action-definition>
<component-name>JFreeReportComponent</component-name>
<action-type>JFree Report</action-type>
- <action-inputs>
- <ESTADO type="string"/>
- <REGIAO type="string"/>
- <CIDADE type="string"/>
- <output-type type="string"/>
+ <action-inputs>
+ <REGIAO type="string"/>
+ <ESTADO type="string"/>
+ <CIDADE type="string"/>
+ <output-type type="string"/>
</action-inputs>
- <action-resources>
- <report-definition type="resource" mapping="ReportFile"/>
+ <action-resources>
+ <report-definition type="resource" mapping="ReportFile"/>
</action-resources>
- <component-definition>
- <live><![CDATA[false]]></live>
- <driver><![CDATA[org.postgresql.Driver]]></driver>
- <connection><![CDATA[jdbc:postgresql://]]></connection>
- <user-id><![CDATA[]]></user-id>
- <password><![CDATA[]]></password>
- <source>sql</source>
+ <component-definition>
+ <live><![CDATA[false]]></live>
+ <driver><![CDATA[org.postgresql.Driver]]></driver>
+ <connection><![CDATA[jdbc:postgresql://]]></connection>
+ <user-id><![CDATA[]]></user-id>
+ <password><![CDATA[]]></password>
+ <source>sql</source>
<output-type>pdf</output-type>
<query>
<![CDATA[
-SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS data_atual,
- initcap(aud_regiao) AS regiao,
- aud_estado,
- initcap(aud_cidade) AS cidade,
- aud_instaladas,
- initcap(aud_escola) AS escola,
- aud_data,
- aud_instaladas AS instaladas
-FROM
- (select max(aud_data) as data, aud_inep as inep from mectb11_dm_auditoria WHERE aud_regiao = '{REGIAO}' AND aud_estado = '{ESTADO}' AND aud_cidade = '{CIDADE}' group by inep) temp,
- mectb11_dm_auditoria
-WHERE
- temp.data = mectb11_dm_auditoria.aud_data AND
- temp.inep = mectb11_dm_auditoria.aud_inep AND
- aud_instaladas = 0
-GROUP BY
- aud_regiao,
- aud_estado,
- aud_cidade,
- aud_instaladas,
- aud_escola,
- instaladas,
- aud_data
-ORDER BY
- instaladas ASC
- ]]></query>
- </component-definition>
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') as
+ data_atual, region as regiao, state as aud_estado, city as
+ cidade, school as escola
+ from dm_audit_zm_school
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}' and city = '{CIDADE}'
+ order by school
+ ]]>
+ </query>
+ </component-definition>
</action-definition>
- </actions>
+ </actions>
</action-sequence>
-<!--
-SELECT
- to_char(CURRENT_DATE, 'DD/MM/YYYY') AS data_atual,
- initcap(aud_regiao) AS regiao,
- aud_estado,
- initcap(aud_cidade) AS cidade,
- aud_instaladas,
- initcap(aud_escola) AS escola,
- aud_data,
- aud_instaladas AS instaladas
-FROM
- "mectb11_dm_auditoria" mectb11_dm_auditoria
-WHERE
- aud_regiao = '{REGIAO}'
- AND aud_estado = '{ESTADO}'
- AND aud_cidade = '{CIDADE}'
- AND aud_instaladas = 0
- AND aud_data = (SELECT max(aud_data) FROM "mectb11_dm_auditoria")
-GROUP BY
- aud_regiao,
- aud_estado,
- aud_cidade,
- aud_instaladas,
- aud_escola,
- instaladas,
- aud_data
-ORDER BY
- instaladas ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarBrasil.xaction
index ced463d..688d954 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarBrasil.xaction
@@ -34,15 +34,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- to_char((SELECT MAX(end_time) FROM control), 'DD/MM/YYYY') AS Brasil,
- sum(green) AS "Menos de 10 dias",
- sum(yellow) AS "Entre 11-30 dias",
- sum(red) AS "Mais de 30 dias"
- FROM
- dm_avail_state
- WHERE
- project = 'proinfo'::project_enum
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') AS Brasil, sum(green) AS "Menos de 10 dias", sum(yellow) AS "Entre 11-30 dias", sum(red) AS "Mais de 30 dias"
+ from dm_avail_state
+ where project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarCidade.xaction
index a280d5b..d4276dd 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarCidade.xaction
@@ -51,20 +51,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- to_char((SELECT max(end_time) FROM control), 'DD/MM/YY') AS
- city AS Cidade,
- green AS "Menos de 10 dias",
- yellow AS "Entre 11-30 dias",
- red AS "Mais de 30 dias"
- FROM
- dm_avail_city
- WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- project = 'proinfo'::project_enum
- ORDER BY
- city ASC
+ select to_char((select max(end_time) from control), 'DD/MM/YY') AS city AS Cidade, green AS "Menos de 10 dias", yellow AS "Entre 11-30 dias", red AS "Mais de 30 dias"
+ from dm_avail_city
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND project = 'proinfo'
+ order by city ASC
]]></query>
</component-definition>
</action-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarEstado.xaction
index d2f0242..422ddd5 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarEstado.xaction
@@ -44,18 +44,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- state AS Estado,
- green AS "Menos de 10 dias",
- yellow AS "Entre 11-30 dias",
- red AS "Mais de 30 dias"
- FROM
- dm_avail_state
- WHERE
- region = '{REGIAO}' AND
- project = 'proinfo'::project_enum
- ORDER BY
- state ASC
+ select state AS Estado, green AS "Menos de 10 dias", yellow AS "Entre 11-30 dias", red AS "Mais de 30 dias"
+ from dm_avail_state
+ where region = '{REGIAO}' AND project = 'proinfo'
+ order by state ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarRegiao.xaction
index 167c9f8..032da11 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarRegiao.xaction
@@ -34,19 +34,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- region AS Regiao,
- sum(green) AS "Menos de 10 dias",
- sum(yellow) AS "Entre 11-30 dias",
- sum(red) AS "Mais de 30 dias"
- FROM
- dm_avail_state
- WHERE
- project = 'proinfo'::project_enum
- GROUP BY
- region
- ORDER BY
- region ASC
+ select region AS Regiao, sum(green) AS "Menos de 10 dias", sum(yellow) AS "Entre 11-30 dias", sum(red) AS "Mais de 30 dias"
+ from dm_avail_state
+ where project = 'proinfo'
+ group by region
+ order by region ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineBrasil.xaction
index d080b30..f14d5d4 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineBrasil.xaction
@@ -34,21 +34,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
-
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- sum(green) AS verde,
- sum(yellow) AS amarelo,
- sum(red) AS vermelho
- FROM
- dm_avail_state_history
- WHERE
- project = 'proinfo'::project_enum
- GROUP BY
- contact_date
- ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, sum(green) AS verde, sum(yellow) AS amarelo, sum(red) AS vermelho
+ from dm_avail_state_history
+ where project = 'proinfo'
+ group by contact_date
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineCidade.xaction
index 1a2be46..7363c84 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineCidade.xaction
@@ -51,20 +51,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- green AS verde,
- yellow AS amarelo,
- red AS vermelho
- FROM
- dm_avail_city_history
- WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- project = 'proinfo'::project_enum
- ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, green AS verde, yellow AS amarelo, red AS vermelho
+ from dm_avail_city_history
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND project = 'proinfo'
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineEstado.xaction
index 4d74d82..f90dbf4 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineEstado.xaction
@@ -44,19 +44,10 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- green AS verde,
- yellow AS amarelo,
- red AS vermelho
- FROM
- dm_avail_state_history
- WHERE
- region = '{REGIAO}' AND
- project = 'proinfo'::project_enum
- ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, green AS verde, yellow AS amarelo, red AS vermelho
+ from dm_avail_state_history
+ where region = '{REGIAO}' AND project = 'proinfo'
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineRegiao.xaction
index d332a54..65d6b5f 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineRegiao.xaction
@@ -34,20 +34,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char(contact_date, 'Month') AS mes,
- to_char(contact_date, 'MM') AS dis_mes,
- sum(green) AS verde,
- sum(yellow) AS amarelo,
- sum(red) AS vermelho
- FROM
- dm_avail_state_history
- WHERE
- project = 'proinfo'::project_enum
- GROUP BY
- contact_date
- ORDER BY
- contact_date ASC
+ select to_char(contact_date, 'Month') AS mes, to_char(contact_date, 'MM') AS dis_mes, sum(green) AS verde, sum(yellow) AS amarelo, sum(red) AS vermelho
+ from dm_avail_state_history
+ where project = 'proinfo'
+ group by contact_date
+ order by contact_date ASC
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieBrasil.xaction
index b3c760d..e161a31 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieBrasil.xaction
@@ -34,14 +34,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- sum(green) AS "Menos de 10 dias",
- sum(yellow) AS "Entre 11-30 dias",
- sum(red) AS "Mais de 30 dias"
- FROM
- dm_avail_state
- WHERE
- project = 'proinfo'::project_enum
+ select sum(green) AS "Menos de 10 dias", sum(yellow) AS "Entre 11-30 dias", sum(red) AS "Mais de 30 dias"
+ from dm_avail_state
+ where project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieCidade.xaction
index 801a44a..53e7335 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieCidade.xaction
@@ -51,16 +51,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- green AS "Menos de 10 dias",
- yellow AS "Entre 11-30 dias",
- red AS "Mais de 30 dias"
- FROM
- dm_avail_city
- WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- project = 'proinfo'::project_enum
+ select green AS "Menos de 10 dias", yellow AS "Entre 11-30 dias", red AS "Mais de 30 dias"
+ from dm_avail_city
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieEstado.xaction
index 04338da..25e82a7 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieEstado.xaction
@@ -44,15 +44,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- green AS "Menos de 10 dias",
- yellow AS "Entre 11-30 dias",
- red AS "Mais de 30 dias"
- FROM
- dm_avail_state
- WHERE
- region = '{REGIAO}' AND
- project = 'proinfo'::project_enum
+ select green AS "Menos de 10 dias", yellow AS "Entre 11-30 dias", red AS "Mais de 30 dias"
+ from dm_avail_state
+ where region = '{REGIAO}' AND project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieRegiao.xaction
index 5cf9de4..0e21aee 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieRegiao.xaction
@@ -34,14 +34,9 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- sum(dis_verde) AS "Menos de 10 dias",
- sum(dis_amarelo) AS "Entre 11-30 dias",
- sum(dis_vermelho) AS "Mais de 30 dias"
- FROM
- mectb09_dm_disp_ag
- WHERE
- project = 'proinfo'::project_enum
+ select sum(dis_verde) AS "Menos de 10 dias", sum(dis_amarelo) AS "Entre 11-30 dias", sum(dis_vermelho) AS "Mais de 30 dias"
+ from mectb09_dm_disp_ag
+ where project = 'proinfo'
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xaction
index bb12921..f4d8a49 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xaction
@@ -72,25 +72,9 @@
<output-type>pdf</output-type>
<query>
<![CDATA[
-SELECT
- to_char((SELECT MAX(end_time) FROM control), 'DD/MM/YYYY') AS to_char,
- machine AS dis_maquina,
- initcap(region) AS regiao,
- state AS dis_estado,
- initcap(city) AS cidade,
- (SELECT MAX(end_time) FROM control) AS dis_data,
- last_contact AS max,
- days_last_contact AS dis_qtd_dias_ult_contato,
- total_contacts AS dis_qtd_contato_mes,
- initcap(school) AS escola,
- color AS status
-FROM
- dm_avail_machine
-WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- city = '{CIDADE}' AND
- project = 'proinfo':project_enum
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') AS load_date, machine, initcap(region), state, initcap(city), (select max(end_time) from control) AS dis_data, last_contact, days_last_contact, total_contacts, initcap(school), color
+ from dm_avail_machine
+ where region = '{REGIAO}' AND state = '{ESTADO}' AND city = '{CIDADE}' AND project = 'proinfo'
]]> </query>
</component-definition>
</action-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xml b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xml
index 8136980..e727ff0 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xml
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xml
@@ -158,7 +158,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="message-field">
- <basic-object name="format">Data: $(to_char)</basic-object>
+ <basic-object name="format">Data: $(load_date)</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -212,7 +212,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="message-field">
- <basic-object name="format">Região: $(regiao)</basic-object>
+ <basic-object name="format">Região: $(region)</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -266,7 +266,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="message-field">
- <basic-object name="format">Estado: $(dis_estado)</basic-object>
+ <basic-object name="format">Estado: $(state)</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -320,7 +320,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="message-field">
- <basic-object name="format">Cidade: $(cidade)</basic-object>
+ <basic-object name="format">Cidade: $(city)</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -1244,7 +1244,7 @@
</group>
<group name="mectb08_dm_disp_dis_escola">
<fields>
- <field>escola</field>
+ <field>school</field>
</fields>
<group-header>
<style>
@@ -1422,7 +1422,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="message-field">
- <basic-object name="format">$(escola)</basic-object>
+ <basic-object name="format">$(school)</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -1576,7 +1576,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="string-field">
- <basic-object name="field">dis_maquina</basic-object>
+ <basic-object name="field">machine</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -1632,7 +1632,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="string-field">
- <basic-object name="field">dis_qtd_dias_ult_contato</basic-object>
+ <basic-object name="field">days_last_contact</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -1688,7 +1688,7 @@
<basic-key name="trim-text-content">true</basic-key>
</style>
<template references="string-field">
- <basic-object name="field">dis_qtd_contato_mes</basic-object>
+ <basic-object name="field">total_contacts</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
</element>
@@ -1904,7 +1904,7 @@
</compound-object>
<basic-object name="pattern">dd/MM/yyyy</basic-object>
</compound-object>
- <basic-object name="field">max</basic-object>
+ <basic-object name="field">last_contact</basic-object>
<basic-object name="format">dd/MM/yyyy</basic-object>
<basic-object name="nullValue"></basic-object>
</template>
@@ -2026,19 +2026,19 @@
<expression name="ShowRedSquare" class="org.jfree.report.function.ElementVisibilityFunction">
<properties>
<property name="element">red_square</property>
- <property name="field">vermelho</property>
+ <property name="field">color</property>
</properties>
</expression>
<expression name="ShowYellowTriangle" class="org.jfree.report.function.ElementVisibilityFunction">
<properties>
<property name="element">yellow_triangle</property>
- <property name="field">amarelo</property>
+ <property name="field">color</property>
</properties>
</expression>
<expression name="ShowGreenCircle" class="org.jfree.report.function.ElementVisibilityFunction">
<properties>
<property name="element">green_circle</property>
- <property name="field">verde</property>
+ <property name="field">color</property>
</properties>
</expression>
<expression name="ShowPageNumber" class="org.jfree.report.function.PageOfPagesFunction">
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarBrasil.xaction
index 36c5cf5..f1baf31 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarBrasil.xaction
@@ -34,45 +34,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- to_char((SELECT MAX(end_time) FROM control), 'DD/MM/YYYY') as Brasil,
- count(*)
-FROM
- dm_invent_machine
-WHERE
- project = 'proinfo'::project_enum
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') as Brasil, sum(total)
+ from dm_avail_state
+ where project = 'proinfo'
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- <![CDATA[
- SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS Brasil,
- count(distinct inv_maquina) AS maquinas_instaladas
- FROM
- "mectb10_dm_inventario"
- ]]>
-
- <![CDATA[
- SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS Brasil,
- count(inv_maquina)
- FROM
- ( SELECT DISTINCT inv_maquina as maquina,
- MAX(inv_data) as data,
- inv_escola as escola
- FROM
- mectb10_dm_inventario
- GROUP BY
- escola, maquina ) as temp,
- mectb10_dm_inventario
- WHERE
- mectb10_dm_inventario.inv_data = data AND
- mectb10_dm_inventario.inv_maquina = maquina AND
- mectb10_dm_inventario.inv_escola = escola AND
- mectb10_dm_inventario.inv_projeto = 0
- ]]>
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarCidade.xaction
index ca4dd02..c62ee24 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarCidade.xaction
@@ -52,38 +52,13 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- city AS Cidade,
- count(maquine)
-FROM
- dm_invent_machine
-WHERE
- region = '{REGIAO}' AND
- state = '{ESTADO}' AND
- project = 'proinfo'::project_enum
-GROUP BY
- city
-ORDER BY
- city
+ select initcap(city), total
+ from dm_avail_city
+ where project = 'proinfo' and region = '{REGIAO}' and state = '{ESTADO}'
+ order by city
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- inv_cidade AS Cidade,
- count(distinct inv_maquina) AS maquinas_instaladas
- FROM
- "mectb10_dm_inventario"
- WHERE
- inv_regiao = '{REGIAO}' AND
- inv_estado = '{ESTADO}'
- GROUP BY
- inv_regiao,
- inv_estado,
- Cidade
- ORDER BY
- Cidade ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarEstado.xaction
index 30e32cf..c121bd8 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarEstado.xaction
@@ -44,35 +44,13 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- state AS Estado,
- count(machine)
-FROM
- dm_invent_machine
-WHERE
- region = '{REGIAO}' AND
- project = 'proinfo'::project_enum
-GROUP BY
- state
-ORDER BY
- state
+ select state, total
+ from dm_avail_state
+ where project = 'proinfo' and region = '{REGIAO}'
+ order by state
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- SELECT
- inv_estado AS Estado,
- count(distinct inv_maquina) AS maquinas_instaladas
- FROM
- "mectb10_dm_inventario"
- WHERE
- inv_regiao = '{REGIAO}'
- GROUP BY
- inv_regiao,
- Estado
- ORDER BY
- Estado ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarRegiao.xaction
index bacb362..d17df81 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarRegiao.xaction
@@ -34,34 +34,14 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- region AS Regiao,
- count(machine)
-FROM
- dm_invent_machine
-WHERE
- project = 'proinfo'::project_enum
-GROUP BY
- region
-ORDER BY
- region
+ select initcap(region), sum(total)
+ from dm_avail_state
+ where project = 'proinfo'
+ group by region
+ order by region
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-<!--
- <![CDATA[
- SELECT
- inv_regiao AS Regiao,
- count(distinct inv_maquina) AS maquinas_instaladas
- FROM
- "mectb10_dm_inventario"
- WHERE
- inv_regiao <> 'NULL'
- GROUP BY
- Regiao
- ORDER BY
- Regiao ASC
--->
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineBrasil.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineBrasil.xaction
index 5ed4202..c66ec86 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineBrasil.xaction
@@ -34,25 +34,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas
-FROM
- mectb12_dm_instaladas_ag
-WHERE
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
-GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
-ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
- ]]>
+ select to_char(contact_date, 'TMMonth'), sum(total)
+ from dm_avail_state_history
+ where project = 'proinfo' and contact_date > current_date - interval '6 months'
+ group by contact_date
+ order by contact_date
+ ]]>
</query>
</component-definition>
</action-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineCidade.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineCidade.xaction
index f9a650e..ad18e51 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineCidade.xaction
@@ -51,26 +51,11 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas
-FROM
- mectb12_dm_instaladas_ag
-WHERE
- inst_regiao = '{REGIAO}' AND
- inst_estado = '{ESTADO}' AND
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
-GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
-ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ select to_char(contact_date, 'TMMonth'), total
+ from dm_avail_state_history
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}' and contact_date > current_date - interval '6 months'
+ order by contact_date
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineEstado.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineEstado.xaction
index 7dedaa0..fbb1cfe 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineEstado.xaction
@@ -44,25 +44,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas
-FROM
- mectb12_dm_instaladas_ag
-WHERE
- inst_regiao = '{REGIAO}' AND
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
-GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
-ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ select to_char(contact_date, 'TMMonth'), sum(total)
+ from dm_avail_state_history
+ where project = 'proinfo' and region = '{REGIAO}' and contact_date >
+ current_date - interval '6 months'
+ group by contact_date
+ order by contact_date
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineRegiao.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineRegiao.xaction
index 54ecee8..6a85251 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventLineRegiao.xaction
@@ -34,24 +34,12 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT
- initcap("mectb12_dm_instaladas_ag"."inst_mes_nm") AS mes,
- cast("mectb12_dm_instaladas_ag"."inst_mes" as TEXT),
- sum(inst_instaladas) as Instaladas
-FROM
- mectb12_dm_instaladas_ag
-WHERE
- inst_data IS NOT NULL AND
- inst_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE AND
- -- inst_mes BETWEEN date_part('month',CURRENT_DATE)-6 AND date_part('month',CURRENT_DATE) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
-GROUP BY
- inst_mes_nm,
- inst_mes,
- inst_ano
-ORDER BY
- mectb12_dm_instaladas_ag.inst_ano ASC,
- mectb12_dm_instaladas_ag.inst_mes ASC
+ select to_char(contact_date, 'TMMonth'), sum(total)
+ from dm_avail_state_history
+ where project = 'proinfo' and contact_date > current_date - interval
+ '6 months'
+ group by contact_date
+ order by contact_date
]]>
</query>
</component-definition>
diff --git a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventRelatorio.xaction b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventRelatorio.xaction
index a13114f..b0e36ed 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventRelatorio.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventRelatorio.xaction
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
-<action-sequence>
+<action-sequence>
<title>Relatório</title>
<version>1</version>
<logging-level>ERROR</logging-level>
- <documentation>
- <author>C3SL</author>
- <description>.</description>
- <help/>
- <result-type/>
- <icon/>
+ <documentation>
+ <author>C3SL</author>
+ <description>.</description>
+ <help/>
+ <result-type/>
+ <icon/>
</documentation>
- <inputs>
- <output-type type="string">
- <default-value>pdf</default-value>
- <sources>
- <request>output-type</request>
- </sources>
- </output-type>
- <ESTADO type="string">
- <sources>
- <request>ESTADO</request>
- </sources>
+ <inputs>
+ <output-type type="string">
+ <default-value>pdf</default-value>
+ <sources>
+ <request>output-type</request>
+ </sources>
+ </output-type>
+ <REGIAO type="string">
+ <sources>
+ <request>REGIAO</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </ESTADO>
- <REGIAO type="string">
- <sources>
- <request>REGIAO</request>
- </sources>
+ </REGIAO>
+ <ESTADO type="string">
+ <sources>
+ <request>ESTADO</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </REGIAO>
- <CIDADE type="string">
- <sources>
- <request>CIDADE</request>
- </sources>
+ </ESTADO>
+ <CIDADE type="string">
+ <sources>
+ <request>CIDADE</request>
+ </sources>
<default-value><![CDATA[NULL]]></default-value>
- </CIDADE>
+ </CIDADE>
</inputs>
<outputs/>
- <resources>
- <ReportFile>
- <solution-file>
- <location>inventRelatorio.xml</location>
- <mime-type>report</mime-type>
- </solution-file>
- </ReportFile>
+ <resources>
+ <ReportFile>
+ <solution-file>
+ <location>inventRelatorio.xml</location>
+ <mime-type>report</mime-type>
+ </solution-file>
+ </ReportFile>
</resources>
<actions>
@@ -54,15 +54,15 @@
<component-name>JFreeReportComponent</component-name>
<action-type>JFree Report</action-type>
<action-inputs>
- <ESTADO type="string"/>
<REGIAO type="string"/>
+ <ESTADO type="string"/>
<CIDADE type="string"/>
<output-type type="string"/>
</action-inputs>
<action-resources>
<report-definition type="resource" mapping="ReportFile"/>
</action-resources>
- <component-definition>
+ <component-definition>
<live><![CDATA[false]]></live>
<driver><![CDATA[org.postgresql.Driver]]></driver>
<connection><![CDATA[jdbc:postgresql://]]></connection>
@@ -72,131 +72,18 @@
<output-type><![CDATA[application/pdf]]></output-type>
<query>
<![CDATA[
- SELECT
- a.data_atual AS data_atual,
- b.regiao AS regiao,
- b.inv_estado AS inv_estado,
- b.cidade AS cidade,
- b.escola AS escola,
- b.inv_maquina AS maquina,
- b.inv_data AS data,
- b.SO AS SO,
- b.processador AS processador,
- b.memoria AS memoria,
- b.HD AS HD
- FROM
-
- (SELECT
- distinct inv_escola,
- inv_maquina as maquina,
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS data_atual
- FROM
- "mectb10_dm_inventario" mectb10_dm_inventario
-WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_cidade = '{CIDADE}'
- AND mectb10_dm_inventario.inv_projeto = 0
-ORDER BY
- inv_escola ASC
- ) a
-
-INNER JOIN
-
-(SELECT
- distinct on (inv_maquina) inv_maquina,
- initcap(inv_regiao) AS regiao,
- inv_estado,
- initcap(inv_cidade) AS cidade,
- inv_data,
- inv_so AS SO,
- inv_modelo_proc AS processador,
- CASE WHEN inv_qtde_mem < 1024
- THEN inv_qtde_mem || ' KiB'
- ELSE CASE WHEN inv_qtde_mem < 1048576
- THEN inv_qtde_mem / 1024 || ' MiB'
- ELSE CASE WHEN inv_qtde_mem < 1073741824
- THEN inv_qtde_mem / 1048576 || ' GiB'
- ELSE inv_qtde_mem / 1073741824 || ' TiB'
- END END END AS memoria,
- CASE WHEN inv_tam_disco < 1000
- THEN inv_tam_disco || ' GB'
- ELSE CASE WHEN inv_tam_disco < 1000000
- THEN inv_tam_disco / 1000 || ' TB'
- ELSE inv_tam_disco / 1000000 || ' PB'
- END END AS HD,
- initcap(inv_escola) AS escola
-FROM
- "mectb10_dm_inventario" mectb10_dm_inventario
-WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_cidade = '{CIDADE}'
- AND mectb10_dm_inventario.inv_projeto = 0
-GROUP BY
- inv_regiao,
- inv_estado,
- inv_cidade,
- inv_escola,
- inv_maquina,
- inv_data,
- SO,
- processador,
- memoria,
- HD
-ORDER BY
- inv_maquina ASC,
- escola ASC
- ) b on a.maquina = b.inv_maquina
+ select to_char((select max(end_time) from control), 'DD/MM/YYYY') as
+ data_atual, region as regiao, state as inv_estado, city as
+ cidade, school as escola, machine as maquina, contact_date as
+ data, os_distro as SO, processor as processador, memory_size as
+ memoria, hd_size as HD
+ from dm_invent_machine
+ where project = 'proinfo' and region = '{REGIAO}' and state =
+ '{ESTADO}' and city = '{CIDADE}'
+ order by school, machine
]]>
</query>
</component-definition>
</action-definition>
</actions>
</action-sequence>
-
-<!--
- SELECT
- to_char(CURRENT_DATE, 'DD/MM/YYYY') AS data_atual,
- initcap(inv_regiao) AS regiao,
- inv_estado,
- initcap(inv_cidade) AS cidade,
- initcap(inv_escola) AS escola,
- inv_maquina AS maquina,
- MAX(inv_data) AS data,
- inv_so AS SO,
- inv_modelo_proc AS processador,
- CASE WHEN inv_qtde_mem < 1024
- THEN inv_qtde_mem || ' KiB'
- ELSE CASE WHEN inv_qtde_mem < 1048576
- THEN inv_qtde_mem / 1024 || ' MiB'
- ELSE CASE WHEN inv_qtde_mem < 1073741824
- THEN inv_qtde_mem / 1048576 || ' GiB'
- ELSE inv_qtde_mem / 1073741824 || ' TiB'
- END END END AS memoria,
- CASE WHEN inv_tam_disco < 1000
- THEN inv_tam_disco || ' GB'
- ELSE CASE WHEN inv_tam_disco < 1000000
- THEN inv_tam_disco / 1000 || ' TB'
- ELSE inv_tam_disco / 1000000 || ' PB'
- END END AS HD
- FROM
- "mectb10_dm_inventario" mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_cidade = '{CIDADE}'
- GROUP BY
- inv_regiao,
- inv_estado,
- inv_cidade,
- inv_escola,
- maquina,
- SO,
- processador,
- memoria,
- HD
- ORDER BY
- inv_escola ASC,
- inv_maquina ASC
--->
--
GitLab