Download as
Browse Code »

Commit 0ef4dbe3998b661ff57915c6707a3e66fd7a42ce

Authored by higo.gomes
1 parent bf09703b
Exists in master and in 1 other branch Desenvolvimento-Ases-Web

Foi atualizado: Para geração de documentos permaneceu somente o PDF, foi retirad… 

…o os espacos em branco do <pre>, foi colocado uma lista não ordenada das linhas de codigo na tabela. 

git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/ASES%20-%20Web/ASES%20-%20Web/Fontes/avaliador-web@10630 c2178572-b5ca-4887-91d2-9e3a90c7d55b
Showing 1 changed file with 126 additions and 139 deletions   Show diff stats
src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp
  Diff comments   View file @0ef4dbe
1 <%@page contentType="text/html" pageEncoding="UTF-8"%> 1 <%@page contentType="text/html" pageEncoding="UTF-8"%>
2 -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>  
3 -  
4 -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>  
5 -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> 2 +<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
  3 +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
  4 +<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
6 5
7 6
8 <t:baseLayout> 7 <t:baseLayout>
9 - <jsp:body> 8 + <jsp:body>
10 <!-- Início Conteudo --> 9 <!-- Início Conteudo -->
11 10
  11 + <h2>Exportar Resultado</h2>
12 <form name="form" action="${pageContext.request.contextPath}/exportar-detalhes-avaliacao" method="post"> 12 <form name="form" action="${pageContext.request.contextPath}/exportar-detalhes-avaliacao" method="post">
13 <fieldset> 13 <fieldset>
14 - <legend><label for="uri">Exportar Resultado</label></legend> 14 + <legend>
  15 + Tipos de Exportação
  16 + </legend>
  17 +
15 <p> 18 <p>
16 - <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/pdf.png" alt="pdf" title="Gerar em PDF" height="20" width="20">  
17 - <input type="radio" name="tiporel" value="4">PDF  
18 - <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/odt.png" alt="odt" title="Gerar em ODT" height="20" width="20">  
19 - <input type="radio" name="tiporel" value="3">ODT  
20 - <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/xls.png" alt="xls" title="Gerar em XLS" height="20" width="20">  
21 - <input type="radio" name="tiporel" value="2">XLS  
22 - <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/csv_text.png" alt="csv" title="Gerar em CSV" height="20" width="20">  
23 - <input type="radio" name="tiporel" value="5">CSV  
24 - <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/doc-rtf.png" alt="xls" title="Gerar em RFT" height="20" width="20">  
25 - <input type="radio" name="tiporel" value="1">RTF 19 + <img src="${pageContext.request.contextPath}/inicial_arquivos/imagens/pdf.png" alt="pdf" title="Gerar em PDF" height="20" width="20">
  20 + <input type="radio" name="tiporel" value="4">PDF
26 <input type="hidden" name="rn" value="${rn}"> 21 <input type="hidden" name="rn" value="${rn}">
27 <input type="hidden" name="isError" value="${isError}"> 22 <input type="hidden" name="isError" value="${isError}">
28 - <input class="submit" name="executar" value="Gerar" type="submit"> 23 + <input class="submit" name="executar" value="Executar" type="submit">
29 </p> 24 </p>
30 </fieldset> 25 </fieldset>
31 </form> 26 </form>
32 27
33 - <div class="tile --NOVALUE--">  
34 - <div class="outstanding-header">  
35 - <h2 class="outstanding-title">Recomendação Avaliada</h2>  
36 - </div>  
37 - <p><strong>${recomendacao}</strong> 28 + <div class="tile --NOVALUE--">
  29 + <div class="outstanding-header">
  30 + <h2 class="outstanding-title">Página Avaliada</h2>
  31 + </div>
  32 +
  33 + <c:if test="${not empty url}">
  34 + <strong>Página:</strong> ${url} <br>
  35 + </c:if>
  36 + <strong>Título:</strong> ${titulosite} <br>
  37 + <strong>Tamanho:</strong> ${contentLenght} Bytes <br>
  38 + <strong>Data/Hora:</strong> ${data}
  39 + </div>
  40 +
  41 +
  42 + <div class="tile --NOVALUE--">
  43 + <div class="outstanding-header">
  44 + <h2 class="outstanding-title">Recomendação Avaliada</h2>
38 </div> 45 </div>
  46 + <strong>${recomendacao}</strong>
  47 + </div>
39 48
40 - <div class="tile --NOVALUE--">  
41 - <div class="outstanding-header">  
42 - <h2 class="outstanding-title">Critério(s) Avaliado(s)</h2>  
43 - </div> 49 + <div class="tile --NOVALUE--">
  50 + <div class="outstanding-header">
  51 + <h2 class="outstanding-title">Critério(s) Avaliado(s)</h2>
  52 + </div>
