diff --git a/src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java b/src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java index b7b6d13..1896edc 100644 --- a/src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java +++ b/src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java @@ -111,7 +111,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { { if(element.getAttributeValue(atributoBuscar) != null) { - System.out.println(element.getStartTag().getName().equalsIgnoreCase("input")); + if(!element.getAttributeValue(atributoBuscar).equalsIgnoreCase("button") && !element.getAttributeValue(atributoBuscar).equalsIgnoreCase("reset") && !element.getAttributeValue(atributoBuscar).equalsIgnoreCase("submit") @@ -307,6 +307,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { } + qtdErrosAvisos = retornaQuantidadeErrosAvisos(mapaListaOcorrencias, recomendacaoProperties, criterioProperties); diff --git a/src/main/java/br/com/ases/controller/AvaliacaoController.java b/src/main/java/br/com/ases/controller/AvaliacaoController.java index 8c8a1b5..7ebc835 100644 --- a/src/main/java/br/com/ases/controller/AvaliacaoController.java +++ b/src/main/java/br/com/ases/controller/AvaliacaoController.java @@ -130,13 +130,17 @@ public class AvaliacaoController { Double notaAvaliacao = Double.parseDouble(valorNota.replaceFirst(",", ".")); - if (notaAvaliacao >= 70) { - webaxscore = "verde"; - } else if (notaAvaliacao >= 50 & notaAvaliacao < 70) { - webaxscore = "amarela"; - } else { - webaxscore = "vermelha"; - } + if (notaAvaliacao >= 95) { + webaxscore = "bom"; + } else if (notaAvaliacao >= 85 & notaAvaliacao < 95) { + webaxscore = "razoavel"; + } else if (notaAvaliacao >= 70 & notaAvaliacao < 85) { + webaxscore = "ruim"; + }else { + webaxscore = "pessimo"; + } + + } diff --git a/src/main/webapp/WEB-INF/tags/baseLayout.tag b/src/main/webapp/WEB-INF/tags/baseLayout.tag index 4ae30d5..6d7d9ad 100644 --- a/src/main/webapp/WEB-INF/tags/baseLayout.tag +++ b/src/main/webapp/WEB-INF/tags/baseLayout.tag @@ -172,8 +172,8 @@ - + diff --git a/src/main/webapp/WEB-INF/testeEselo.properties b/src/main/webapp/WEB-INF/testeEselo.properties index fe8de1b..1dd352a 100644 --- a/src/main/webapp/WEB-INF/testeEselo.properties +++ b/src/main/webapp/WEB-INF/testeEselo.properties @@ -58,7 +58,7 @@ 3.6.4=proporcional=true=e=img 3.6.7=proporcional=false=e=img 3.6.8=proporcional=true=e=img -3.7.1=proporcional=true=ea=eimg=ausemap=earea +3.7.1=proporcional=true=ea=eimg=earea=ausemap=acoords 3.9.1=proporcional=false=e=table 3.10.1=proporcional=true=e=table 3.11.2=proporcional=true=e=p diff --git a/src/main/webapp/inicial_arquivos/css/avaliar.css b/src/main/webapp/inicial_arquivos/css/avaliar.css index 9963c22..f8bbbe2 100644 --- a/src/main/webapp/inicial_arquivos/css/avaliar.css +++ b/src/main/webapp/inicial_arquivos/css/avaliar.css @@ -1,5 +1,52 @@ @media only screen and (min-width : 768px) { + + +#bom + { + width: 15px; + height: 15px; + float: left; + background: #0d0; + border: 1px solid #090; + } + #razoavel + { + width: 15px; + height: 15px; + float: left; + background: #ffff00; + border: 1px solid #f2f200; + } + #ruim + { + width: 15px; + height: 15px; + float: left; + background: #ff8000; + border: 1px solid #e17100; + } + #pessimo + { + width: 15px; + height: 15px; + float: left; + background: #ff0000; + border: 1px solid #ea0000; + } + #legenda{ + padding-left: 10px; + padding-top: 5px; + margin-top: 20px; + border: 2px solid #000000; + width: 180px; + float: left; + } + .legenda + { + list-style: none; + margin-top: 2px; + } .hr_linhaDupla { border-bottom: 4px solid #000000; border-top: 1px solid #c0c0c0; @@ -33,7 +80,7 @@ .width-5 { width: 26%; float: left; - margin-left: 10%; + } #content fieldset { -moz-border-bottom-colors: none; @@ -120,23 +167,34 @@ font-weight: bold; line-height: 1em; } - div.scoreB_verde { + + div.scoreB_bom { background-color: #0d0 !important; border: 4px solid #090; color: #fff !important; - text-shadow: 0.1em 0.1em 0.1em #000000; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ } - div.scoreB_amarela { - background-color: #FFCC00 !important; - border: 4px solid #e6e600; - color: #000 !important; + + div.scoreB_razoavel { + background-color: #ffff00 !important; + border: 4px solid #f2f200; + color: #000000!important; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ + } + div.scoreB_ruim { + background-color: #ff8000 !important; + border: 4px solid #e17100; + color: #000000!important; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ } - div.scoreB_vermelha { - background-color: #e60000 !important; - border: 4px solid #ff0000; + + div.scoreB_pessimo { + background-color: #ff0000 !important; + border: 4px solid #ea0000; color: #fff !important; - text-shadow: 0.1em 0.1em 0.1em #000000; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ } + div.block { background: #ffa none repeat scroll 0 0; border: 1px solid #999; @@ -147,7 +205,7 @@ #tabelaErros { position: relative; margin-bottom: 30px; - margin-left: 5px; + margin-left: 20px; width: 40%; } .contraste #tabelaErros { @@ -328,6 +386,54 @@ /*-----Fim (min-width : 768px)------ */ @media only screen and (max-width : 768px) { + + #bom + { + width: 15px; + height: 15px; + float: left; + background: #0d0; + border: 1px solid #090; + } + #razoavel + { + width: 15px; + height: 15px; + float: left; + background: #ffff00; + border: 1px solid #f2f200; + } + #ruim + { + width: 15px; + height: 15px; + float: left; + background: #ff8000; + border: 1px solid #e17100; + } + #pessimo + { + width: 15px; + height: 15px; + float: left; + background: #ff0000; + border: 1px solid #ea0000; + } + + #legenda{ + padding-left: 10px; + padding-top: 5px; + margin-top: 20px; + border: 2px solid #000000; + width: 180px; + float: left; + } + .legenda + { + list-style: none; + margin-top: 2px; + } + .content { font-weight: normal !important; } @@ -439,22 +545,32 @@ font-weight: bold; line-height: 1em; } - div.scoreB_verde { + + div.scoreB_bom { background-color: #0d0 !important; border: 4px solid #090; - color: #ffffff !important; - text-shadow: 0.1em 0.1em 0.1em #000000; + color: #fff !important; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ } - div.scoreB_amarela { - background-color: #FFCC00 !important; - border: 4px solid #e6e600; - color: #000000 !important; + + div.scoreB_razoavel { + background-color: #ffff00 !important; + border: 4px solid #f2f200; + color: #000000!important; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ + } + div.scoreB_ruim { + background-color: #ff8000 !important; + border: 4px solid #e17100; + color: #000000!important; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ } - div.scoreB_vermelha { - background-color: #e60000 !important; - border: 4px solid #ff0000; - color: #ffffff !important; - text-shadow: 0.1em 0.1em 0.1em #000000; + + div.scoreB_pessimo { + background-color: #ff0000 !important; + border: 4px solid #ea0000; + color: #fff !important; + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/ } div.block { background: #ffa none repeat scroll 0 0; diff --git a/src/main/webapp/inicial_arquivos/css/default.css b/src/main/webapp/inicial_arquivos/css/default.css index b672caa..ff096b9 100644 --- a/src/main/webapp/inicial_arquivos/css/default.css +++ b/src/main/webapp/inicial_arquivos/css/default.css @@ -16,7 +16,7 @@ { padding-top:30px; height:105px; - font-size:14px; + font-size:14px; background-image: url("/ases/inicial_arquivos/imagens/loading.gif"); text-align: center; background-position: bottom; -- libgit2 0.21.2