Download as
Browse Code »

Commit 985defee13222d3adecfbd2df4ca27ad1c26d8f8

Authored by magno.oliveira
1 parent 318fa6b7
Exists in master

Ajustes na avaliação e nas recomendações 

git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/e-selo@9773 c2178572-b5ca-4887-91d2-9e3a90c7d55b
Showing 3 changed files with 204 additions and 0 deletions   Show diff stats
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/parametroCalculo/form.jsp 0 → 100644
  Diff comments   View file @985defe
@@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
  4 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
  5 +
  6 +<tiles:insertTemplate template="/WEB-INF/jsp/template/template.jsp">
  7 + <tiles:putAttribute name="body">
  8 + <a href="<c:url value="/parametrosCalculo"/>"><strong><span class="glyphicon glyphicon-check"></span> Parametros de Cálculo</strong></a>
  9 +
  10 + <hr />
  11 +
  12 + <c:forEach var="error" items="${errors}">
  13 + <div class="alert alert-success alert-dismissable">
  14 + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
  15 + ${error.message}
  16 + </div>
  17 + </c:forEach>
  18 +
  19 + <c:if test="${not empty mensagem}">
  20 + <div class="alert alert-success alert-dismissable">
  21 + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
  22 + ${mensagem}
  23 + </div>
  24 + </c:if>
  25 +
  26 + <div class="row">
  27 + <div class="col-md-12">
  28 + <form name="parametroCalculoForm" class="form-horizontal" action="<c:url value="/parametrosCalculo"/>" method="post">
  29 + <fieldset>
  30 + <div class="form-group">
  31 + <label for="inputNome" class="col-lg-2 control-label">Vigência Inicial</label>
  32 + <div class="col-lg-10">
  33 + <input id="inputVigInicial" name="parametroCalculo.tsInicio" type="text" class="form-control" placeholder="Início" ${parametroCalculo.id != null ? 'disabled' : ''} value="<fmt:formatDate type="both" pattern="dd/MM/yyyy HH:mm:ss" value="${parametroCalculo.tsInicio}" />" >
  34 + </div>
  35 + </div>
  36 +
  37 + <div class="form-group">
  38 + <label for="inputNome" class="col-lg-2 control-label">Vigência Final</label>
  39 + <div class="col-lg-10">
  40 + <input id="inputVigFinal" name="parametroCalculo.tsFim" type="text" class="form-control" placeholder="Fim" value="<fmt:formatDate type="both" pattern="dd/MM/yyyy HH:mm:ss" value="${parametroCalculo.tsFim}" />" disabled >
  41 + </div>
  42 + </div>
  43 +
  44 + <input type="hidden" name="parametroCalculo.usuario.id" value="${parametroCalculo.usuario.id}" />
  45 +
  46 + <c:if test="${parametroCalculo.id != null}">
  47 + <div class="form-group">
  48 + <label for="inputNomeUsuario" class="col-lg-2 control-label">Usuário</label>
  49 + <div class="col-lg-10">
  50 + <input id="inputNomeUsuario" name="parametroCalculo.usuario.nome" type="text" class="form-control" value="${parametroCalculo.usuario.nome}" disabled />
  51 + </div>
  52 + </div>
  53 +
  54 + <c:if test="${parametroCalculo.tsFim == null}">
  55 + <div class="form-group">
  56 + <a href="<c:url value="/recomendacao/novo/${parametroCalculo.id}" />" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-plus"></span> Incluir Recomendação</a>
  57 + </div>
  58 + </c:if>
  59 +
  60 + <div class="form-group">
  61 + <table id="diretrizTable" class="table table-striped table-bordered table-hover table-condensed">
  62 + <thead>
  63 + <tr>
  64 + <th class="text-center" colspan="5">Recomendações</th>
  65 + </tr>
  66 + <tr>
  67 + <th>Número</th>
  68 + <th>Peso</th>
  69 + <th>Descrição</th>
  70 + <th>&nbsp;</th>
  71 + </tr>
  72 + </thead>
  73 + <tbody>
  74 + <c:forEach items="${recomendacaoList}" var="recomendacao">
  75 + <tr>
  76 + <td><a href="<c:url value="/recomendacao/form/${recomendacao.id}" />">${recomendacao.numeroRecomendacao}</a></td>
  77 + <td>${recomendacao.peso}</td>
  78 + <td>${recomendacao.descricao}</td>
  79 + <td width="30%">
  80 + <div class="btn-group">
  81 + <a href="<c:url value="/recomendacao/form/${recomendacao.id}" />" class="btn btn-default btn-sm">Consultar</a>
  82 + <c:if test="${parametroCalculo.tsFim == null}">
  83 + <a href="<c:url value="/recomendacao/delete/${recomendacao.id}" />" class="btn btn-default btn-sm btn-confirm" data-msg="Um novo Parâmetro de Cálculo será criado a partir do atual. Deseja realmente excluir a recomendação selecionada?">Excluir</a>
  84 + </c:if>
  85 + </div>
  86 + </td>
  87 + </tr>
  88 + </c:forEach>
  89 + </tbody>
  90 + </table>
  91 + </div>
  92 +
  93 + <input type="hidden" name="parametroCalculo.id" value="${parametroCalculo.id }" />
  94 + <input type="hidden" name="_method" value="put" />
  95 + </c:if>
  96 +
  97 + <div class="form-group">
  98 + <div class="col-lg-10 col-lg-offset-2">
  99 + <button class="btn btn-default btn-cancel">Cancelar</button>
  100 + <c:if test="${parametroCalculo.tsFim == null}">
  101 + <button type="submit" class="btn btn-primary">Salvar</button>
  102 + </c:if>
  103 + </div>
  104 + </div>
  105 + </fieldset>
  106 + </form>
  107 + </div>
  108 + </div> <!--/row-->
  109 + </tiles:putAttribute>
  110 +</tiles:insertTemplate>