44 53
45 - <table id="tabelaErros2">  
46 - <tbody>  
47 -  
48 - <tr>  
49 - <td colspan="2" class="topo2"> Teste(s) </td>  
50 - <td width="9%" class="topo2"> Quantidade</td>  
51 - <td width="56%" class="topo2"> Linha(s) de Código Fonte</td>  
52 - </tr>  
53 -  
54 - <c:forEach items="${detalhe.criterios}" var="criterio">  
55 - <tr>  
56 - <td class="celula" width="2%"> ${criterio.id} </td>  
57 - <td class="celula" width="60%" align="left">${criterio.descricao}</td>  
58 -  
59 - <td class="celula"> 54 + <table id="tabelaErros2">
  55 + <caption>Tabela de Erros</caption>
  56 + <thead>
  57 + <tr>
  58 + <th id="numero" class="topo2">Número</th>
  59 + <th id="teste" class="topo2">Teste(s)</th>
  60 + <th id="quantidade" class="topo2">Quantidade</th>
  61 + <th id="linhaCodigoFonte" class="topo2">Linha(s) de Código Fonte</th>
  62 + </tr>
  63 + </thead>
  64 +
  65 + <tbody>
  66 + <c:forEach items="${detalhe.criterios}" var="criterio">
  67 + <tr>
  68 + <td headers="numero" class="celula"> ${criterio.id} </td>
  69 + <td headers="teste" class="celula">${criterio.descricao}</td>
  70 + <td headers="quantidade" class="celula">
60 71
61 - <c:choose>  
62 - <c:when test="${rn == '1.1'}">  
63 - <c:choose>  
64 - <c:when test="${criterio.id == 1 }">  
65 - ${qtdOcorrenciasHtml}  
66 - </c:when>  
67 - <c:when test="${criterio.id == 2 }"> 72 + <c:choose>
  73 + <c:when test="${rn == '1.1'}">
  74 + <c:choose>
  75 + <c:when test="${criterio.id == 1 }">
  76 + ${qtdOcorrenciasHtml}
  77 + </c:when>
  78 + <c:when test="${criterio.id == 2 }">
68 ${qtdOcorrenciasCss} 79 ${qtdOcorrenciasCss}
69 - </c:when>  
70 - <c:otherwise>  
71 - ${criterio.numeroOcorrencias}  
72 - </c:otherwise>  
73 - </c:choose>  
74 - </c:when>  
75 - <c:otherwise>  
76 - ${criterio.numeroOcorrencias}  
77 - </c:otherwise> 80 + </c:when>
  81 + <c:otherwise>
  82 + ${criterio.numeroOcorrencias}
  83 + </c:otherwise>
78 </c:choose> 84 </c:choose>
79 -  
80 -  
81 - </td>  
82 - <td class="celula">  
83 -  
84 -  
85 -  
86 - <c:set var="aReq" value="${aReq}" />  
87 - <c:set var="req" value="${rn}.${criterio.id}" />  
88 -  
89 - <c:choose>  
90 - <c:when test="${fn:contains(aReq, req)}"> 85 + </c:when>
  86 + <c:otherwise>
  87 + ${criterio.numeroOcorrencias}
  88 + </c:otherwise>
  89 + </c:choose>
  90 + </td>
  91 +
  92 + <td headers="linhaCodigoFonte" class="celula">
  93 + <c:set var="aReq" value="${aReq}" />
  94 + <c:set var="req" value="${rn}.${criterio.id}" />
  95 + <c:choose>
  96 + <c:when test="${fn:contains(aReq, req)}">
91 <c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index"> 97 <c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index">
  98 + <c:if test="${fn:contains(aReqIsW3c, req)}">
  99 + <c:if test="${fn:contains(aReqIsCss, req)}">
  100 + <a href=" http://jigsaw.w3.org/css-validator/validator?uri=${url}" target="_blanck">
  101 + Servi&ccedil;o de valida&ccedil;&atilde;o de CSS do W3C (link para um novo sitio)
  102 + </a>
  103 + </c:if>
  104 +
  105 + <c:if test="${!fn:contains(aReqIsCss, req)}">
  106 + <a href="https://validator.w3.org/nu/?doc=http%3A%2F%2F${url}" target="_blanck">
  107 + Servi&ccedil;o de valida&ccedil;&atilde;o de HTML do W3C (link para um novo sitio)
  108 + </a>
  109 + </c:if>
  110 + </c:if>
