Download as
Browse Code »

Commit b4e5ff3a3be2eaf95adbf69f31fccb17036c00fc

Authored by magno.oliveira
1 parent b94bcdd4
Exists in master

Gravação da nota da avaliação, remoção da inibição de valor inicial e final da faixa 

git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/e-selo@9856 c2178572-b5ca-4887-91d2-9e3a90c7d55b
Showing 17 changed files with 55 additions and 101 deletions   Show diff stats
Desenvolvimento/Codificacao/e-Selo/.classpath
  Diff comments   View file @b4e5ff3
... ... @@ -20,6 +20,10 @@
20 20 </attributes>
21 21 </classpathentry>
22 22 <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
23   - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  23 + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
  24 + <attributes>
  25 + <attribute name="maven.pomderived" value="true"/>
  26 + </attributes>
  27 + </classpathentry>
24 28 <classpathentry kind="output" path="target/classes"/>
25 29 </classpath>
... ...
Desenvolvimento/Codificacao/e-Selo/.settings/org.eclipse.core.resources.prefs
  Diff comments   View file @b4e5ff3
1 1 eclipse.preferences.version=1
2 2 encoding//src/main/java=UTF-8
3   -encoding//src/main/java/br/com/eselo/controller/RecomendacaoController.java=ISO-8859-1
4   -encoding//src/main/java/br/com/eselo/controller/UrlController.java=UTF-8
5   -encoding//src/main/java/br/com/eselo/controller/UsuariosController.java=UTF-8
6 3 encoding//src/main/resources=UTF-8
7 4 encoding//src/test/java=UTF-8
8 5 encoding/<project>=UTF-8
... ...
Desenvolvimento/Codificacao/e-Selo/.settings/org.eclipse.m2e.core.prefs
View file @b94bcdd
... ... @@ -1,4 +0,0 @@
1   -activeProfiles=
2   -eclipse.preferences.version=1
3   -resolveWorkspaceProjects=true
4   -version=1
Desenvolvimento/Codificacao/e-Selo/.settings/org.eclipse.wst.common.component
  Diff comments   View file @b4e5ff3
1   -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2   - <wb-module deploy-name="e-Selo">
3   - <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
4   - <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
5   - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
6   - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
7   - <property name="java-output-path" value="/e-Selo/build/classes"/>
8   - <property name="context-root" value="eselo"/>
9   - </wb-module>
10   -</project-modules>
  1 +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
  2 + <wb-module deploy-name="e-Selo">
  3 + <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
  4 + <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
  5 + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
  6 + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
  7 + <property name="java-output-path" value="/e-Selo/build/classes"/>
  8 + <property name="context-root" value="eselo"/>
  9 + </wb-module>
  10 +</project-modules>
... ...
Desenvolvimento/Codificacao/e-Selo/.settings/org.eclipse.wst.common.project.facet.core.xml
  Diff comments   View file @b4e5ff3
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<faceted-project>
3   - <fixed facet="wst.jsdt.web"/>
4   - <fixed facet="jst.web"/>
5   - <fixed facet="java"/>
6   - <installed facet="jst.web" version="3.0"/>
7   - <installed facet="wst.jsdt.web" version="1.0"/>
8   - <installed facet="jst.jaxrs" version="1.0"/>
9   - <installed facet="java" version="1.7"/>
10   -</faceted-project>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<faceted-project>
  3 + <runtime name="Apache Tomcat v7.0"/>
  4 + <fixed facet="wst.jsdt.web"/>
  5 + <fixed facet="jst.web"/>
  6 + <fixed facet="java"/>
  7 + <installed facet="java" version="1.7"/>
  8 + <installed facet="jst.web" version="3.0"/>
  9 + <installed facet="wst.jsdt.web" version="1.0"/>
  10 + <installed facet="jst.jaxrs" version="1.0"/>
  11 +</faceted-project>