0 \ No newline at end of file 111 \ No newline at end of file
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/parametroCalculo/index.jsp 0 → 100644
  Diff comments   View file @985defe
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +<jsp:include page="lista.jsp"></jsp:include>
0 \ No newline at end of file 2 \ No newline at end of file
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/parametroCalculo/lista.jsp 0 → 100644
  Diff comments   View file @985defe
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
  4 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
  5 +
  6 +<tiles:insertTemplate template="/WEB-INF/jsp/template/template.jsp">
  7 + <tiles:putAttribute name="body">
  8 + <a href="<c:url value="/parametrosCalculo" />"><strong><span class="glyphicon glyphicon-check"></span> Parametros de Cálculo</strong></a>
  9 +
  10 + <c:choose>
  11 + <c:when test="${ultimoParametro != null}">
  12 + <a href="<c:url value="/parametrosCalculo/atualizar/${ultimoParametro.id}" />" class="btn btn-default btn-confirm-modal pull-right"><span class="glyphicon glyphicon-plus"></span> Incluir Parametro de Cálculo</a>
  13 + </c:when>
  14 +
  15 + <c:otherwise>
  16 + <a href="<c:url value="/parametrosCalculo/form" />" class="btn btn-default pull-right"><span class="glyphicon glyphicon-plus"></span> Incluir Parametro de Avaliação</a>
  17 + </c:otherwise>
  18 + </c:choose>
  19 +
  20 + <br />
  21 +
  22 + <hr />
  23 + <c:forEach var="error" items="${errors}">
  24 + <div class="alert alert-success alert-dismissable">
  25 + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
  26 + ${error.message}
  27 + </div>
  28 + </c:forEach>
  29 + <c:if test="${not empty mensagem}">
  30 + <div class="alert alert-success alert-dismissable">
  31 + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
  32 + ${mensagem}
  33 + </div>
  34 + </c:if>
  35 +
  36 + <div class="row">
  37 + <div class="col-md-12">
  38 + <div class="table-responsive">
  39 + <table id="parametroCalculoTable" pagesize="10" class="table table-striped table-bordered table-hover table-condensed">
  40 + <thead>
  41 + <tr>
  42 + <th>Início</th>
  43 + <th>Fim</th>
  44 + <th>Descricao</th>
  45 + <th>Usuário</th>
  46 + <th>&nbsp;</th>
  47 + </tr>
  48 + </thead>
  49 + <tbody>
  50 + <c:forEach items="${parametroCalculoList}" var="parametroCalculo">
  51 + <tr>
  52 + <td><fmt:formatDate type="both" pattern="dd/MM/yyyy HH:mm:ss" value="${parametroCalculo.tsInicio}" /></td>
  53 + <td><fmt:formatDate type="both" pattern="dd/MM/yyyy HH:mm:ss" value="${parametroCalculo.tsFim}" /></td>
  54 + <td>${parametroCalculo.descricao}</td>
  55 + <td>${parametroCalculo.usuario.nome}</td>
  56 + <td>
  57 + <div class="btn-group">
  58 + <a href="<c:url value="/parametrosCalculo/atualizar/${parametroCalculo.id}" />" class="btn btn-default btn-sm">Consultar</a>
  59 + <c:if test="${parametroCalculo.tsFim == null}">
  60 + <a href="<c:url value="/parametrosCalculo/delete/${parametroCalculo.id}" />" class="btn btn-default btn-sm btn-confirm" data-msg="Deseja realmente excluir o Parametro de Avaliação selecionado?">Excluir</a>
  61 + </c:if>
  62 + </div>
  63 + </td>
  64 + </tr>
  65 + </c:forEach>
  66 + </tbody>
  67 + </table>
  68 + </div>
  69 + <jsp:include page="../template/paginacao.jsp"></jsp:include>
  70 + </div>
  71 + </div>
  72 +
  73 + <div class="modal fade" id="modalImport" tabindex="-1" role="dialog" aria-labelledby="modalImportLabel" aria-hidden="true">
  74 + <div class="modal-dialog modal-sm">
  75 + <div class="modal-content">
  76 + <div class="modal-body">
  77 + Deseja importar as diretrizes e conformidades do Parâmetro de Avaliação ativo?
  78 + </div>
  79 + <div class="modal-footer">
  80 + <button id="novo-parametro" type="button" class="btn btn-default">Não</button>
  81 + <button id="importar-parametro" type="button" class="btn btn-primary">Sim</button>
  82 + </div>
  83 + </div>
  84 + </div>
  85 + </div>
  86 +
  87 + <script>
  88 + var urlNovoParametro = "<c:url value="/parametrosCalculo/novo" />";
  89 + var urlImportarParametro = "<c:url value="/parametrosCalculo/importar" />";
  90 + </script>
  91 +
  92 + </tiles:putAttribute>
  93 +</tiles:insertTemplate>
0 \ No newline at end of file 94 \ No newline at end of file