From 0ef4dbe3998b661ff57915c6707a3e66fd7a42ce Mon Sep 17 00:00:00 2001
From: higo.gomes <higo.gomes@c2178572-b5ca-4887-91d2-9e3a90c7d55b>
Date: Fri, 18 Mar 2016 12:21:35 +0000
Subject: [PATCH] Foi atualizado: Para geração de documentos permaneceu somente o PDF, foi retirado os espacos em branco do <pre>, foi colocado uma lista não ordenada das linhas de codigo na tabela.

---
 src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------
 1 file changed, 126 insertions(+), 139 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp b/src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp
index e70fe67..952eac2 100644
--- a/src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp
+++ b/src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp
@@ -1,192 +1,179 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
 
 <t:baseLayout>
-   <jsp:body>
+	<jsp:body>
       <!-- Início Conteudo -->
       
+      <h2>Exportar Resultado</h2>
       <form name="form" action="${pageContext.request.contextPath}/exportar-detalhes-avaliacao" method="post">
 	      <fieldset>
-			   <legend><label for="uri">Exportar Resultado</label></legend>
+			    <legend>
+					Tipos de Exportação
+				</legend>
+				
 				<p>
-				   <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/pdf.png" alt="pdf" title="Gerar em PDF" height="20" width="20">
-				   <input type="radio" name="tiporel" value="4">PDF
-				   <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/odt.png" alt="odt" title="Gerar em ODT" height="20" width="20">
-				   <input type="radio" name="tiporel" value="3">ODT
-				   <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/xls.png" alt="xls" title="Gerar em XLS" height="20" width="20">
-				   <input type="radio" name="tiporel" value="2">XLS
-				   <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/csv_text.png" alt="csv" title="Gerar em CSV" height="20" width="20">
-				   <input type="radio" name="tiporel" value="5">CSV
-				   <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/doc-rtf.png" alt="xls" title="Gerar em RFT" height="20" width="20">
-				   <input type="radio" name="tiporel" value="1">RTF
+				   <img	src="${pageContext.request.contextPath}/inicial_arquivos/imagens/pdf.png" alt="pdf" title="Gerar em PDF" height="20" width="20">
+				   <input type="radio" name="tiporel" value="4">PDF	
 				   <input type="hidden" name="rn" value="${rn}">
 				   <input type="hidden" name="isError" value="${isError}">
-		           <input class="submit" name="executar" value="Gerar" type="submit">
+		           <input class="submit" name="executar" value="Executar" type="submit">			  
 				</p>
 		  </fieldset>
 	  </form>
     
-			<div class="tile --NOVALUE--">	
-				<div class="outstanding-header">
-					<h2 class="outstanding-title">Recomendação Avaliada</h2>
-				</div>
-				<p><strong>${recomendacao}</strong>
+	  <div class="tile --NOVALUE--">	
+			<div class="outstanding-header">
+				<h2 class="outstanding-title">Página Avaliada</h2>
+			</div>
+		
+			<c:if test="${not empty url}">
+				<strong>Página:</strong> ${url} <br>
+			</c:if>
+			<strong>Título:</strong> ${titulosite} <br>
+			<strong>Tamanho:</strong> ${contentLenght} Bytes <br>
+			<strong>Data/Hora:</strong> ${data}
+      </div>
+    
+    
+	  <div class="tile --NOVALUE--">	
+			<div class="outstanding-header">
+				<h2 class="outstanding-title">Recomendação Avaliada</h2>
 			</div>
+			<strong>${recomendacao}</strong>
+	  </div>
 			
-			<div class="tile --NOVALUE--">
-				<div class="outstanding-header">
-    		    	<h2 class="outstanding-title">Critério(s) Avaliado(s)</h2>
-				</div>
+	  <div class="tile --NOVALUE--">
+	  		<div class="outstanding-header">
+    	    	<h2 class="outstanding-title">Critério(s) Avaliado(s)</h2>
+			</div>
 				
-				<table id="tabelaErros2">
-								<tbody>
-								
-								<tr>
-									<td colspan="2" class="topo2"> Teste(s) </td>
-									<td width="9%" class="topo2"> Quantidade</td>
-									<td width="56%" class="topo2"> Linha(s) de Código Fonte</td>
-								</tr>
-					
-					 	 <c:forEach items="${detalhe.criterios}" var="criterio">
-								<tr>
-								   <td class="celula" width="2%"> ${criterio.id} </td>
-								   <td class="celula" width="60%" align="left">${criterio.descricao}</td>
-								   
-								   <td class="celula">
+			<table id="tabelaErros2">
+			<caption>Tabela de Erros</caption>
+				 <thead>								
+						<tr>
+						    <th id="numero" class="topo2">Número</th>
+							<th id="teste" class="topo2">Teste(s)</th>
+							<th id="quantidade" class="topo2">Quantidade</th>
+							<th id="linhaCodigoFonte" class="topo2">Linha(s) de Código Fonte</th>
+						</tr>
+	             </thead>
+					            
+			     <tbody>
+				 	 <c:forEach items="${detalhe.criterios}" var="criterio">
+						<tr>
+						   <td headers="numero" class="celula"> ${criterio.id} </td>
+						   <td headers="teste" class="celula">${criterio.descricao}</td>
+						   <td headers="quantidade" class="celula">
 								   	
