Correções na contribuição de PERRIS

Esse commit está contido em:
Paulo Henrique
2015-02-14 23:18:37 -03:00
commit 9ece8353f7
7 arquivos alterados com 140 adições e 326 exclusões
+4 -59
Ver Arquivo
@@ -9,65 +9,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Time Line - Aluno ${nomePerson} do Grupo ${nomeGroup}</title>
<style type="text/css">
input
{
cursor: pointer;
background: #ffffff;
color: #000000;
border: none;
}
input.class1
{
font-size:12px;
}
input.class2
{
font-size:15px;
}
input.class3
{
font-size:18px;
}
input.class4
{
font-size:21px;
}
input.class5
{
font-size:24px;
}
input.class6
{
font-size:27px;
}
input.class7
{
font-size:30px;
}
input.class8
{
font-size:33px;
}
input.class9
{
font-size:36px;
}
input.class10
{
font-size:39px;
}
div.cloud
{
border: 1px solid grey;
}
input.voltar
{
border: 1px solid grey;
border-radius: 0;
cursor: pointer;
}
</style>
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<script type="text/javascript">
function openJ(date)
{
+6 -14
Ver Arquivo
@@ -7,19 +7,11 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<head>
<meta http-equiv="Cache-Control" content="no-cache, no-store" />
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/displaytag.css" rel="stylesheet" type="text/css"></link>
<style type="text/css">
table
{
width: 400px;
}
input
{
border: 1px solid grey;
border-radius: 0;
cursor: pointer;
}
</style>
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<script>
function resize()
{
@@ -33,8 +25,8 @@
<div>
<input type="button" value="<< Voltar" onClick="history.back(-1);"/>
<p/>
<table border="1" cellpadding="5" cellspacing="0">
<tr bgcolor="#AAAAAA">
<table border="0" cellpadding="5" cellspacing="0" class="viewOneGroup">
<tr>
<th>Hora</th>
<th>Atividade</th>
</tr>
+6 -56
Ver Arquivo
@@ -9,64 +9,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Time Line - Grupo ${nomeGroup}</title>
<style type="text/css">
input
{
cursor: pointer;
background: #ffffff;
color: #000000;
border: none;
}
input.class1
{
font-size:12px;
}
input.class2
{
font-size:15px;
}
input.class3
{
font-size:18px;
}
input.class4
{
font-size:21px;
}
input.class5
{
font-size:24px;
}
input.class6
{
font-size:27px;
}
input.class7
{
font-size:30px;
}
input.class8
{
font-size:33px;
}
input.class9
{
font-size:36px;
}
input.class10
{
font-size:39px;
}
div.cloud
{
border: 1px solid grey;
}
</style>
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<script type="text/javascript">
function openJ(date)
{
var ctx = "${pageContext.request.contextPath}";
var groupId = <%= request.getAttribute("groupId")%>;
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/course.do?method=showViewGroupDayTimeline&groupId="+groupId+"&data="+date,'Grupo',
var external = window.open(ctx + "/course.do?method=showViewGroupDayTimeline&groupId="+groupId+"&data="+date,'Grupo',
'height=450,width=500,toolbar=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no ,modal=yes');
}
function resize()
@@ -76,12 +27,11 @@
</script>
</head>
<body onLoad="resize();">
<h2>Time Line - Grupo ${nomeGroup}</h2>
<h2>Timeline do grupo ${nomeGroup}</h2>
<div class="cloud">
<c:forEach var="tag" items="${timeline}" varStatus="status">
<input type="button" onClick="openJ('${tag.date}')" class="${tag.classe}" value="${tag.date}"/>
</c:forEach>
</div>
</body>
</html>
+99 -128
Ver Arquivo
@@ -13,79 +13,28 @@ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-->
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="/WEB-INF/struts-bean" prefix="bean" %>
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib uri="/WEB-INF/struts-bean" prefix="bean"%>
<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic"%>
<%@ taglib uri="/WEB-INF/struts-html" prefix="html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib prefix="display" uri="http://displaytag.sf.net/el" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="display" uri="http://displaytag.sf.net/el"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<logic:notPresent name="user">
<logic:redirect action="system.do?method=showViewWelcome"/>
<logic:notPresent name="user">
<logic:redirect action="system.do?method=showViewWelcome" />
</logic:notPresent>
<%@page import="br.ufpe.cin.amadeus.amadeus_web.syncronize.*"%>
<%@page import="antlr.collections.List"%><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<%@page import="antlr.collections.List"%><html
xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Cache-Control" content="no-cache, no-store" />
<jsp:include page="/jsp/conf/header.jsp" />
<meta http-equiv="Cache-Control" content="no-cache, no-store" />
<jsp:include page="/jsp/conf/header.jsp" />
<link href="themes/default/css/displaytag.css" rel="stylesheet" type="text/css"></link>
<style type="text/css">
input.button_add {
background-image: url(<%=request.getContextPath()%>/themes/default/imgs/icons/button_cancel-15.png); /* 16px x 16px */
background-color: transparent;
background-repeat: no-repeat;
border: none;
cursor: pointer; /* make the cursor like hovering over an <a> element */
height: 16px;
padding-left: 16px; /* make text start to the right of the image */
vertical-align: middle; /* align the text vertically centered */
}
table.visualizarGrupo
{
width: 450px;
}
table.criarGrupos
{
border-collapse:collapse;
border:1px solid grey;
}
th.criarGrupos
{
padding-bottom: 5px;
}
tr.criarGrupos, td.criarGrupos
{
border:none;
padding-left: 10px;
padding-right: 10px;
}
td.disable
{
border:none;
padding-left: 10px;
padding-right: 10px;
color:grey;
}
input.groups
{
border: none;
}
input.groupsName
{
width: 129px;
}
input.convidarRetirar
{
width: 70px;
text-align: center;
}
</style>
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<script>
function habilitarDesabilitarCriarGrupo()
{
@@ -178,7 +127,6 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
}
}
}
function montarLista()
{
@@ -226,34 +174,37 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
document.getElementById("formCreateGroup").action = stringAction;
}
}
var ctx = "${pageContext.request.contextPath}";
function openOneGroup(groupID)
{
var courseId = document.getElementById("inputCourseID").value;
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/course.do?method=showViewOneGroup&courseId="+courseId+"&groupID="+groupID,'Grupo',
var external = window.open(ctx + "/course.do?method=showViewOneGroup&courseId="+courseId+"&groupID="+groupID,'Grupo',
'height=400,width=480,toolbar=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no ,modal=yes');
}
function openTimeline(groupID)
{
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/course.do?method=showViewGroupTimeline&groupID="+groupID,'Grupo',
var external = window.open(ctx + "/course.do?method=showViewGroupTimeline&groupID="+groupID,'Grupo',
'height=480,width=600,toolbar=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no ,modal=yes');
}
function openRelatorio()
{
var courseId = document.getElementById("inputCourseID").value;
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/course.do?method=showViewRelatorioAtividade&courseId="+courseId,'Grupo',
var external = window.open(ctx + "/course.do?method=showViewRelatorioAtividade&courseId="+courseId,'Grupo',
'height=400,width=480,toolbar=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no ,modal=yes');
}
</script>
</head>
<body>
<input id="inputCourseFlag_habilitar_grupo" type="hidden" value="${course.flag_habilitar_grupo}"/>
<input id="inputCourseID" type="hidden" value="${course.id}"/>
<input id="inputCourseFlag_habilitar_grupo" type="hidden"
value="${course.flag_habilitar_grupo}" />
<input id="inputCourseID" type="hidden" value="${course.id}" />
<div id="pBody" class="pBody">
<div id="pHeader" class="pHeader">
<jsp:include page="/jsp/conf/login.jsp" />
<jsp:include page="/jsp/conf/login.jsp" />
</div>
<jsp:include page="/jsp/conf/logo.jsp" />
<div id="pTitle" class="pTitle">
@@ -261,8 +212,13 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
</div>
<div id="pBreadCrumbs" class="pBreadCrumbs">
<ul id="breadcrumb">
<li><html:link action="system.do?method=showViewMenu"><bean:message key="menu.name"/></html:link></li>
<li><html:link action="course.do?method=showViewCourse&courseId=${course.id}"><bean:write name="course" property="name"/></html:link></li>
<li><html:link action="system.do?method=showViewMenu">
<bean:message key="menu.name" />
</html:link></li>
<li><html:link
action="course.do?method=showViewCourse&courseId=${course.id}">
<bean:write name="course" property="name" />
</html:link></li>
<li>Grupos</li>
</ul>
</div>
@@ -271,30 +227,39 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<jsp:include page="/jsp/conf/courseMenu.jsp" />
</div>
<div id="pContent" class="pContent2">
<div id="comboBoxGroupsContent">
<c:if test="${canViewEnableGroups}">
<c:if test="${course.flag_habilitar_grupo}">
<li><a href="#" onclick="habilitarDesabilitarCriarGrupo();">Desabilitar Criar Grupos</a></li>
<div id="comboBoxGroupsContent" class="horizontal-menu">
<ul>
<c:if test="${canViewEnableGroups}">
<c:if test="${course.flag_habilitar_grupo}">
<li><a href="#" onclick="habilitarDesabilitarCriarGrupo();">Desabilitar
Criar Grupos</a></li>
</c:if>
<c:if test="${!course.flag_habilitar_grupo}">
<li><a href="#" onclick="habilitarDesabilitarCriarGrupo();">Habilitar
Criar Grupos</a></li>
</c:if>
</c:if>
<c:if test="${!course.flag_habilitar_grupo}">
<li><a href="#" onclick="habilitarDesabilitarCriarGrupo();">Habilitar Criar Grupos</a></li>
<c:if
test="${canCreateGroups && (canViewEnableGroups || course.flag_habilitar_grupo)}">
<li><html:link
action="course.do?method=showViewGroups&courseId=${course.id}&viewCreateGroup=1">Criar Grupo</html:link></li>
</c:if>
</c:if>
<c:if test="${canCreateGroups && (canViewEnableGroups || course.flag_habilitar_grupo)}">
<li><html:link action="course.do?method=showViewGroups&courseId=${course.id}&viewCreateGroup=1">Criar Grupo</html:link></li>
</c:if>
<li><html:link action="course.do?method=showViewGroups&courseId=${course.id}&viewCreateGroup=2">Visualizar Grupos</html:link></li>
<c:if test="${canViewEnableGroups}">
<li><a href="#" onclick="openRelatorio();">Relatório das Atividades</a></li>
<li><html:link
action="course.do?method=showViewGroups&courseId=${course.id}&viewCreateGroup=2">Visualizar Grupos</html:link></li>
<c:if test="${canViewEnableGroups}">
<li><a href="#" onclick="openRelatorio();">Relatório das
Atividades</a></li>
</c:if>
</ul>
</div>
<p/>
<p/>
<p />
<p />
<c:choose>
<c:when test="${viewCreateGroup == '2'}">
<div>
<table border="1" cellpadding="5" cellspacing="0" class="visualizarGrupo">
<tr bgcolor="#AAAAAA">
<table border="0" cellpadding="5" cellspacing="0"
class="visualizarGrupo">
<tr>
<th>Nome do Grupo</th>
<th>Integrantes</th>
<th>Timeline</th>
@@ -305,14 +270,11 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<td><a href="#" onclick="openOneGroup(${group.id})">${group.name}</a></td>
<td>${group.qtdMembros}</td>
<td><a href="#" onclick="openTimeline(${group.id})">Visualizar</a></td>
<td align="center">
<c:if test="${group.status}">
<img src = "/amadeuslms/themes/default/imgs/icons/green.png" />
</c:if>
<c:if test="${!group.status}">
<img src = "/amadeuslms/themes/default/imgs/icons/red.png" />
</c:if>
</td>
<td align="center"><c:if test="${group.status}">
<img src="themes/default/imgs/icons/green.png" />
</c:if> <c:if test="${!group.status}">
<img src="themes/default/imgs/icons/red.png" />
</c:if></td>
</tr>
</c:forEach>
</table>
@@ -320,68 +282,77 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
</c:when>
<c:when test="${canCreateGroups && viewCreateGroup == '1'}">
<div id="criarGrupos">
<form id="formCreateGroup" method="post" action="" onsubmit="return montarLista();">
<table border=1 class="criarGrupos">
<form id="formCreateGroup" method="post" action=""
onsubmit="return montarLista();">
<table border="0" class="criarGrupos">
<tr class="criarGrupos">
<td class="criarGrupos">
<td class="criarGrupos">
<div>
<b>Nome do Grupo:</b>
</div>
<div>
<input id="inputNameGroup" class="groupsName" type="text" name="nomeGrupo"/>
<div>
<input id="inputNameGroup" class="groupsName" type="text"
name="nomeGrupo" />
</div>
</td>
</tr>
<tr class="criarGrupos">
<td class="criarGrupos">
<table id="tabelaParticipantesGrupos" border=1 class="criarGrupos">
<table id="tabelaParticipantesGrupos" border=1
class="criarGrupos">
<tr class="criarGrupos">
<th class="criarGrupos" colspan="2">
Participantes do Grupo:
</th>
<th class="criarGrupos" colspan="2">Participantes do
Grupo:</th>
</tr>
<tr>
<c:if test="${!canViewEnableGroups}">
<td>
<input id='inputAlunoGrupo-1' class='groups' type='hidden' value='${user.person.id}'/>${user.person.name}
<td><input id='inputAlunoGrupo-1' class='groups'
type='hidden' value='${user.person.id}' />${user.person.name}
</td>
</c:if>
</tr>
</table>
</td>
<td class="criarGrupos">
<input class='convidarRetirar' type="button" value="Convidar" onclick="convidarPerson();"/>
<td class="criarGrupos"><input class='convidarRetirar'
type="button" value="&lt; Adicionar" onclick="convidarPerson();" />
</td>
<td class="criarGrupos">
<div>
<table border=1 class="criarGrupos">
<tr class="criarGrupos">
<th class="criarGrupos">
Participantes do Curso:
<input id="inputCountAlunosCourse" type="hidden" value="${fn:length(students)}"/>
<th class="criarGrupos">Participantes do Curso: <input
id="inputCountAlunosCourse" type="hidden"
value="${fn:length(students)}" />
</th>
</tr>
<c:forEach var="student" items="${students}" varStatus="status">
<tr>
<input id="inputhiddennamealuno${student.position}" type="hidden" value="${student.name}">
<c:if test="${student.haveGroup}">
<td id="tdAlunoCourse${student.position}" class="disable"><input id="inputAlunoCourse${student.position}" class="groups" type="checkbox" disabled="disabled" value="${student.id}"/>${student.name}*</td>
<c:forEach var="student" items="${students}"
varStatus="status">
<tr>
<input id="inputhiddennamealuno${student.position}"
type="hidden" value="${student.name}"> <c:if
test="${student.haveGroup}">
<td id="tdAlunoCourse${student.position}"
class="disable"><input
id="inputAlunoCourse${student.position}" class="groups"
type="checkbox" disabled="disabled"
value="${student.id}" />${student.name}*</td>
</c:if> <c:if test="${!student.haveGroup}">
<td class="criarGrupos"
id="tdAlunoCourse${student.position}"><input
id="inputAlunoCourse${student.position}" class="groups"
type="checkbox" value="${student.id}" />${student.name}</td>
</c:if>
<c:if test="${!student.haveGroup}">
<td class="criarGrupos" id="tdAlunoCourse${student.position}"><input id="inputAlunoCourse${student.position}" class="groups" type="checkbox" value="${student.id}"/>${student.name}</td>
</c:if>
</tr>
</tr>
</c:forEach>
</table>
</div>
</td>
</tr>
<tr class="criarGrupos">
<td class="criarGrupos">
<input type="submit" value="Concluir"/>
</td>
</tr>
<td class="criarGrupos"><input type="submit"
value="Concluir" /></td>
</tr>
</table>
</form>
</div>
+12 -57
Ver Arquivo
@@ -4,64 +4,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<style type="text/css">
input.button_add {
background-image: url(<%=request.getContextPath()%>/themes/default/imgs/icons/button_cancel-15.png); /* 16px x 16px */
background-color: transparent;
background-repeat: no-repeat;
border: none;
cursor: pointer; /* make the cursor like hovering over an <a> element */
height: 16px;
padding-left: 16px; /* make text start to the right of the image */
vertical-align: middle; /* align the text vertically centered */
}
table.visualizarGrupo
{
width: 450px;
}
table.criarGrupos
{
border-collapse:collapse;
border:1px solid grey;
}
th.criarGrupos
{
padding-bottom: 5px;
}
tr.criarGrupos, td.criarGrupos
{
border:none;
padding-left: 10px;
padding-right: 10px;
}
td.disable
{
border:none;
padding-left: 10px;
padding-right: 10px;
color:grey;
}
input.groups
{
border: none;
}
input.groupsName
{
width: 129px;
}
input.convidarRetirar
{
width: 70px;
text-align: center;
}
</style>
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Relatório de Atividades</title>
</head>
<body>
<h2>Relatório de Atividades</h2>
<table border="1" cellpadding="5" cellspacing="0" class="visualizarGrupo">
<tr bgcolor="#AAAAAA">
<table border="0" cellpadding="5" cellspacing="0" class="visualizarGrupo">
<tr>
<th>Nome do Grupo</th>
<c:forEach var="modulo" items="${modulos}" varStatus="status">
<th>${modulo}</th>
@@ -73,17 +24,21 @@
<c:forEach var="s" items="${relatorio.status}" varStatus="status">
<td align="center">
<c:if test="${s}">
<img src = "/amadeuslms/themes/default/imgs/icons/green.png" />
<img src = "themes/default/imgs/icons/green.png" />
</c:if>
<c:if test="${!s}">
<img src = "/amadeuslms/themes/default/imgs/icons/red.png" />
<img src = "themes/default/imgs/icons/red.png" />
</c:if>
</td>
</c:forEach>
</tr>
</c:forEach>
</table>
<a href="#" onclick="window.print();">Imprimir</a>
<a href="#" onclick="window.close();">Fechar</a>
<div class="horizontal-menu">
<ul>
<li><a href="#" onclick="window.print();">Imprimir</a></li>
<li><a href="#" onclick="window.close();">Fechar</a></li>
</ul>
</div>
</body>
</html>
+7 -10
Ver Arquivo
@@ -7,12 +7,9 @@
<head>
<meta http-equiv="Cache-Control" content="no-cache, no-store" />
<link href="themes/default/css/displaytag.css" rel="stylesheet" type="text/css"></link>
<style type="text/css">
table
{
width: 400px;
}
</style>
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<script>
function resize()
{
@@ -30,8 +27,8 @@
<body onload="resize();">
<input id="inputHiddenIdGroup" type="hidden" value="${group.id}"/>
<div>
<table border="1" cellpadding="5" cellspacing="0">
<tr bgcolor="#AAAAAA">
<table border="0" cellpadding="5" cellspacing="0" class="viewOneGroup">
<tr>
<th>Nome do Integrante</th>
<th>Função</th>
<th>Atividades</th>
@@ -46,10 +43,10 @@
</td>
<td align="center">
<c:if test="${aluno.status}">
<img src = "/amadeuslms/themes/default/imgs/icons/green.png" />
<img src = "themes/default/imgs/icons/green.png" />
</c:if>
<c:if test="${!aluno.status}">
<img src = "/amadeuslms/themes/default/imgs/icons/red.png" />
<img src = "themes/default/imgs/icons/red.png" />
</c:if>
</td>
</tr>
+6 -2
Ver Arquivo
@@ -8,6 +8,10 @@
<head>
<meta http-equiv="Cache-Control" content="no-cache, no-store" />
<link href="themes/default/css/displaytag.css" rel="stylesheet" type="text/css"></link>
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/groups.css" rel="stylesheet" type="text/css"></link>
<style type="text/css">
table
{
@@ -33,8 +37,8 @@
<div>
<input type="button" value="<< Voltar" onClick="history.back(-1);"/>
<p/>
<table border="1" cellpadding="5" cellspacing="0">
<tr bgcolor="#AAAAAA">
<table border="0" cellpadding="5" cellspacing="0" class="viewOnePerson">
<tr>
<th>Hora</th>
<th>Atividade</th>
</tr>