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 1e787f8f44151e32f34d4dc6be95d4f356a02448..34f4feb615421442da9673e406e30b5ef58c478d 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarBrasil.xaction
@@ -34,17 +34,14 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS Brasil,
- SUM(inst_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_data IS NOT NULL AND
- inst_mes = date_part('month',CURRENT_DATE-1) AND
- inst_ano = date_part('year',CURRENT_DATE-1) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
+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
]]>
</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 20fed8ca3c6fa71f5f8ca480ea75cc1879048700..75c8d0cfc7bd9d257b4a8fdd10ad9319b1af2384 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarCidade.xaction
@@ -53,33 +53,18 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- CASE WHEN hd.cidade IS NULL then mem.cidade ELSE hd.cidade END AS Cidade,
- CASE WHEN hd.hd IS NULL THEN 0 ELSE hd.hd END AS "Máquinas com HD modificado",
- CASE WHEN mem.mem IS NULL THEN 0 ELSE mem.mem END AS "Máquinas com memória modificada"
- FROM
- (SELECT count(distinct inv_maquina) AS hd,
- inv_cidade AS cidade
- FROM mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_alerta_hd = 'B1'
- AND inv_projeto = 0
- GROUP BY inv_cidade) hd
- FULL OUTER JOIN
- (SELECT count(distinct inv_maquina) AS mem,
- inv_cidade AS cidade
- FROM mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}'
- AND inv_estado = '{ESTADO}'
- AND inv_alerta_mem = 'B1'
- AND inv_projeto = 0
- GROUP BY inv_cidade) mem
- ON mem.cidade = hd.cidade
- ORDER BY
- Cidade ASC
+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
]]>
</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 bc44a9d45f8ad1bee502bbb40d2ff7ecbfd91146..d5c4615ea8bb3468681f809c789236a520de187a 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarEstado.xaction
@@ -44,22 +44,17 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- inst_estado AS Estado,
- SUM(inst_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_regiao = '{REGIAO}' AND
- inst_data IS NOT NULL AND
- inst_mes = date_part('month',CURRENT_DATE-1) AND
- inst_ano = date_part('year',CURRENT_DATE-1) AND
- mectb12_dm_instaladas_ag.inst_projeto = 0
- GROUP BY
- Estado
- ORDER BY
- Estado 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'::project_enum
+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 9bca1ac8858b03592b57fa4413b1f05bc2d282ed..9e0bbffc73f37a0b1bf0ab04120665b2331d48ee 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertBarRegiao.xaction
@@ -34,22 +34,18 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- inst_regiao AS Regiao,
- SUM(inst_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- FROM
- mectb12_dm_instaladas_ag
- WHERE
- inst_regiao <> 'NULL' AND
- inst_data IS NOT NULL AND
- inst_mes = date_part('month',CURRENT_DATE-1) AND
- inst_ano = date_part('year',CURRENT_DATE-1) AND
- inst_projeto = 0
- GROUP BY
- Regiao
- ORDER BY
- Regiao 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'::project_enum
+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 89c80d9cdfcb4a1e0499ccc29d5acfce452fc7ec..b6de71c1c4cc43f312e2a2792f45603510302c82 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineBrasil.xaction
@@ -34,25 +34,19 @@
<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_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- 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, '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
]]>
</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 2e086844e6ddc9183d7200202d4156a39b6c3d48..c9d9c079b8328324b715221ba75390ccfb0b3f42 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineCidade.xaction
@@ -51,27 +51,19 @@
<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_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- 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, '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
]]>
</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 d33a962d09c364208575b77091759bf3479df2da..31e96a43b2e77630a333ee1748c9a45af1d196fa 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineEstado.xaction
@@ -44,26 +44,18 @@
<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_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- 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, '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
]]>
</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 71d43340708fd5d9e0de9c989c29838802c43d24..b76163c27ce963c64942b59951e622d2fe6a29c8 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/alertas/alertLineRegiao.xaction
@@ -34,25 +34,19 @@
<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_hd_modificado) AS "Máquinas com HD modificado",
- SUM(inst_mem_modificada) AS "Máquinas com memória modificada"
- 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, '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
]]>
</query>
</component-definition>
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 9ca77a45f17aae22aa073238f5cc9d959ad2dd10..ced463d11ec08238c982194bcd825bc1524c08f1 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarBrasil.xaction
@@ -34,19 +34,15 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS Brasil,
- sum("mectb09_dm_disp_ag"."dis_verde") AS "Menos de 10 dias",
- sum("mectb09_dm_disp_ag"."dis_amarelo") AS "Entre 11-30 dias",
- sum("mectb09_dm_disp_ag"."dis_vermelho") AS "Mais de 30 dias"
+ 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
- "mectb09_dm_disp_ag"
+ dm_avail_state
WHERE
- mectb09_dm_disp_ag.dis_projeto = 0
- GROUP BY
- dis_data
- ORDER BY
- dis_data DESC limit 1
+ project = 'proinfo'::project_enum
]]>
</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 78c04af8e292593cfc665650eadd6e365e6c81f1..a280d5b19369dd83e86a6eea3d22b5de0af459d6 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarCidade.xaction
@@ -52,24 +52,19 @@
<query>
<![CDATA[
SELECT
- dis_cidade AS Cidade,
- sum(dis_verde) AS "Menos de 10 dias",
- sum(dis_amarelo) AS "Entre 11-30 dias",
- sum(dis_vermelho) AS "Mais de 30 dias"
+ 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
- mectb09_dm_disp_ag
+ dm_avail_city
WHERE
- dis_regiao = '{REGIAO}' AND
- dis_estado = '{ESTADO}' AND
- dis_data = (SELECT max(dis_data) FROM mectb09_dm_disp_ag) AND
- mectb09_dm_disp_ag.dis_projeto = 0
- GROUP BY
- dis_regiao,
- dis_estado,
- Cidade,
- dis_data
+ region = '{REGIAO}' AND
+ state = '{ESTADO}' AND
+ project = 'proinfo'::project_enum
ORDER BY
- Cidade ASC
+ 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 27c634f7a79bfe820158cddc9edd1a6c8e3f2dc2..d2f02428b5784f53e398e5e4bd23b8abdf855420 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarEstado.xaction
@@ -45,22 +45,17 @@
<query>
<![CDATA[
SELECT
- dis_estado AS Estado,
- sum(dis_verde) AS "Menos de 10 dias",
- sum(dis_amarelo) AS "Entre 11-30 dias",
- sum(dis_vermelho) AS "Mais de 30 dias"
+ state AS Estado,
+ green AS "Menos de 10 dias",
+ yellow AS "Entre 11-30 dias",
+ red AS "Mais de 30 dias"
FROM
- "mectb09_dm_disp_ag"
+ dm_avail_state
WHERE
- dis_regiao = '{REGIAO}' AND
- dis_data = (SELECT max(dis_data) FROM "mectb09_dm_disp_ag") AND
- mectb09_dm_disp_ag.dis_projeto = 0
- GROUP BY
- dis_regiao,
- Estado,
- dis_data
+ region = '{REGIAO}' AND
+ project = 'proinfo'::project_enum
ORDER BY
- Estado ASC
+ 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 3590d8c84e164ae3601367d9616e00cdeb6d5656..167c9f8cd2d0251ec0ac5470ecab58817212213b 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispBarRegiao.xaction
@@ -35,21 +35,18 @@
<query>
<![CDATA[
SELECT
- dis_regiao AS Regiao,
- sum(dis_verde) AS "Menos de 10 dias",
- sum(dis_amarelo) AS "Entre 11-30 dias",
- sum(dis_vermelho) AS "Mais de 30 dias"
+ 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
- mectb09_dm_disp_ag
+ dm_avail_state
WHERE
- dis_regiao <> 'NULL' AND
- dis_data = (SELECT max(dis_data) FROM mectb09_dm_disp_ag) AND
- mectb09_dm_disp_ag.dis_projeto = 0
+ project = 'proinfo'::project_enum
GROUP BY
- Regiao,
- dis_data
+ region
ORDER BY
- Regiao ASC
+ 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 12b9881f1a943359ac6745bd4745e16378a4cf6b..d080b30887fecb69499076a5305008dc6d4e219b 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineBrasil.xaction
@@ -34,30 +34,21 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb09_dm_disp_ag"."dis_mes_nm") AS mes,
- cast("mectb09_dm_disp_ag"."dis_mes" as text),
- sum(dis_verde)/count(distinct(dis_data)) AS verde,
- sum(dis_amarelo)/count(distinct(dis_data)) AS amarelo,
- sum(dis_vermelho)/count(distinct(dis_data)) AS vermelho
+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
- (select dis_mes as mes, max(dis_data) as data, dis_cidade as cidade
- from mectb09_dm_disp_ag
- where dis_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE
- and mectb09_dm_disp_ag.dis_projeto = 0
- group by mes, cidade) temp,
- "mectb09_dm_disp_ag"
+ dm_avail_state_history
WHERE
- temp.data = mectb09_dm_disp_ag.dis_data AND
- temp.cidade = mectb09_dm_disp_ag.dis_cidade AND
- dis_projeto = 0
+ project = 'proinfo'::project_enum
GROUP BY
- dis_mes_nm,
- dis_mes,
- dis_ano
+ contact_date
ORDER BY
- mectb09_dm_disp_ag.dis_ano ASC,
- mectb09_dm_disp_ag.dis_mes ASC
+ 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 bfa33e36b884d7a18128d561f7d688e0cf7d5c26..1a2be4663c0480500d4f114f62f5f82556a61bf2 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineCidade.xaction
@@ -51,33 +51,20 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb09_dm_disp_ag"."dis_mes_nm") AS mes,
- cast("mectb09_dm_disp_ag"."dis_mes" as text),
- sum(dis_verde)/count(distinct(dis_data)) AS verde,
- sum(dis_amarelo)/count(distinct(dis_data)) AS amarelo,
- sum(dis_vermelho)/count(distinct(dis_data)) AS vermelho
+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
- (select dis_mes as mes, max(dis_data) as data, dis_cidade as cidade
- from mectb09_dm_disp_ag
- where dis_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE and
- mectb09_dm_disp_ag.dis_projeto = 0
- group by mes, cidade) temp,
- "mectb09_dm_disp_ag"
+ dm_avail_city_history
WHERE
- temp.data = mectb09_dm_disp_ag.dis_data AND
- temp.cidade = mectb09_dm_disp_ag.dis_cidade AND
- temp.mes = mectb09_dm_disp_ag.dis_mes AND
- dis_regiao = '{REGIAO}' AND
- dis_estado = '{ESTADO}' AND
- mectb09_dm_disp_ag.dis_projeto = 0
- GROUP BY
- dis_mes_nm,
- dis_mes,
- dis_ano
+ region = '{REGIAO}' AND
+ state = '{ESTADO}' AND
+ project = 'proinfo'::project_enum
ORDER BY
- mectb09_dm_disp_ag.dis_ano ASC,
- mectb09_dm_disp_ag.dis_mes ASC
+ 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 c169d06c0b7172ca7700df984c34850601ac6aa6..4d74d82d3fcd9d323f354c718782eb386442f8d1 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineEstado.xaction
@@ -44,32 +44,19 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb09_dm_disp_ag"."dis_mes_nm") AS mes,
- cast("mectb09_dm_disp_ag"."dis_mes" as text),
- sum(dis_verde)/count(distinct(dis_data)) AS verde,
- sum(dis_amarelo)/count(distinct(dis_data)) AS amarelo,
- sum(dis_vermelho)/count(distinct(dis_data)) AS vermelho
+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
- (select dis_mes as mes, max(dis_data) as data, dis_cidade as cidade
- from mectb09_dm_disp_ag
- where dis_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE and
- mectb09_dm_disp_ag.dis_projeto = 0
- group by mes, cidade) temp,
- "mectb09_dm_disp_ag"
+ dm_avail_state_history
WHERE
- temp.data = mectb09_dm_disp_ag.dis_data AND
- temp.cidade = mectb09_dm_disp_ag.dis_cidade AND
- temp.mes = mectb09_dm_disp_ag.dis_mes AND
- dis_regiao = '{REGIAO}' AND
- mectb09_dm_disp_ag.dis_projeto = 0
- GROUP BY
- dis_mes_nm,
- dis_mes,
- dis_ano
+ region = '{REGIAO}' AND
+ project = 'proinfo'::project_enum
ORDER BY
- mectb09_dm_disp_ag.dis_ano ASC,
- mectb09_dm_disp_ag.dis_mes ASC
+ 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 1715c0b74bca9e56d9f19d621c083e859037358c..d332a5401973cb2cbcfd4fc2b67a2cdc09c73271 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispLineRegiao.xaction
@@ -34,31 +34,20 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- initcap("mectb09_dm_disp_ag"."dis_mes_nm") AS mes,
- cast("mectb09_dm_disp_ag"."dis_mes" as text),
- sum(dis_verde)/count(distinct(dis_data)) AS verde,
- sum(dis_amarelo)/count(distinct(dis_data)) AS amarelo,
- sum(dis_vermelho)/count(distinct(dis_data)) AS vermelho
+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
- (select dis_mes as mes, max(dis_data) as data, dis_cidade as cidade
- from mectb09_dm_disp_ag
- where dis_data BETWEEN CURRENT_DATE-INTERVAL '6 MONTH'AND CURRENT_DATE and
- mectb09_dm_disp_ag.dis_projeto = 0
- group by mes, cidade) temp,
- "mectb09_dm_disp_ag"
+ dm_avail_state_history
WHERE
- temp.data = mectb09_dm_disp_ag.dis_data AND
- temp.cidade = mectb09_dm_disp_ag.dis_cidade AND
- temp.mes = mectb09_dm_disp_ag.dis_mes AND
- mectb09_dm_disp_ag.dis_projeto = 0
+ project = 'proinfo'::project_enum
GROUP BY
- dis_mes_nm,
- dis_mes,
- dis_ano
+ contact_date
ORDER BY
- mectb09_dm_disp_ag.dis_ano ASC,
- mectb09_dm_disp_ag.dis_mes ASC
+ 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 a23e17b6205dcd986bb17f9e222bacb36b474687..b3c760d7431bcb0fecba72c0dc3212581320a25c 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieBrasil.xaction
@@ -34,18 +34,14 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- sum("mectb09_dm_disp_ag"."dis_verde") AS "Menos de 10 dias",
- sum("mectb09_dm_disp_ag"."dis_amarelo") AS "Entre 11-30 dias",
- sum("mectb09_dm_disp_ag"."dis_vermelho") AS "Mais de 30 dias"
+ SELECT
+ sum(green) AS "Menos de 10 dias",
+ sum(yellow) AS "Entre 11-30 dias",
+ sum(red) AS "Mais de 30 dias"
FROM
- "mectb09_dm_disp_ag"
+ dm_avail_state
WHERE
- mectb09_dm_disp_ag.dis_projeto = 0
- GROUP BY
- dis_data
- ORDER BY
- dis_data DESC limit 1
+ project = 'proinfo'::project_enum
]]>
</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 66140e40db937f312a488cf89fff3816f89f12bf..801a44ad6ea8d925ad02f8c1d30ed0e7d8da24ca 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieCidade.xaction
@@ -51,17 +51,16 @@
<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"
+SELECT
+ green AS "Menos de 10 dias",
+ yellow AS "Entre 11-30 dias",
+ red AS "Mais de 30 dias"
FROM
- mectb09_dm_disp_ag
+ dm_avail_city
WHERE
- dis_regiao = '{REGIAO}' AND
- dis_estado = '{ESTADO}' AND
- dis_data = (SELECT max(dis_data) FROM mectb09_dm_disp_ag) AND
- mectb09_dm_disp_ag.dis_projeto = 0
+ region = '{REGIAO}' AND
+ state = '{ESTADO}' AND
+ project = 'proinfo'::project_enum
]]>
</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 61277fb1a1068b076ca2b8e1b1258e2ca022341f..04338da4b9b6b5045caa7d21da75aaff291a1fcb 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieEstado.xaction
@@ -44,16 +44,15 @@
<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"
+SELECT
+ green AS "Menos de 10 dias",
+ yellow AS "Entre 11-30 dias",
+ red AS "Mais de 30 dias"
FROM
- mectb09_dm_disp_ag
+ dm_avail_state
WHERE
- dis_regiao = '{REGIAO}' AND
- dis_data = (SELECT max(dis_data) FROM mectb09_dm_disp_ag) AND
- mectb09_dm_disp_ag.dis_projeto = 0
+ region = '{REGIAO}' AND
+ project = 'proinfo'::project_enum
]]>
</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 8b8da3d3f5871222777006a0f1cad6e8885db477..5cf9de4b9bc4217ba822bea00a08d1eedd74474f 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispPieRegiao.xaction
@@ -34,16 +34,14 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
+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
- dis_regiao <> 'NULL' AND
- dis_data = (SELECT max(dis_data) FROM mectb09_dm_disp_ag) AND
- mectb09_dm_disp_ag.dis_projeto = 0
+ project = 'proinfo'::project_enum
]]>
</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 4a93c1b6012d88717f01087a77ab7c29fda337de..bb129215914411bcbd9b4e03457d1c322d67d516 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/disponibilidade/dispRelatorio.xaction
@@ -72,71 +72,25 @@
<output-type>pdf</output-type>
<query>
<![CDATA[
- SELECT
- a.data AS to_char,
- b.dis_maquina AS dis_maquina,
- b.regiao AS regiao,
- b.dis_estado AS dis_estado,
- b.cidade AS cidade,
- b.dis_data AS dis_data,
- b.max AS max,
- b.dis_qtd_dias_ult_contato AS dis_qtd_dias_ult_contato,
- b.dis_qtd_contato_mes AS dis_qtd_contato_mes,
- b.escola AS escola,
- b.verde AS verde,
- b.amarelo AS amarelo,
- b.vermelho AS vermelho
-FROM
- (SELECT
- distinct dis_escola,
- dis_maquina as maq,
- to_char((SELECT MAX(dis_data) FROM mectb09_dm_disp_ag), 'DD/MM/YYYY') AS data
- FROM
- "public"."mectb08_dm_disp" mectb08_dm_disp
-WHERE
- dis_regiao = '{REGIAO}'
- AND dis_estado = '{ESTADO}'
- AND dis_cidade = '{CIDADE}'
- AND mectb08_dm_disp.dis_projeto = 0
-ORDER BY
- dis_escola ASC
- ) a
-inner join
-(SELECT
- distinct on (dis_maquina) dis_maquina,
- initcap(dis_regiao) AS regiao,
- dis_estado,
- initcap(dis_cidade) AS cidade,
- dis_data,
- dis_data_ult_contato as max,
- dis_qtd_dias_ult_contato,
- dis_qtd_contato_mes,
- initcap(dis_escola) AS escola,
- dis_qtd_dias_ult_contato <= 10 as verde,
- dis_qtd_dias_ult_contato BETWEEN 10 AND 30 as amarelo,
- dis_qtd_dias_ult_contato > 30 as vermelho
+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
- "public"."mectb08_dm_disp" mectb08_dm_disp
+ dm_avail_machine
WHERE
- dis_regiao = '{REGIAO}'
- AND dis_estado = '{ESTADO}'
- AND dis_cidade = '{CIDADE}'
- AND dis_data = (SELECT max(dis_data) FROM mectb08_dm_disp)
- AND mectb08_dm_disp.dis_projeto = 0
-GROUP BY
- dis_regiao,
- dis_estado,
- dis_cidade,
- dis_escola,
- dis_maquina,
- dis_data,
- dis_data_ult_contato,
- dis_qtd_contato_mes,
- dis_qtd_dias_ult_contato
-ORDER BY
- dis_maquina ASC,
- escola ASC
- ) b on a.maq = b.dis_maquina
+ region = '{REGIAO}' AND
+ state = '{ESTADO}' AND
+ city = '{CIDADE}' AND
+ project = 'proinfo':project_enum
]]> </query>
</component-definition>
</action-definition>
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 b7f9aab31a55a1f1e327640266b09654bd3c8c8c..36c5cf5420a42abea247a5527e804fbfe85db81e 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarBrasil.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarBrasil.xaction
@@ -34,12 +34,13 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
-SELECT to_char(MAX(inv_data), 'DD/MM/YYYY') as Brasil, count(*)
+SELECT
+ to_char((SELECT MAX(end_time) FROM control), 'DD/MM/YYYY') as Brasil,
+ count(*)
FROM
-( SELECT inv_inep, inv_maquina, MAX(inv_data) AS inv_data
- FROM mectb10_dm_inventario
- WHERE inv_projeto = 0 AND inv_escola IS NOT NULL
- GROUP BY inv_maquina, inv_inep) AS test;
+ dm_invent_machine
+WHERE
+ project = 'proinfo'::project_enum
]]>
</query>
</component-definition>
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 2477c8ebfbcd9127731efdd4c9e916ad572cd29c..ca4dd028272c04fad6afdfd861b5e1d313e359bf 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarCidade.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarCidade.xaction
@@ -52,36 +52,19 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- temp.Cidade AS Cidade,
- count(inv_maquina)
- FROM
- ( SELECT
- DISTINCT inv_maquina AS maquina,
- inv_regiao AS Regiao,
- inv_estado AS Estado,
- inv_cidade AS Cidade,
- MAX(inv_data) as data,
- inv_escola as escola
- FROM
- mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}' AND
- inv_estado = '{ESTADO}'
- GROUP BY
- Regiao, Estado, Cidade, 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
- GROUP BY
- Regiao,
- Estado,
- Cidade
- ORDER BY
- Cidade
+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
]]>
</query>
</component-definition>
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 f9f1db5f86cf4c456c676f70d16e5172ad15efe4..30e32cf44b7c3b22db0bbde8685b54d7902277a1 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarEstado.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarEstado.xaction
@@ -44,33 +44,18 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- temp.Estado AS Estado,
- count(inv_maquina)
- FROM
- ( SELECT
- DISTINCT inv_maquina AS maquina,
- inv_regiao AS Regiao,
- inv_estado AS Estado,
- MAX(inv_data) as data,
- inv_escola as escola
- FROM
- mectb10_dm_inventario
- WHERE
- inv_regiao = '{REGIAO}'
- GROUP BY
- Regiao, Estado, 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
- GROUP BY
- Regiao,
- Estado
- ORDER BY
- Estado
+SELECT
+ state AS Estado,
+ count(machine)
+FROM
+ dm_invent_machine
+WHERE
+ region = '{REGIAO}' AND
+ project = 'proinfo'::project_enum
+GROUP BY
+ state
+ORDER BY
+ state
]]>
</query>
</component-definition>
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 660d2b5527459cb183ad61174b50fc67c497f7fc..bacb3628b76e9fd4530ad2e0121aa33f8fe3412a 100644
--- a/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarRegiao.xaction
+++ b/pentahofiles/biserver-ce/pentaho-solutions/seed2/proinfo/inventario/inventBarRegiao.xaction
@@ -34,31 +34,17 @@
<password><![CDATA[]]></password>
<query>
<![CDATA[
- SELECT
- temp.Regiao AS Regiao,
- count(inv_maquina)
- FROM
- ( SELECT
- DISTINCT inv_maquina as maquina,
- inv_regiao as Regiao,
- MAX(inv_data) as data,
- inv_escola as escola
- FROM
- mectb10_dm_inventario
- WHERE
- inv_regiao <> 'NULL'
- GROUP BY
- Regiao, 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
- GROUP BY
- Regiao
- ORDER BY
- Regiao
+SELECT
+ region AS Regiao,
+ count(machine)
+FROM
+ dm_invent_machine
+WHERE
+ project = 'proinfo'::project_enum
+GROUP BY
+ region
+ORDER BY
+ region
]]>
</query>
</component-definition>