From: Michele Silva Date: Tue, 29 Nov 2011 03:39:39 +0000 (-0200) Subject: Added perguntas. X-Git-Url: http://200.18.67.61/gitweb/?a=commitdiff_plain;h=3f4ddbae527fa067ba1788f0368e2067aa49493e;p=simdecs_seam.git Added perguntas. Improved user interface. --- diff --git a/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml b/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml index 70eb213..e8a4b03 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml @@ -35,42 +35,60 @@
- + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + #{' '} + + + + + +

- - + + +
-
- - - - - -
- diff --git a/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml index 889df93..9ba8d39 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml @@ -19,9 +19,9 @@ - Rede bayesiana id - + Rede bayesiana + @@ -64,24 +64,24 @@
diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml index b2ab3c7..f8f2432 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml @@ -5,6 +5,7 @@ + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml index ad7c5fd..8728f46 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml @@ -11,7 +11,7 @@ - Pergunta nodo Details + Pergunta nodo @@ -23,22 +23,76 @@ Texto - +
- - - -
+
+ value="Editar"/> + +
+ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #{' '} + + + + + -
+ + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml index 2d1eb00..35e11b2 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml @@ -19,10 +19,12 @@ - Nodo - - + Nodo + + + + @@ -44,30 +46,30 @@
diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml index 373aed0..ccc42ef 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml @@ -30,7 +30,7 @@
- +
@@ -57,15 +57,25 @@ + + + + + + + + + + - + - + @@ -80,7 +90,7 @@ Action #{' '} @@ -140,9 +150,13 @@ + value="Criar pergunta"> + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml index f63ce26..5fc8756 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml @@ -75,9 +75,16 @@
- + view="/seguro/admin/rede/ArquivoRedeBayesiana.xhtml"/> + + +
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodo.page.xml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodo.page.xml new file mode 100644 index 0000000..e7a3837 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodo.page.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodo.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodo.xhtml new file mode 100644 index 0000000..049c6b6 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodo.xhtml @@ -0,0 +1,50 @@ + + + + + + + Resposta nodo + + + + Pergunta nodo id + + + + + Texto + + + + + Percentual + + + +
+
+ + + + + +
+ + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.page.xml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.page.xml new file mode 100644 index 0000000..be69911 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.page.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml new file mode 100644 index 0000000..152ed93 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoEdit.xhtml @@ -0,0 +1,89 @@ + + + + + + + + + #{respostaNodoHome.managed ? 'Edit' : 'Add'} Resposta nodo + + + + Pergunta + + + + + + + + + Texto + + + + + + Percentual + + + + + +
+ * + required fields +
+ +
+ +
+ + + + + + + + + + + +
+
+ +
+ +
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.page.xml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.page.xml new file mode 100644 index 0000000..98b22aa --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.page.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml new file mode 100644 index 0000000..43c3e2c --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RespostaNodoList.xhtml @@ -0,0 +1,174 @@ + + + + + + + + + + + Texto + + + + + Match + + + + + + + + +
+ + +
+ +
+ + + RespostaNodo Search Results (#{empty respostaNodoList.resultList ? 0 : (respostaNodoList.paginated ? respostaNodoList.resultCount : respostaNodoList.resultList.size)}) +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Action + + + + #{' '} + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ +
diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java index bcac879..7fcdfb5 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java @@ -55,16 +55,8 @@ public class PerguntaNodo implements Serializable { public String getTexto() { return texto; } - public void setTexto(String pergunta) { - this.texto = pergunta; - } - - public Nodo getNodo() { - return nodo; - } - - public void setNodo(Nodo nodo) { - this.nodo = nodo; + public void setTexto(String texto) { + this.texto = texto; } public List getRespostas() { @@ -73,6 +65,12 @@ public class PerguntaNodo implements Serializable { public void setRespostas(List respostas) { this.respostas = respostas; } + public Nodo getNodo() { + return nodo; + } + public void setNodo(Nodo nodo) { + this.nodo = nodo; + } public String toString() { return id + " - " + texto; } diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java index 354a99e..73c7325 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java @@ -55,15 +55,14 @@ public class RespostaNodo implements Serializable { public void setPercentual(Float percentual) { this.percentual = percentual; } - + public PerguntaNodo getPergunta() { return pergunta; } - - public void getNodo(PerguntaNodo pergunta) { + public void setPergunta(PerguntaNodo pergunta) { this.pergunta = pergunta; } - + public String toString() { return id + " - " + texto + " - " + percentual ; }