... ...
Desenvolvimento/Codificacao/e-Selo/.settings/org.eclipse.wst.jsdt.core.prefs
View file @b94bcdd
... ... @@ -1,63 +0,0 @@
1   -eclipse.preferences.version=1
2   -org.eclipse.wst.jsdt.core.compiler.codegen.inlineJsrBytecode=disabled
3   -org.eclipse.wst.jsdt.core.compiler.codegen.targetPlatform=1.2
4   -org.eclipse.wst.jsdt.core.compiler.codegen.unusedLocal=preserve
5   -org.eclipse.wst.jsdt.core.compiler.compliance=1.4
6   -org.eclipse.wst.jsdt.core.compiler.debug.lineNumber=generate
7   -org.eclipse.wst.jsdt.core.compiler.debug.localVariable=generate
8   -org.eclipse.wst.jsdt.core.compiler.debug.sourceFile=generate
9   -org.eclipse.wst.jsdt.core.compiler.doc.comment.support=enabled
10   -org.eclipse.wst.jsdt.core.compiler.problem.assertIdentifier=warning
11   -org.eclipse.wst.jsdt.core.compiler.problem.deprecation=warning
12   -org.eclipse.wst.jsdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
13   -org.eclipse.wst.jsdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
14   -org.eclipse.wst.jsdt.core.compiler.problem.discouragedReference=warning
15   -org.eclipse.wst.jsdt.core.compiler.problem.duplicateLocalVariables=warning
16   -org.eclipse.wst.jsdt.core.compiler.problem.emptyStatement=ignore
17   -org.eclipse.wst.jsdt.core.compiler.problem.fallthroughCase=ignore
18   -org.eclipse.wst.jsdt.core.compiler.problem.fieldHiding=ignore
19   -org.eclipse.wst.jsdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
20   -org.eclipse.wst.jsdt.core.compiler.problem.forbiddenReference=error
21   -org.eclipse.wst.jsdt.core.compiler.problem.hiddenCatchBlock=warning
22   -org.eclipse.wst.jsdt.core.compiler.problem.indirectStaticAccess=ignore
23   -org.eclipse.wst.jsdt.core.compiler.problem.invalidJavadoc=ignore
24   -org.eclipse.wst.jsdt.core.compiler.problem.invalidJavadocTags=disabled
25   -org.eclipse.wst.jsdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
26   -org.eclipse.wst.jsdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
27   -org.eclipse.wst.jsdt.core.compiler.problem.invalidJavadocTagsVisibility=default
28   -org.eclipse.wst.jsdt.core.compiler.problem.localVariableHiding=ignore
29   -org.eclipse.wst.jsdt.core.compiler.problem.looseVarDecleration=warning
30   -org.eclipse.wst.jsdt.core.compiler.problem.missingJavadocComments=ignore
31   -org.eclipse.wst.jsdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
32   -org.eclipse.wst.jsdt.core.compiler.problem.missingJavadocCommentsVisibility=default
33   -org.eclipse.wst.jsdt.core.compiler.problem.missingJavadocTags=ignore
34   -org.eclipse.wst.jsdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
35   -org.eclipse.wst.jsdt.core.compiler.problem.missingJavadocTagsVisibility=default
36   -org.eclipse.wst.jsdt.core.compiler.problem.noEffectAssignment=warning
37   -org.eclipse.wst.jsdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
38   -org.eclipse.wst.jsdt.core.compiler.problem.nullReference=ignore
39   -org.eclipse.wst.jsdt.core.compiler.problem.optionalSemicolon=warning
40   -org.eclipse.wst.jsdt.core.compiler.problem.parameterAssignment=ignore
41   -org.eclipse.wst.jsdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
42   -org.eclipse.wst.jsdt.core.compiler.problem.potentialNullReference=ignore
43   -org.eclipse.wst.jsdt.core.compiler.problem.redundantNullCheck=ignore
44   -org.eclipse.wst.jsdt.core.compiler.problem.undefinedField=warning
45   -org.eclipse.wst.jsdt.core.compiler.problem.undocumentedEmptyBlock=ignore
46   -org.eclipse.wst.jsdt.core.compiler.problem.uninitializedGlobalVariable=ignore
47   -org.eclipse.wst.jsdt.core.compiler.problem.uninitializedLocalVariable=warning
48   -org.eclipse.wst.jsdt.core.compiler.problem.unnecessaryElse=ignore
49   -org.eclipse.wst.jsdt.core.compiler.problem.unresolvedFieldReference=error
50   -org.eclipse.wst.jsdt.core.compiler.problem.unresolvedMethodReference=error
51   -org.eclipse.wst.jsdt.core.compiler.problem.unresolvedTypeReference=error
52   -org.eclipse.wst.jsdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
53   -org.eclipse.wst.jsdt.core.compiler.problem.unusedLabel=warning
54   -org.eclipse.wst.jsdt.core.compiler.problem.unusedLocal=warning
55   -org.eclipse.wst.jsdt.core.compiler.problem.unusedParameter=ignore
56   -org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
57   -org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
58   -org.eclipse.wst.jsdt.core.compiler.problem.unusedPrivateMember=warning
59   -org.eclipse.wst.jsdt.core.compiler.source=1.3
60   -org.eclipse.wst.jsdt.core.compiler.taskCaseSensitive=enabled
61   -org.eclipse.wst.jsdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
62   -org.eclipse.wst.jsdt.core.compiler.taskTags=TODO,FIXME,XXX
63   -semanticValidation=disabled
Desenvolvimento/Codificacao/e-Selo/.settings/org.eclipse.wst.jsdt.ui.prefs
View file @b94bcdd
... ... @@ -1,2 +0,0 @@
1   -eclipse.preferences.version=1
2   -org.eclipse.wst.jsdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/criterios/form.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -136,6 +136,7 @@
136 136 </div>
137 137 </fieldset>
138 138 </form>
  139 + <small>Campo obrigatório (*)</small>
