diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
index 4d1a37990095eeb3bd793640ddaeb96013e4f53c..ffeff75734d6bcd11162b87559af40eb4d647039 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
@@ -31,6 +31,7 @@ public class Projeto {
@OneToOne
private Projeto pai;
+ @Column(columnDefinition="text")
private String nome;
//@Enumerated(EnumType.STRING)
@@ -38,6 +39,8 @@ public class Projeto {
@Enumerated(EnumType.STRING)
private TipoAcao acao;
+
+ @Column(columnDefinition="text")
private String outroAcao;
@OneToOne
@@ -52,21 +55,25 @@ public class Projeto {
private String numero;
private String complemento;
-
+
private String bairro;
private String municipio;
private String cep;
+ @Column(columnDefinition="text")
private String responsavel;
+ @Column(columnDefinition="text")
private String telefones;
private String email;
+ @Column(columnDefinition="text")
private String publicoAlvo;
+ @Column(columnDefinition="text")
private String formaAcesso;
private String site;
@@ -79,11 +86,13 @@ public class Projeto {
@Column(columnDefinition="text")
private String comoFunciona;
+ @Column(columnDefinition="text")
private String noticias;
/* horario + dias de funcionamento ??
private String metodoFuncionamento;
*/
+ @Column(columnDefinition="text")
private String horarioFuncionamento;
//@Enumerated(EnumType.STRING)
@@ -91,16 +100,22 @@ public class Projeto {
// campos internos
+ @Column(columnDefinition="text")
private String estrutura;
+ @Column(columnDefinition="text")
private String responsaveis;
+ @Column(columnDefinition="text")
private String telefoneMinisterio;
+ @Column(columnDefinition="text")
private String orcamento;
+ @Column(columnDefinition="text")
private String justificativa;
+ @Column(columnDefinition="text")
private String meta;
@Enumerated(EnumType.STRING)
@@ -108,16 +123,20 @@ public class Projeto {
private boolean possuiMonitoramento;
+ @Column(columnDefinition="text")
private String estadosMunicipioComPrograma;
+ @Column(columnDefinition="text")
private String publicoPrioritario;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style="S-")
private Date dataInicio;
+ @Column(columnDefinition="text")
private String mecanismos;
+ @Column(columnDefinition="text")
private String parcerias;
private boolean legislacaoPropria;
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 5014b358b525d5f9fc0ec08254e02fc86e58253a..6a96009f9dcfa7e68feeaf1f2dde181b6a349677 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,17 +1,19 @@
log4j.rootLogger=error, stdout
+#log4j.rootLogger=all, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
# Print the date in ISO 8601 format
log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"%n
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=application.log
+#log4j.appender.R=org.apache.log4j.RollingFileAppender
+#log4j.appender.R.File=application.log
-log4j.appender.R.MaxFileSize=100KB
+#log4j.appender.R.MaxFileSize=100KB
# Keep one backup file
-log4j.appender.R.MaxBackupIndex=1
+#log4j.appender.R.MaxBackupIndex=1
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+#log4j.appender.R.layout=org.apache.log4j.PatternLayout
+#log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
diff --git a/src/main/webapp/WEB-INF/views/projetos/create.jspx b/src/main/webapp/WEB-INF/views/projetos/create.jspx
index 002b5d03f23ca7589a475be2385913266ec8a988..c9926e5d67269baf62bfc5ebebf670ee698733b3 100644
--- a/src/main/webapp/WEB-INF/views/projetos/create.jspx
+++ b/src/main/webapp/WEB-INF/views/projetos/create.jspx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:sec="http://www.springframework.org/security/tags" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" xmlns:spring="http://www.springframework.org/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_participatorio_Projeto" modelAttribute="projeto" path="/projetos" render="${empty dependencies}" z="LcDNxOLIimV3mQ7YNyGnsVXmDqQ=">
@@ -42,8 +42,8 @@
<field:checkbox field="legislacaoPropria" id="c_br_ufpr_c3sl_participatorio_Projeto_legislacaoPropria" z="0FyUiOC8dXYS2KQh9us8ZFSrfU0="/>
<field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
<field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
- <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" render="false" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="4oZg5yvLrUjv5RaOV1LbaRAdauo="/>
+ <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Projeto" render="${not empty dependencies}" z="nyMkb0MYQtlthVlj4JcyqCQYyRg="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/update.jspx b/src/main/webapp/WEB-INF/views/projetos/update.jspx
index b06aa6cb53577b8e0b2396be345289dcfeaacbc9..6d5ffd42ef5225caf95127bee873b38a24635ae2 100644
--- a/src/main/webapp/WEB-INF/views/projetos/update.jspx
+++ b/src/main/webapp/WEB-INF/views/projetos/update.jspx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<form:update id="fu_br_ufpr_c3sl_participatorio_Projeto" modelAttribute="projeto" path="/projetos" versionField="Version" z="1gEn/bkHq9U+2e8X6W36Iph02fo=">
@@ -42,10 +42,9 @@
<field:checkbox field="legislacaoPropria" id="c_br_ufpr_c3sl_participatorio_Projeto_legislacaoPropria" z="0FyUiOC8dXYS2KQh9us8ZFSrfU0="/>
<field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
<field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="4oZg5yvLrUjv5RaOV1LbaRAdauo="/>
-
+ <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
<sec:authorize ifAnyGranted="Administrador">
- <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/>
- </sec:authorize>
+ <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/>
+ </sec:authorize>
</form:update>
</div>
diff --git a/src/main/webapp/styles/standard.css b/src/main/webapp/styles/standard.css
index f86e0c2b8c77cc80fa701b11d826349f2ea7302e..234663cc13ea7654c3115120f8fb6700766dee9c 100644
--- a/src/main/webapp/styles/standard.css
+++ b/src/main/webapp/styles/standard.css
@@ -404,7 +404,6 @@ fieldset th {
background: #09244D;
}
-
.submit input {
/* border: 1px solid #BBBBBB;
color:#777777;
@@ -442,6 +441,10 @@ fieldset th {
max-width: 175px;
}
+.dijitTextBox {
+ width:400px;
+}
+
.RichTextEditable{
min-height:18em !important;
max-height:18em !important;