From 57d17fe2379a4c5bc9b3dd176fccee6d2168c380 Mon Sep 17 00:00:00 2001
From: Rafael <xmaster@ComputerMaster.(none)>
Date: Tue, 25 Sep 2012 12:41:04 -0300
Subject: [PATCH] Updated some graphics for the new db

---
 .../proinfo/alertas/alertBarBrasil.xaction    | 19 ++---
 .../proinfo/alertas/alertBarCidade.xaction    | 39 +++------
 .../proinfo/alertas/alertBarEstado.xaction    | 27 +++----
 .../proinfo/alertas/alertBarRegiao.xaction    | 28 +++----
 .../proinfo/alertas/alertLineBrasil.xaction   | 32 +++-----
 .../proinfo/alertas/alertLineCidade.xaction   | 34 +++-----
 .../proinfo/alertas/alertLineEstado.xaction   | 32 +++-----
 .../proinfo/alertas/alertLineRegiao.xaction   | 32 +++-----
 .../disponibilidade/dispBarBrasil.xaction     | 18 ++---
 .../disponibilidade/dispBarCidade.xaction     | 25 +++---
 .../disponibilidade/dispBarEstado.xaction     | 21 ++---
 .../disponibilidade/dispBarRegiao.xaction     | 19 ++---
 .../disponibilidade/dispLineBrasil.xaction    | 31 +++----
 .../disponibilidade/dispLineCidade.xaction    | 35 +++-----
 .../disponibilidade/dispLineEstado.xaction    | 33 +++-----
 .../disponibilidade/dispLineRegiao.xaction    | 31 +++----
 .../disponibilidade/dispPieBrasil.xaction     | 16 ++--
 .../disponibilidade/dispPieCidade.xaction     | 17 ++--
 .../disponibilidade/dispPieEstado.xaction     | 15 ++--
 .../disponibilidade/dispPieRegiao.xaction     |  6 +-
 .../disponibilidade/dispRelatorio.xaction     | 80 ++++---------------
 .../inventario/inventBarBrasil.xaction        | 11 +--
 .../inventario/inventBarCidade.xaction        | 43 +++-------
 .../inventario/inventBarEstado.xaction        | 39 +++------
 .../inventario/inventBarRegiao.xaction        | 36 +++------
 25 files changed, 251 insertions(+), 468 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 1e787f8..34f4feb 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 20fed8c..75c8d0c 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 bc44a9d..d5c4615 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 9bca1ac..9e0bbff 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 89c80d9..b6de71c 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 2e08684..c9d9c07 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 d33a962..31e96a4 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 71d4334..b76163c 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 9ca77a4..ced463d 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 78c04af..a280d5b 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 27c634f..d2f0242 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 3590d8c..167c9f8 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 12b9881..d080b30 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 bfa33e3..1a2be46 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 c169d06..4d74d82 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 1715c0b..d332a54 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 a23e17b..b3c760d 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 66140e4..801a44a 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 61277fb..04338da 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 8b8da3d..5cf9de4 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 4a93c1b..bb12921 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 b7f9aab..36c5cf5 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 2477c8e..ca4dd02 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 f9f1db5..30e32cf 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 660d2b5..bacb362 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>
-- 
GitLab