Download as
Browse Code »

Commit 159fa4029f995439ef4fc65f7128fc9c588def15

Authored by 96409975520
1 parent 1aaab8ff
Exists in master

Correções de avaliações onde manda a quantidade de itens para o eselo.

Showing 6 changed files with 156 additions and 35 deletions   Show diff stats
src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java
  Diff comments   View file @159fa40
@@ -111,7 +111,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { @@ -111,7 +111,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
111 { 111 {
112 if(element.getAttributeValue(atributoBuscar) != null) 112 if(element.getAttributeValue(atributoBuscar) != null)
113 { 113 {
114 - System.out.println(element.getStartTag().getName().equalsIgnoreCase("input")); 114 +
115 if(!element.getAttributeValue(atributoBuscar).equalsIgnoreCase("button") 115 if(!element.getAttributeValue(atributoBuscar).equalsIgnoreCase("button")
116 && !element.getAttributeValue(atributoBuscar).equalsIgnoreCase("reset") 116 && !element.getAttributeValue(atributoBuscar).equalsIgnoreCase("reset")
117 && !element.getAttributeValue(atributoBuscar).equalsIgnoreCase("submit") 117 && !element.getAttributeValue(atributoBuscar).equalsIgnoreCase("submit")
@@ -307,6 +307,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { @@ -307,6 +307,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
307 } 307 }
308 308
309 309
  310 +
310 qtdErrosAvisos = retornaQuantidadeErrosAvisos(mapaListaOcorrencias, recomendacaoProperties, criterioProperties); 311 qtdErrosAvisos = retornaQuantidadeErrosAvisos(mapaListaOcorrencias, recomendacaoProperties, criterioProperties);
311 312
312 313
src/main/java/br/com/ases/controller/AvaliacaoController.java
  Diff comments   View file @159fa40
@@ -130,13 +130,17 @@ public class AvaliacaoController { @@ -130,13 +130,17 @@ public class AvaliacaoController {
130 130
131 Double notaAvaliacao = Double.parseDouble(valorNota.replaceFirst(",", ".")); 131 Double notaAvaliacao = Double.parseDouble(valorNota.replaceFirst(",", "."));
132 132
133 - if (notaAvaliacao >= 70) {  
134 - webaxscore = "verde";  
135 - } else if (notaAvaliacao >= 50 & notaAvaliacao < 70) {  
136 - webaxscore = "amarela";  
137 - } else {  
138 - webaxscore = "vermelha";  
139 - } 133 + if (notaAvaliacao >= 95) {
  134 + webaxscore = "bom";
  135 + } else if (notaAvaliacao >= 85 & notaAvaliacao < 95) {
  136 + webaxscore = "razoavel";
  137 + } else if (notaAvaliacao >= 70 & notaAvaliacao < 85) {
  138 + webaxscore = "ruim";
  139 + }else {
  140 + webaxscore = "pessimo";
  141 + }
  142 +
  143 +
140 } 144 }
141 145
142 146
src/main/webapp/WEB-INF/tags/baseLayout.tag
  Diff comments   View file @159fa40
@@ -172,8 +172,8 @@ @@ -172,8 +172,8 @@
172 <script type="text/javascript" 172 <script type="text/javascript"
173 src="${pageContext.request.contextPath}/inicial_arquivos/js/contatoAddAncoras.js"></script> 173 src="${pageContext.request.contextPath}/inicial_arquivos/js/contatoAddAncoras.js"></script>
174 174
175 -  
176 <script defer="defer" src="//barra.brasil.gov.br/barra.js" 175 <script defer="defer" src="//barra.brasil.gov.br/barra.js"
177 type="text/javascript"></script> 176 type="text/javascript"></script>
  177 + <noscript>Seu navegador não possui suporte para JavaScript!</noscript>
178 </body> 178 </body>
179 </html> 179 </html>
src/main/webapp/WEB-INF/testeEselo.properties
  Diff comments   View file @159fa40
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 3.6.4=proporcional=true=e=img 58 3.6.4=proporcional=true=e=img
59 3.6.7=proporcional=false=e=img 59 3.6.7=proporcional=false=e=img
60 3.6.8=proporcional=true=e=img 60 3.6.8=proporcional=true=e=img
61 -3.7.1=proporcional=true=ea=eimg=ausemap=earea 61 +3.7.1=proporcional=true=ea=eimg=earea=ausemap=acoords
62 3.9.1=proporcional=false=e=table 62 3.9.1=proporcional=false=e=table
63 3.10.1=proporcional=true=e=table 63 3.10.1=proporcional=true=e=table
64 3.11.2=proporcional=true=e=p 64 3.11.2=proporcional=true=e=p
src/main/webapp/inicial_arquivos/css/avaliar.css
  Diff comments   View file @159fa40
1 @media only screen and (min-width : 768px) { 1 @media only screen and (min-width : 768px) {
  2 +
  3 +
  4 +#bom
  5 + {
  6 + width: 15px;
  7 + height: 15px;
  8 + float: left;
  9 + background: #0d0;
  10 + border: 1px solid #090;
  11 + }
  12 + #razoavel
  13 + {
  14 + width: 15px;
  15 + height: 15px;
  16 + float: left;
  17 + background: #ffff00;
  18 + border: 1px solid #f2f200;
  19 + }
  20 + #ruim
  21 + {
  22 + width: 15px;
  23 + height: 15px;
  24 + float: left;
  25 + background: #ff8000;
  26 + border: 1px solid #e17100;
  27 + }
  28 + #pessimo
  29 + {
  30 + width: 15px;
  31 + height: 15px;
  32 + float: left;
  33 + background: #ff0000;
  34 + border: 1px solid #ea0000;
  35 + }
2 36
  37 + #legenda{
  38 + padding-left: 10px;
  39 + padding-top: 5px;
  40 + margin-top: 20px;
  41 + border: 2px solid #000000;
  42 + width: 180px;
  43 + float: left;
  44 + }
  45 + .legenda
  46 + {
  47 + list-style: none;
  48 + margin-top: 2px;
  49 + }
3 .hr_linhaDupla { 50 .hr_linhaDupla {
4 border-bottom: 4px solid #000000; 51 border-bottom: 4px solid #000000;
5 border-top: 1px solid #c0c0c0; 52 border-top: 1px solid #c0c0c0;
@@ -33,7 +80,7 @@ @@ -33,7 +80,7 @@
33 .width-5 { 80 .width-5 {
34 width: 26%; 81 width: 26%;
35 float: left; 82 float: left;
36 - margin-left: 10%; 83 +
37 } 84 }
38 #content fieldset { 85 #content fieldset {
39 -moz-border-bottom-colors: none; 86 -moz-border-bottom-colors: none;
@@ -120,23 +167,34 @@ @@ -120,23 +167,34 @@
120 font-weight: bold; 167 font-weight: bold;
121 line-height: 1em; 168 line-height: 1em;
122 } 169 }
123 - div.scoreB_verde { 170 +
  171 + div.scoreB_bom {
124 background-color: #0d0 !important; 172 background-color: #0d0 !important;
125 border: 4px solid #090; 173 border: 4px solid #090;
126 color: #fff !important; 174 color: #fff !important;
127 - text-shadow: 0.1em 0.1em 0.1em #000000; 175 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
128 } 176 }
129 - div.scoreB_amarela {  
130 - background-color: #FFCC00 !important;  
131 - border: 4px solid #e6e600;  
132 - color: #000 !important; 177 +
  178 + div.scoreB_razoavel {
  179 + background-color: #ffff00 !important;
  180 + border: 4px solid #f2f200;
  181 + color: #000000!important;
  182 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
  183 + }
  184 + div.scoreB_ruim {
  185 + background-color: #ff8000 !important;
  186 + border: 4px solid #e17100;
  187 + color: #000000!important;
  188 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
133 } 189 }
134 - div.scoreB_vermelha {  
135 - background-color: #e60000 !important;  
136 - border: 4px solid #ff0000; 190 +
  191 + div.scoreB_pessimo {
  192 + background-color: #ff0000 !important;
  193 + border: 4px solid #ea0000;
137 color: #fff !important; 194 color: #fff !important;
138 - text-shadow: 0.1em 0.1em 0.1em #000000; 195 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
139 } 196 }
  197 +
140 div.block { 198 div.block {
141 background: #ffa none repeat scroll 0 0; 199 background: #ffa none repeat scroll 0 0;
142 border: 1px solid #999; 200 border: 1px solid #999;
@@ -147,7 +205,7 @@ @@ -147,7 +205,7 @@
147 #tabelaErros { 205 #tabelaErros {
148 position: relative; 206 position: relative;
149 margin-bottom: 30px; 207 margin-bottom: 30px;
150 - margin-left: 5px; 208 + margin-left: 20px;
151 width: 40%; 209 width: 40%;
152 } 210 }
153 .contraste #tabelaErros { 211 .contraste #tabelaErros {
@@ -328,6 +386,54 @@ @@ -328,6 +386,54 @@
328 386
329 /*-----Fim (min-width : 768px)------ */ 387 /*-----Fim (min-width : 768px)------ */
330 @media only screen and (max-width : 768px) { 388 @media only screen and (max-width : 768px) {
  389 +
  390 + #bom
  391 + {
  392 + width: 15px;
  393 + height: 15px;
  394 + float: left;
  395 + background: #0d0;
  396 + border: 1px solid #090;
  397 + }
  398 + #razoavel
  399 + {
  400 + width: 15px;
  401 + height: 15px;
  402 + float: left;
  403 + background: #ffff00;
  404 + border: 1px solid #f2f200;
  405 + }
  406 + #ruim
  407 + {
  408 + width: 15px;
  409 + height: 15px;
  410 + float: left;
  411 + background: #ff8000;
  412 + border: 1px solid #e17100;
  413 + }
  414 + #pessimo
  415 + {
  416 + width: 15px;
  417 + height: 15px;
  418 + float: left;
  419 + background: #ff0000;
  420 + border: 1px solid #ea0000;
  421 + }
  422 +
  423 + #legenda{
  424 + padding-left: 10px;
  425 + padding-top: 5px;
  426 + margin-top: 20px;
  427 + border: 2px solid #000000;
  428 + width: 180px;
  429 + float: left;
  430 + }
  431 + .legenda
  432 + {
  433 + list-style: none;
  434 + margin-top: 2px;
  435 + }
  436 +
331 .content { 437 .content {
332 font-weight: normal !important; 438 font-weight: normal !important;
333 } 439 }
@@ -439,22 +545,32 @@ @@ -439,22 +545,32 @@
439 font-weight: bold; 545 font-weight: bold;
440 line-height: 1em; 546 line-height: 1em;
441 } 547 }
442 - div.scoreB_verde { 548 +
  549 + div.scoreB_bom {
443 background-color: #0d0 !important; 550 background-color: #0d0 !important;
444 border: 4px solid #090; 551 border: 4px solid #090;
445 - color: #ffffff !important;  
446 - text-shadow: 0.1em 0.1em 0.1em #000000; 552 + color: #fff !important;
  553 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
447 } 554 }
448 - div.scoreB_amarela {  
449 - background-color: #FFCC00 !important;  
450 - border: 4px solid #e6e600;  
451 - color: #000000 !important; 555 +
  556 + div.scoreB_razoavel {
  557 + background-color: #ffff00 !important;
  558 + border: 4px solid #f2f200;
  559 + color: #000000!important;
  560 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
  561 + }
  562 + div.scoreB_ruim {
  563 + background-color: #ff8000 !important;
  564 + border: 4px solid #e17100;
  565 + color: #000000!important;
  566 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
452 } 567 }
453 - div.scoreB_vermelha {  
454 - background-color: #e60000 !important;  
455 - border: 4px solid #ff0000;  
456 - color: #ffffff !important;  
457 - text-shadow: 0.1em 0.1em 0.1em #000000; 568 +
  569 + div.scoreB_pessimo {
  570 + background-color: #ff0000 !important;
  571 + border: 4px solid #ea0000;
  572 + color: #fff !important;
  573 + /*text-shadow: 0.1em 0.1em 0.1em #000000;*/
458 } 574 }
459 div.block { 575 div.block {
460 background: #ffa none repeat scroll 0 0; 576 background: #ffa none repeat scroll 0 0;
src/main/webapp/inicial_arquivos/css/default.css
  Diff comments   View file @159fa40
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 { 16 {
17 padding-top:30px; 17 padding-top:30px;
18 height:105px; 18 height:105px;
19 - font-size:14px; 19 + font-size:14px;
20 background-image: url("/ases/inicial_arquivos/imagens/loading.gif"); 20 background-image: url("/ases/inicial_arquivos/imagens/loading.gif");
21 text-align: center; 21 text-align: center;
22 background-position: bottom; 22 background-position: bottom;