139 140 </div>
140 141 </div> <!--/row-->
141 142  
... ...
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/faixa/add.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -53,14 +53,14 @@
53 53 <div class="form-group">
54 54 <label class="col-lg-2 control-label required">Valor Inicial</label>
55 55 <div class="col-xs-2">
56   - <input name="faixas[${i}].faixaInicio" type="number" class="form-control required numeric faixaInicial" placeholder="Faixa Inicial" min="0" max="${criterio.tipoTeste.maximoTeste}" />
  56 + <input name="faixas[${i}].faixaInicio" type="number" class="form-control required numeric faixaInicial" placeholder="Faixa Inicial" min="0" />
57 57 </div>
58 58 </div>
59 59  
60 60 <div class="form-group">
61 61 <label class="col-lg-2 control-label required">Valor Final</label>
62 62 <div class="col-xs-2">
63   - <input name="faixas[${i}].faixaFim" type="number" class="form-control required numeric faixaFinal" placeholder="Faixa Final" min="0" max="${criterio.tipoTeste.maximoTeste}" />
  63 + <input name="faixas[${i}].faixaFim" type="number" class="form-control required numeric faixaFinal" placeholder="Faixa Final" min="0" />
64 64 </div>
65 65 </div>
66 66 <div class="form-group">
... ... @@ -83,6 +83,7 @@
83 83 </div>
84 84 </fieldset>
85 85 </form>
  86 + <small>Campo obrigatório (*)</small>
86 87 </div>
87 88 </div>
88 89  
... ...
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/faixa/form.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -32,7 +32,7 @@
32 32 <form name="faixasForm" class="form-horizontal" action="<c:url value="/faixas"/>" method="post">
33 33 <fieldset>
34 34 <div class="form-group">
35   - <label for="inputFaixa" class="col-lg-2 control-label required">Faixa</label>
  35 + <label for="inputFaixa" class="col-lg-2 control-label required">Número da faixa</label>
36 36 <div class="col-xs-2">
37 37 <input id="inputFaixa" name="faixa.faixa" type="text" class="form-control required number" placeholder="Faixa" value="${faixa.faixa}" />
38 38 </div>
... ... @@ -46,13 +46,13 @@
46 46 <input type="hidden" name="faixa.diretriz.id" value="${diretrizId}" />
47 47  
48 48 <div class="form-group">
49   - <label for="inputFaixaInicio" class="col-lg-2 control-label required">Faixa Inicial</label>
  49 + <label for="inputFaixaInicio" class="col-lg-2 control-label required">Valor Inicial</label>
50 50 <div class="col-xs-2">
51 51 <input id="inputFaixaInicio" name="faixa.faixaInicio" type="text" class="form-control required number" placeholder="Faixa Inicial" value="${faixa.faixaInicio}" min="0" />
52 52 </div>
53 53 </div>
54 54 <div class="form-group">
55   - <label for="inputFaixaFim" class="col-lg-2 control-label required">Faixa Final</label>
  55 + <label for="inputFaixaFim" class="col-lg-2 control-label required">Valor Final</label>
56 56 <div class="col-xs-2">
57 57 <input id="inputFaixaFim" name="faixa.faixaFim" type="text" class="form-control required number" placeholder="Faixa Final" value="${faixa.faixaFim}" min="0" />
58 58 </div>
... ... @@ -80,6 +80,7 @@
80 80 </div>
81 81 </fieldset>
82 82 </form>
  83 + <small>Campo obrigatório (*)</small>
83 84 </div>
84 85 </div>
85 86  
... ...
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/grupos/form.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -76,6 +76,7 @@
76 76 </div>
77 77 </fieldset>
78 78 </form>
  79 + <small>Campo obrigatório (*)</small>