-								   		<c:choose>
-								   		<c:when test="${rn == '1.1'}">
-								   			<c:choose>
-								   				<c:when test="${criterio.id == 1 }">
-								   					${qtdOcorrenciasHtml}
-								   				</c:when>
-								   				<c:when test="${criterio.id == 2 }">
+        			   	   		<c:choose>
+						  			<c:when test="${rn == '1.1'}">
+						   				<c:choose>
+						   					<c:when test="${criterio.id == 1 }">
+							   						${qtdOcorrenciasHtml}
+						   					</c:when>
+											<c:when test="${criterio.id == 2 }">
 								   					${qtdOcorrenciasCss}
-								   				</c:when>
-								   				<c:otherwise>
-										   			${criterio.numeroOcorrencias}
-										   		</c:otherwise>
-								   			</c:choose>
-								   		</c:when>
-								   		<c:otherwise>
-								   			${criterio.numeroOcorrencias}
-								   		</c:otherwise>
+								   			</c:when>
+								   			<c:otherwise>
+													${criterio.numeroOcorrencias}
+											</c:otherwise>
 								   		</c:choose>
-								   	
-								   	
-								   </td>
-								   <td class="celula">
-								   
-								   
-								   
-								 <c:set var="aReq" value="${aReq}" />
-								 <c:set var="req" value="${rn}.${criterio.id}" />
-								   
-								   <c:choose> 
-											   <c:when  test="${fn:contains(aReq, req)}">
+									</c:when>
+								   			<c:otherwise>
+								   				${criterio.numeroOcorrencias}
+									   		</c:otherwise>
+						   		</c:choose>
+						   </td>
+						   
+						   <td headers="linhaCodigoFonte" class="celula">
+								   <c:set var="aReq" value="${aReq}" />
+								   <c:set var="req" value="${rn}.${criterio.id}" />
+								       <c:choose> 
+											   <c:when test="${fn:contains(aReq, req)}">
 											   		<c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index">
+											   			<c:if test="${fn:contains(aReqIsW3c, req)}">
+									     					<c:if test="${fn:contains(aReqIsCss, req)}">
+													     	      <a href=" http://jigsaw.w3.org/css-validator/validator?uri=${url}" target="_blanck">
+													     						   Servi&ccedil;o de valida&ccedil;&atilde;o de CSS do W3C (link para um novo sitio)
+												 				  </a>
+														    </c:if>
+															
+															<c:if test="${!fn:contains(aReqIsCss, req)}">
+													     	      <a href="https://validator.w3.org/nu/?doc=http%3A%2F%2F${url}" target="_blanck">
+													     				       		Servi&ccedil;o de valida&ccedil;&atilde;o de HTML do W3C (link para um novo sitio)
+													     		  </a>
+														    </c:if>
+									     			    </c:if>
 											   		
-											   		
-											   		   <c:if test="${fn:contains(aReqIsW3c, req)}">
-									     				
-															   		 	<c:if test="${fn:contains(aReqIsCss, req)}">
-													     				     <a href=" http://jigsaw.w3.org/css-validator/validator?uri=${url}" target="_blanck">
-													     						   Servi&ccedil;o de valida&ccedil;&atilde;o de CSS do W3C
-												 						     </a>
-																    	</c:if>
-																    	
-																    	<c:if test="${!fn:contains(aReqIsCss, req)}">
-													     				     <a href="https://validator.w3.org/nu/?doc=http%3A%2F%2F${url}" target="_blanck">
-													     				       		Servi&ccedil;o de valida&ccedil;&atilde;o de HTML do W3C
-													     				     </a>
-																    	</c:if>
-									     				</c:if>
-											   		
-											   			 <c:if test="${!fn:contains(aReqIsW3c, req)}">
+											   		    <c:if test="${!fn:contains(aReqIsW3c, req)}">
 											   					--
-											   		      </c:if>
+											   		    </c:if>
 											   		
 												     </c:forEach>
 											   </c:when>
 											   
 											   
 											    <c:otherwise>