92 111
93 -  
94 - <c:if test="${fn:contains(aReqIsW3c, req)}">  
95 -  
96 - <c:if test="${fn:contains(aReqIsCss, req)}">  
97 - <a href=" http://jigsaw.w3.org/css-validator/validator?uri=${url}" target="_blanck">  
98 - Servi&ccedil;o de valida&ccedil;&atilde;o de CSS do W3C  
99 - </a>  
100 - </c:if>  
101 -  
102 - <c:if test="${!fn:contains(aReqIsCss, req)}">  
103 - <a href="https://validator.w3.org/nu/?doc=http%3A%2F%2F${url}" target="_blanck">  
104 - Servi&ccedil;o de valida&ccedil;&atilde;o de HTML do W3C  
105 - </a>  
106 - </c:if>  
107 - </c:if>  
108 -  
109 - <c:if test="${!fn:contains(aReqIsW3c, req)}"> 112 + <c:if test="${!fn:contains(aReqIsW3c, req)}">
110 -- 113 --
111 - </c:if> 114 + </c:if>
112 115
113 </c:forEach> 116 </c:forEach>
114 </c:when> 117 </c:when>
115 118
116 119
117 <c:otherwise> 120 <c:otherwise>
118 - <c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index">  
119 -  
120 - <c:set var="lineOcc" value="${fn:split(linha, '.')}" />  
121 - <a href="#${criterio.id}.${linha}" class="sublinharLink">${lineOcc[0]}</a>  
122 - <c:if test="${index.index != fn:length(criterio.linhas) -1}"> - </c:if>  
123 -  
124 - </c:forEach> 121 + <ul>
  122 + <c:forEach items="${criterio.linhasColunas}" var="linha" varStatus="index">
  123 + <c:set var="lineOcc" value="${fn:split(linha, '.')}" />
  124 + <li id="linhaCodigoFonte_${criterio.id}.${linha}" style="display:inline"><a href="#${criterio.id}.${linha}" class="sublinharLink">${lineOcc[0]}</a>
  125 + <c:if test="${index.index != fn:length(criterio.linhas) -1}"> -
  126 + </c:if>
  127 + </li>
  128 + </c:forEach>
  129 + </ul>
125 </c:otherwise> 130 </c:otherwise>
126 </c:choose> 131 </c:choose>
127 132
128 - <c:if test="">  
129 -  
130 - </c:if>  
131 - 133 + <c:if test="">
132 134
  135 + </c:if>
  136 +
133 137
134 - </td> 138 + </td>
135 </tr> 139 </tr>
136 140
137 - </c:forEach> 141 + </c:forEach>
138 </tbody> 142 </tbody>
139 143
140 </table> 144 </table>
141 - </div>  
142 - 145 + </div>
143 146
144 147
145 - <div class="tile --NOVALUE--" align="left">  
146 148
147 - <div class="outstanding-header" align="left"> 149 + <div class="tile --NOVALUE--">
  150 + <div class="outstanding-header">
148 <h2 class="outstanding-title">Código Fonte</h2> 151 <h2 class="outstanding-title">Código Fonte</h2>
149 </div> 152 </div>
150 - <div id="codigo" align="left">  
151 - <%-- <c:set var="testeCrit" value="${listOcorrencia[0].criterio}"/>  
152 - <c:set var="count1" value="0"/> --%>  
153 -  
154 - <pre> 153 +
  154 + <div id="codigo">
  155 + <pre style="overflow: auto; width:100%; height:400px; border:1px solid #cccccc; display:block; white-space:nowrap">
155 <c:forEach items="${listOcorrencia}" var="ocorrencia" varStatus="index"> 156 <c:forEach items="${listOcorrencia}" var="ocorrencia" varStatus="index">
156 -  
157 - <c:set var="aReq" value="${aReq}" />  
158 - <c:set var="req" value="${rn}.${ocorrencia.criterio}" />  
159 -  
160 - <c:if test="${!fn:contains(aReq, req)}">  
161 - <c:choose>  
162 - <c:when test="${ocorrencia.cssEvaluation}">  
163 - <a name="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}" href="http://jigsaw.w3.org/css-validator/validator?uri=${ocorrencia.tag}" target="_blank">  
164 - ${ocorrencia.line} : Serviço de validação de CSS do W3C : ${ocorrencia.tag}  
165 - </a>  
166 - </c:when>  
167 - <c:when test="${ocorrencia.htmlEvaluation }">  
168 - <a name="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}" href="https://validator.w3.org/nu/?doc=${ocorrencia.tag}" target="_blank">  
169 - ${ocorrencia.line} : Serviço de validação de HTML do W3C : ${ocorrencia.tag}  
170 - </a>  
171 - </c:when>  
172 - <c:otherwise>  
173 - <a name="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}">  
174 - ${ocorrencia.line} : ${ocorrencia.tag}  
175 - </a> 157 + <c:set var="aReq" value="${aReq}"/>
  158 + <c:set var="req" value="${rn}.${ocorrencia.criterio}"/>
  159 + <c:if test="${!fn:contains(aReq, req)}">
  160 + <c:choose>
  161 + <c:when test="${ocorrencia.cssEvaluation}">
  162 + <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>
  163 + </c:when>
  164 + <c:when test="${ocorrencia.htmlEvaluation}">
  165 + <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>
  166 + </c:when>
  167 + <c:otherwise>
  168 + <a id="${ocorrencia.criterio}.${ocorrencia.posLineOccurrence}">${ocorrencia.line} : ${ocorrencia.tag}</a><br>
176 </c:otherwise> 169 </c:otherwise>
177 - </c:choose>  
178 -  
179 - </c:if>  
180 - </c:forEach> 170 + </c:choose>
  171 + </c:if>
  172 + </c:forEach>
181 </pre> 173 </pre>
182 </div> 174 </div>
183 -  
184 </div> 175 </div>
185 - <!-- Término Conteudo-->  
186 -  
187 - <%-- --%>  
188 -  
189 - 176 +
190 177
191 </jsp:body> 178 </jsp:body>
192 </t:baseLayout> 179 </t:baseLayout>
193 \ No newline at end of file 180 \ No newline at end of file