79 80 </div>
80 81 </div>
81 82 </tiles:putAttribute>
... ...
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/parametroCalculo/form.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -113,6 +113,7 @@
113 113 </div>
114 114 </fieldset>
115 115 </form>
  116 + <small>Campo obrigatório (*)</small>
116 117 </div>
117 118 </div> <!--/row-->
118 119 </tiles:putAttribute>
... ...
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/parametroCalculo/lista.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -5,7 +5,7 @@
5 5  
6 6 <tiles:insertTemplate template="/WEB-INF/jsp/template/template.jsp">
7 7 <tiles:putAttribute name="body">
8   - <a href="/eselo/painel"><strong><span class="glyphicon glyphicon-dashboard"></span> Meu Painel</strong></a>
  8 + <a href="<c:url value="/painel"/>" ><strong><span class="glyphicon glyphicon-dashboard"></span> Meu Painel</strong></a>
9 9  
10 10 <br/>
11 11 <hr />
... ...
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/recomendacao/form.jsp
  Diff comments   View file @b4e5ff3
... ... @@ -114,6 +114,7 @@
114 114 </div>
115 115 </fieldset>
116 116 </form>
  117 + <small>Campo obrigatório (*)</small>
117 118 </div>
118 119 </div> <!--/row-->
119 120  
... ...
Desenvolvimento/Codificacao/e-Selo/src/main/java/br/com/eselo/controller/AvaliacaoController.java
  Diff comments   View file @b4e5ff3
... ... @@ -133,7 +133,7 @@ public class AvaliacaoController {
133 133 ParametroCalculo parametroCalculo = paramDao
134 134 .getLastParametrosCalculo();
135 135  
136   - salvarAvaliacao(relatorioAvaliacao, parametroCalculo);
  136 + Avaliacao novaAvalicao = salvarAvaliacao(relatorioAvaliacao, parametroCalculo);
137 137  
138 138 // obter as diretrizes e níveis de conformidade
139 139 recomendacoesValidas = parametroCalculo.getRecomendacoes();
... ... @@ -182,6 +182,9 @@ public class AvaliacaoController {
182 182  
183 183 conformidadeAcessibilidade = (double) new Double(
184 184 conformidadeAcessibilidade * 100).intValue() / 100;
  185 +
  186 + novaAvalicao.setNota(conformidadeAcessibilidade);
  187 + dao.update(novaAvalicao);
185 188  
186 189 gerarSelo(url, conformidadeAcessibilidade);
187 190  
... ... @@ -261,6 +264,7 @@ public class AvaliacaoController {
261 264 avaliacao.setDataAvaliacao(relatorioAvaliacao.getDate());
262 265 avaliacao.setParametroCalculo(parametroCalculo);
263 266 avaliacao.setQtdeLinhas(relatorioAvaliacao.getQtdeLinhas());
  267 + avaliacao.setNota(0.0);
264 268  
265 269 Url url = daoUrl.getStringUrl(relatorioAvaliacao.getUrl());
266 270  
... ...
Desenvolvimento/Codificacao/e-Selo/src/main/java/br/com/eselo/dao/GrupoDAO.java
  Diff comments   View file @b4e5ff3
... ... @@ -40,7 +40,7 @@ public class GrupoDAO extends GenericDAO&lt;Grupo&gt; {
40 40 public Long getIdByNome(String nome, Long id) {
41 41 Criteria criteria = getSession()
42 42 .createCriteria(getPersistentClass())
43   - .add(Restrictions.eq("nome", nome));
  43 + .add(Restrictions.eq("nome", nome).ignoreCase());
44 44  
45 45 if (id != null) {
46 46 criteria.add(Restrictions.ne("id", id));
... ...
Desenvolvimento/Codificacao/e-Selo/src/main/java/br/com/eselo/model/Avaliacao.java
  Diff comments   View file @b4e5ff3
... ... @@ -51,6 +51,9 @@ public class Avaliacao {
51 51 @Column(name = "qtde_linhas",nullable = false)
52 52 private Long qtdeLinhas;
53 53  
  54 + @Column(name = "nu_nota",nullable = false)
  55 + private Double nota;
  56 +
54 57 public Long getId() {
55 58 return id;
56 59 }
... ... @@ -106,4 +109,12 @@ public class Avaliacao {
106 109 public void setQtdeLinhas(Long qtdeLinhas) {
107 110 this.qtdeLinhas = qtdeLinhas;
108 111 }
  112 +
  113 + public Double getNota() {
  114 + return nota;
  115 + }
  116 +
  117 + public void setNota(Double nota) {
  118 + this.nota = nota;
  119 + }
109 120 }
... ...