From 667a95c243a5849636b062a0299144aab5db412f Mon Sep 17 00:00:00 2001
From: Michele Silva <michele.silva@gmail.com>
Date: Wed, 30 Nov 2011 13:14:05 -0200
Subject: [PATCH] Interface improvements.

---
 .../seguro/admin/rede/PerguntaNodoEdit.xhtml       |   12 +++++++++---
 .../seguro/admin/rede/PerguntaNodoList.xhtml       |    5 ++++-
 .../seguro/admin/rede/RespostaNodoEdit.xhtml       |   16 +++++++++++-----
 .../seguro/admin/rede/RespostaNodoList.xhtml       |    6 +++++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml
index 35e11b2..67856c4 100644
--- a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml
+++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml
@@ -20,11 +20,11 @@
 
             <s:decorate id="nodoIdField" template="/layout/edit.xhtml">
             <ui:define name="label">Nodo</ui:define>           
-               <rich:inplaceSelect value="#{perguntaNodoHome.instance.nodo}" required="true" defaultLabel="Selecione">
+               <h:selectOneMenu value="#{perguntaNodoHome.instance.nodo}" required="true" defaultLabel="Selecione">
 		        	<s:selectItems value="#{nodoList.resultList}" var="_origem" 
 		        		label="#{_origem.redeBayesiana.nome}:#{_origem.nome}"/>
 		        	<s:convertEntity/>
-		        </rich:inplaceSelect>
+		        </h:selectOneMenu>
             </s:decorate>
 
 
@@ -68,11 +68,17 @@
                     view="/seguro/admin/rede/PerguntaNodo.xhtml"
                 rendered="#{perguntaNodoHome.managed}"/>
 
-            <s:button id="cancelAdd"
+            <s:button id="verPerguntas"
                    value="Ver Perguntas"
              propagation="end"
                     view="/#{empty perguntaNodoFrom ? 'seguro/admin/rede/PerguntaNodoList' : perguntaNodoFrom}.xhtml"
                 rendered="#{!perguntaNodoHome.managed}"/>
+                
+            <s:button id="verRespostas"
+                   value="Ver Respostas"
+             propagation="end"
+                    view="/#{empty perguntaNodoFrom ? 'seguro/admin/rede/RespostaNodoList' : perguntaNodoFrom}.xhtml"
+                rendered="#{!perguntaNodoHome.managed}"/>                
 
         </div>
     </h:form>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml
index ccc42ef..6766fea 100644
--- a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml
+++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml
@@ -81,7 +81,7 @@
             <f:facet name="header">
                 <ui:include src="/layout/sort.xhtml">
                     <ui:param name="entityList" value="#{perguntaNodoList}"/>
-                    <ui:param name="propertyLabel" value="Texto"/>
+                    <ui:param name="propertyLabel" value="Pergunta"/>
                     <ui:param name="propertyPath" value="perguntaNodo.texto"/>
                 </ui:include>
             </f:facet>
@@ -157,6 +157,9 @@
                     id="redeBayesianaButton"
            propagation="none"
                  value="Ver Redes Bayesianas"/>
+	   <s:button id="respostaButton" 
+	               value="Ver respostas"
+	                view="/seguro/admin/rede/RespostaNodoList.xhtml"/>	                 
     </s:div>
 
 </ui:define>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml
index 152ed93..473c991 100644
--- a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml
+++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml
@@ -19,11 +19,11 @@
 
            <s:decorate id="nodoIdField" template="/layout/edit.xhtml">
             <ui:define name="label">Pergunta</ui:define>           
-               <rich:inplaceSelect value="#{respostaNodoHome.instance.pergunta}" required="true" defaultLabel="Selecione">
+                <h:selectOneMenu value="#{respostaNodoHome.instance.pergunta}" required="true" defaultLabel="Selecione">
 		        	<s:selectItems value="#{perguntaNodoList.resultList}" var="_origem" 
-		        		label="#{_origem.nodo.nome}:#{_origem.texto}"/>
+		        		label="#{_origem.nodo.redeBayesiana.nome}:#{_origem.nodo.nome}:#{_origem.texto}"/>
 		        	<s:convertEntity/>
-		        </rich:inplaceSelect>
+		         </h:selectOneMenu>
             </s:decorate>
 
 
@@ -75,11 +75,17 @@
                     view="/seguro/admin/rede/RespostaNodo.xhtml"
                 rendered="#{respostaNodoHome.managed}"/>
 
-            <s:button id="cancelAdd"
+            <s:button id="verPerguntas"
+                   value="Ver Perguntas"
+             propagation="end"
+                    view="/#{empty repostaNodoFrom ? 'seguro/admin/rede/PerguntaNodoList' : respostaNodoFrom}.xhtml"
+                rendered="#{!respostaNodoHome.managed}"/>
+                
+            <s:button id="verRespostas"
                    value="Ver Respostas"
              propagation="end"
                     view="/#{empty respostaNodoFrom ? 'seguro/admin/rede/RespostaNodoList' : respostaNodoFrom}.xhtml"
-                rendered="#{!respostaNodoHome.managed}"/>
+                rendered="#{!respostaNodoHome.managed}"/>   
 
         </div>
     </h:form>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml
index 43c3e2c..86ae83b 100644
--- a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml
+++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml
@@ -81,7 +81,7 @@
             <f:facet name="header">
                 <ui:include src="/layout/sort.xhtml">
                     <ui:param name="entityList" value="#{respostaNodoList}"/>
-                    <ui:param name="propertyLabel" value="Texto"/>
+                    <ui:param name="propertyLabel" value="Resposta"/>
                     <ui:param name="propertyPath" value="respostaNodo.texto"/>
                 </ui:include>
             </f:facet>
@@ -167,6 +167,10 @@
                     id="redeBayesianaButton"
            propagation="none"
                  value="Ver Redes Bayesianas"/>
+                 
+	   <s:button id="perguntaButton" 
+	               value="Ver perguntas"
+	                view="/seguro/admin/rede/PerguntaNodoList.xhtml"/>	                
     </s:div>
 
 </ui:define>
-- 
1.7.6.4