-												     <c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index">
-									     
-														     	<c:set var="lineOcc" value="${fn:split(linha, '.')}" />
-														     	<a href="#${criterio.id}.${linha}" class="sublinharLink">${lineOcc[0]}</a>
-														       	<c:if test="${index.index !=  fn:length(criterio.linhas) -1}"> - </c:if>
-											
-												     </c:forEach> 
+											    	<ul>
+														<c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index">
+									         	     		<c:set var="lineOcc" value="${fn:split(linha, '.')}" />
+																<li id="linhaCodigoFonte_${criterio.id}.${linha}" style="display:inline"><a href="#${criterio.id}.${linha}" class="sublinharLink">${lineOcc[0]}</a>
+														    		<c:if test="${index.index !=  fn:length(criterio.linhas) -1}"> - 
+																	</c:if>
+																</li>
+													 	</c:forEach>
+													</ul> 
 											     </c:otherwise>
 									</c:choose>		   
 											   
-								   <c:if test="">
-								   
-								   </c:if>
-								   
+							    <c:if test="">
 								   
+							    </c:if>
+							  
 								    
-								   </td>
+						</td>
 								</tr>
 
-					</c:forEach> 
+					        </c:forEach> 
 							</tbody>
 								
 						</table>
-			</div>
-			
+			     </div>
 			
 			
-			<div class="tile --NOVALUE--" align="left">
 			
-				<div class="outstanding-header" align="left">
+			<div class="tile --NOVALUE--">
+			    <div class="outstanding-header">
 					<h2 class="outstanding-title">Código Fonte</h2>
 				</div>
-				<div id="codigo" align="left">
-					<%-- <c:set var="testeCrit" value="${listOcorrencia[0].criterio}"/>
-					<c:set var="count1" value="0"/> --%>
-					
-					<pre>
+				
+				<div id="codigo">
+					<pre style="overflow: auto; width:100%; height:400px; border:1px solid #cccccc; display:block; white-space:nowrap">					
 						<c:forEach items="${listOcorrencia}" var="ocorrencia" varStatus="index">
-						
-						 	<c:set var="aReq" value="${aReq}" />
-								 <c:set var="req" value="${rn}.${ocorrencia.criterio}" />
-								
-								   <c:if test="${!fn:contains(aReq, req)}">
-								   	<c:choose>
-								   		<c:when test="${ocorrencia.cssEvaluation}">
-								 					<a name="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}" href="http://jigsaw.w3.org/css-validator/validator?uri=${ocorrencia.tag}" target="_blank">
-								 						${ocorrencia.line} : Serviço de validação de CSS do W3C : ${ocorrencia.tag}
-								 					</a>
-								 		</c:when>
-								 		<c:when test="${ocorrencia.htmlEvaluation }">
-								 					<a name="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}" href="https://validator.w3.org/nu/?doc=${ocorrencia.tag}" target="_blank">
-								 						${ocorrencia.line} : Serviço de validação de HTML do W3C : ${ocorrencia.tag}
-								 					</a>
-								 		</c:when>
-								 		<c:otherwise>
-								 			<a name="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}">
-								 				${ocorrencia.line} : ${ocorrencia.tag}
-								 			</a>
+							<c:set var="aReq" value="${aReq}"/>
+							<c:set var="req" value="${rn}.${ocorrencia.criterio}"/>
+								<c:if test="${!fn:contains(aReq, req)}">
+									<c:choose>
+										<c:when test="${ocorrencia.cssEvaluation}">
+											<a id="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}" href="http://jigsaw.w3.org/css-validator/validator?uri=${ocorrencia.tag}" target="_blank">${ocorrencia.line} : Serviço de validação de CSS do W3C : ${ocorrencia.tag}</a>
+					            		</c:when>
+					            		<c:when test="${ocorrencia.htmlEvaluation}">
+					            			<a id="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}" href="https://validator.w3.org/nu/?doc=${ocorrencia.tag}" target="_blank">${ocorrencia.line} : Serviço de validação de HTML do W3C : ${ocorrencia.tag}</a>
+										</c:when>
+										<c:otherwise>
+											<a id="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}">${ocorrencia.line} : ${ocorrencia.tag}</a><br>
 								 		</c:otherwise>
-								   	</c:choose>
-								   
-								   </c:if>
-						</c:forEach> 
+							 		</c:choose>
+							 	</c:if>
+						</c:forEach>						
 					</pre>
 				</div>
-			
 			</div>	
-			<!-- Término Conteudo-->
-     
-       		<%--  --%>
-       		
-       		
+			      		
        		
    </jsp:body>
 </t:baseLayout>
\ No newline at end of file
--
libgit2 0.21.2