wellton/AmadeusLMS
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Merge com o projeto de Perris

Ver Código-Fonte
Esse commit está contido em:
Paulo Henrique
2014-11-19 20:38:29 -03:00
pai 8eed3e376a
commit 131acc5f5b
57 arquivos alterados com 3862 adições e 228 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
WebContent/WEB-INF/struts/struts-config-course.xml
+28
Ver Arquivo
@@ -101,6 +101,7 @@
<form-property name="keywords" type="java.lang.String" />
</form-bean>
<<<<<<< HEAD
<form-bean name="formSocialInteractionMonitoring"
type="org.apache.struts.validator.DynaValidatorForm">
@@ -132,6 +133,13 @@
<form-bean name="formSocialInteractionMonitoringReports"
type="org.apache.struts.validator.DynaValidatorForm">
=======
<form-bean name="formCriarGrupo" type="org.apache.struts.action.DynaActionForm">
<form-property name="courseId" type="java.lang.Integer"/>
<form-property name="nomeGrupo" type="java.lang.String"/>
<form-property name="listaAlunos" type="java.lang.String"/>
<form-property name="Concluir" type="java.lang.String"/>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
</form-bean>
</form-beans>
@@ -161,6 +169,17 @@
<forward name="fShowViewCourseEvaluations" path="/jsp/course/viewCourseEvaluations.jsp"/>
<forward name="fShowViewSendMail" path="/jsp/course/viewSendMail.jsp"/>
<forward name="fShowViewGraphic" path="/jsp/course/viewGraphic.jsp"/>
<<<<<<< HEAD
=======
<forward name="fShowViewGroups" path="/jsp/course/viewGroups.jsp"/>
<forward name="fShowGroupDayTimeline" path="/jsp/course/viewGroupDayTimeline.jsp"/>
<forward name="fShowPersonDayTimeline" path="/jsp/course/viewPersonDayTimeline.jsp"/>
<forward name="fShowViewGroupTimeline" path="/jsp/course/viewGroupTimeline.jsp"/>
<forward name="fShowViewPersonTimeline" path="/jsp/course/ViewPersonTimeline.jsp"/>
<forward name="fShowViewOneGroup" path="/jsp/course/viewOneGroup.jsp"/>
<forward name="fShowViewGroupsRelatorio" path="/jsp/course/viewGroupsRelatorio.jsp"/>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
</global-forwards>
<action-mappings>
@@ -230,6 +249,7 @@
<action name="formEditCourse" input="/course.do?method=showViewEditCourse"
path="/editCourse" parameter="editCourse" scope="request"
type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
<<<<<<< HEAD
</action>
<action name="formSocialInteractionMonitoring" input="/course.do?method=showViewSocialInteractionMonitoring"
@@ -241,6 +261,14 @@
path="/socialInteractionMonitoringReports" parameter="socialInteractionMonitoringReports" scope="request"
type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
</action>
=======
</action>
<action name="formCriarGrupo" input="/course.do?method=showViewCreateGroup"
path="/course.do?method=showViewCreateGroup" parameter="criarGrupo" scope="request"
type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
</action>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<action path="/fViewDeleteConfirmation"
parameter="/jsp/course/viewCourseDeleteConfirmation.jsp"
WebContent/WEB-INF/web.xml
+4
Ver Arquivo
@@ -50,9 +50,13 @@
/WEB-INF/struts/struts-config-mobile.xml,
/WEB-INF/struts/struts-config-openid.xml,
/WEB-INF/struts/struts-config-settings.xml,
<<<<<<< HEAD
/WEB-INF/struts/struts-config-log.xml,
/WEB-INF/struts/struts-config-messenger.xml,
/WEB-INF/struts/struts-config-twittertool.xml</param-value>
=======
/WEB-INF/struts/struts-config-log.xml</param-value>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
WebContent/js/managementActivity.js
+50
Ver Arquivo
@@ -202,6 +202,17 @@ function showScoreGameGrupo(type,idMMJogos){
UtilDWR.getInclude('/changeOrderGame.do?method=changeOrderGame&type='+type+'&idMMJogos='+idMMJogos,
function(data) {
dwr.util.setValue('percepcao'+idMMJogos, data, { escapeHtml:false });
<<<<<<< HEAD
}
);
}
function showScoreGameIndividual(type,idMMJogos,idUser){
UtilDWR.getInclude('/changeOrderGame.do?method=changeOrderGame&type='+type+'&idMMJogos='+idMMJogos+'&idUser='+idUser,
function(data) {
dwr.util.setValue('percepcao'+idMMJogos, data, { escapeHtml:false });
=======
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
}
);
}
@@ -254,6 +265,45 @@ function log(idGame, numFases, tempo, pontuacao, meta)
}
function modalGameWin(gameId) {
window.open('playGameActivity.do?method=showPlayGame&gameId='+gameId,'Game',
'height=800,width=600,toolbar=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,modal=yes,directories=no');
}
function openGameExternal(gameUrl){
var external = window.open(gameUrl,'Game',
'height=800,width=600,toolbar=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no ,modal=yes');
//resize para a tela não ficar preta
external.onload = resizeExternal(external);
}
function resizeExternal(win)
{
win.resizeTo(10,10);
win.resizeTo(811,611);
}
function modalVisualizacaoWin(gameId) {
if (window.showModalDialog) {
window.showModalDialog('graphicGameActivity.do?method=showGraphicGame&gameId='+gameId+'&graphic=sel',"Game Graphic",
"dialogWidth:800px;dialogHeight:600px");
} else {
window.open('graphicGameActivity.do?method=showGraphicGame&gameId='+gameId+'&graphic=sel','Game Graphic',
'height=800,width=600,toolbar=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no ,modal=yes');
}
}
function log(idGame, numFases, tempo, pontuacao, meta)
{
window.open('saveLog.do?method=saveLog&jogo='+idGame+'&fases='+numFases+'&tempo='+tempo+'&pontuacao='+pontuacao+'&metaAlternativa='+meta,'Game Graphic',
'height=100,width=100,toolbar=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no');
}
// ***FIM - ATIVIDADE JOGOS ***
//*** INICIO - ATIVIDADE LEARNING OBJECTS ***
WebContent/jsp/conf/courseMenu.jsp
+9
Ver Arquivo
@@ -33,6 +33,15 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<c:if test="${selectedPosition == 4}"><li><b>Avaliações do Curso</b></li></c:if>
<c:if test="${selectedPosition != 4}"><li><html:link action="course.do?method=showViewCourseEvaluations&courseId=${course.id}">Avaliações do Curso</html:link></li></c:if>
</c:if>
<<<<<<< HEAD
=======
<c:if test="${canViewGroups}">
<c:if test="${selectedPosition == 6}"><li><b>Grupos</b></li></c:if>
<c:if test="${selectedPosition != 6}"><li><html:link action="course.do?method=showViewGroups&courseId=${course.id}">Grupos</html:link></li></c:if>
</c:if>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<c:if test="${canViewGraphic}">
<c:if test="${selectedPosition == 5}"><li><b>Módulo de Visualização</b></li></c:if>
<c:if test="${selectedPosition != 5}"><li><html:link action="course.do?method=showViewGraphic&courseId=${course.id}&graphic=sel&moduleSel=-1&idAluno=-1&idGame=-1">Módulo de Visualização</html:link></li></c:if>
WebContent/jsp/conf/header.jsp
+13
Ver Arquivo
@@ -20,12 +20,16 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<<<<<<< HEAD
<link href="themes/default/css/messenger.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/twittertool.css" rel="stylesheet" type="text/css" />
=======
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<link href="themes/default/css/content_management.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/jqueryui/smoothness/jquery-ui-1.7.1.custom.css" rel="stylesheet" type="text/css" />
<link href="themes/default/imgs/favicon.ico" rel="shortcut icon" />
<<<<<<< HEAD
<!-- <link href="themes/default/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>
<link href="themes/default/css/bootstrap.min.css" rel="stylesheet" type="text/css"/> -->
<link href="themes/default/css/nyroModal.css" rel="stylesheet" type="text/css"/>
@@ -48,6 +52,15 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<script type="text/javascript" src="js/amadeus.js"></script>
<script type="text/javascript" src="js/messenger.js"></script>
<script type="text/javascript" src="js/twittertool.js"></script>
=======
<script type='text/javascript' src='dwr/interface/UtilDWR.js'></script>
<script type='text/javascript' src='dwr/engine.js'></script>
<script type='text/javascript' src='dwr/util.js'></script>
<script type="text/javascript" src="js/jqueryui/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="js/jqueryui/jquery-ui-1.7.1.custom.min.js"></script>
<script type="text/javascript" src="js/openid.js"></script>
<script type="text/javascript" src="js/amadeus.js"></script>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<script type="text/javascript">
WebContent/jsp/course/ViewPersonTimeline.jsp
+97
Ver Arquivo
@@ -0,0 +1,97 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<%@ taglib uri="/WEB-INF/struts-html" prefix="html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<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>
<script type="text/javascript">
function openJ(date)
{
var groupId = <%= request.getAttribute("groupID")%>;
var personID = <%= request.getAttribute("personID")%>;
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/course.do?method=showViewPersonDayTimeline&groupID="+groupId+"&personID="+personID+"&data="+date,'Grupo',
'height=450,width=500,toolbar=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no ,modal=yes');
}
function resize()
{
window.resizeTo(480,600);
}
</script>
</head>
<body onLoad="resize();">
<h2>Time Line - Aluno ${nomePerson} 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>
<div>
<p/>
<input class="voltar" type="button" value="<< Voltar" onClick="history.back(-1);"/>
</div>
</body>
</html>
WebContent/jsp/course/viewGraphic.jsp
+3
Ver Arquivo
@@ -100,11 +100,14 @@ function selectGame()
<div id="pLeftMenu" class="pLeftMenu">
<c:set var="selectedPosition" value="5" scope="request" />
<jsp:include page="/jsp/conf/courseMenu.jsp" />
<<<<<<< HEAD
<!-- Added By Nailson Cunha -->
<div id="twitter-container">
<jsp:include page="/jsp/twittertool/userTwitter.jsp" />
</div>
=======
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
</div>
<div id="pContent" class="pContent2">
WebContent/jsp/course/viewGroupDayTimeline.jsp
+63
Ver Arquivo
@@ -0,0 +1,63 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="UTF-8"%>
<%@page import="antlr.collections.List"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<%@ 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/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>
<script>
function resize()
{
window.resizeTo(450,500);
}
</script>
<title>Atividades Grupo ${nomeGrupo} - ${data}</title>
</head>
<body onload="resize();">
<h2>Atividades Grupo ${nomeGrupo} - ${data}</h2>
<div>
<input type="button" value="<< Voltar" onClick="history.back(-1);"/>
<p/>
<table border="1" cellpadding="5" cellspacing="0">
<tr bgcolor="#AAAAAA">
<th>Hora</th>
<th>Atividade</th>
</tr>
<c:forEach var="log" items="${logs}" varStatus="status">
<tr>
<td><fmt:formatDate value="${log.date}" pattern="HH:mm:ss"/></td>
<td>
<c:if test="${log.codigo == 1}">Login</c:if>
<c:if test="${log.codigo == 2}">Logout</c:if>
<c:if test="${log.codigo == 3}">Nova Postagem no Fórum</c:if>
<c:if test="${log.codigo == 4}">Visualização do Fórum</c:if>
<c:if test="${log.codigo == 5}">Visualização de Material - ${log.materialName}</c:if>
<c:if test="${log.codigo == 6}">Respondeu Enquete</c:if>
<c:if test="${log.codigo == 7}">Abriu Jogo</c:if>
<c:if test="${log.codigo == 8}">Jogou</c:if>
<c:if test="${log.codigo == 9}">Entregou Material</c:if>
<c:if test="${log.codigo == 10}">Visualização de Video</c:if>
</td>
</tr>
</c:forEach>
</table>
<p/>
<input type="button" value="<< Voltar" onClick="history.back(-1);"/>
</div>
</body>
</html>
WebContent/jsp/course/viewGroupTimeline.jsp
+87
Ver Arquivo
@@ -0,0 +1,87 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<%@ taglib uri="/WEB-INF/struts-html" prefix="html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<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>
<script type="text/javascript">
function openJ(date)
{
var groupId = <%= request.getAttribute("groupId")%>;
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/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()
{
window.resizeTo(480,600);
}
</script>
</head>
<body onLoad="resize();">
<h2>Time Line - 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>
WebContent/jsp/course/viewGroups.jsp
+394
Ver Arquivo
@@ -0,0 +1,394 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
Copyright 2008, 2009 UFPE - Universidade Federal de Pernambuco
Este arquivo é parte do programa Amadeus Sistema de Gestão de Aprendizagem, ou simplesmente Amadeus LMS
O Amadeus LMS é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como
publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença.
Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes.
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" %>
<%@ 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" %>
<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">
<head>
<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>
<script>
function habilitarDesabilitarCriarGrupo()
{
var flag_habilitar_grupo = document.getElementById("inputCourseFlag_habilitar_grupo").value;
var habilitarDesabilitar = false;
if(flag_habilitar_grupo == "true")
{
var desabilitarWindow=confirm("Desabilitar Criação de Grupos?");
if (desabilitarWindow==true)
{
habilitarDesabilitar = true;
}
}
else
{
var habilitarWindow=confirm("Habilitar Criação de Grupos?");
if (habilitarWindow==true)
{
habilitarDesabilitar = true;
}
}
if(habilitarDesabilitar)
{
var courseId = document.getElementById("inputCourseID").value;
window.location = "http://"+'localhost:8080/amadeuslms' + "/course.do?method=habilitarDesabilitarCriarGrupos&courseId=" + courseId;
}
}
function convidarPerson()
{
var countAlunos = document.getElementById("inputCountAlunosCourse").value;
var i;
for (i=0; i<countAlunos; i++)
{
checkTemp = document.getElementById("inputAlunoCourse"+i);
if(checkTemp.checked && !checkTemp.disabled)
{
var table = document.getElementById("tabelaParticipantesGrupos");
var rowCount = table.rows.length;
var row = table.insertRow(rowCount);
var aluno = checkTemp.value;
var nomeAluno = document.getElementById("inputhiddennamealuno"+i).value;
var alunoRow = row.insertCell(0);
alunoRow.innerHTML = "<input id='inputButtonExcluirAlunoGrupo"+i+"' class='button_add' type='button' name='"+i+"'/><input id='inputAlunoGrupo"+i+"' type='hidden' value='"+aluno+"'/>"+nomeAluno;
alunoRow.className = "criarGrupos";
checkTemp.disabled = "disabled";
document.getElementById("tdAlunoCourse"+i).style.color='grey';
var btnExcluir = document.getElementById("inputButtonExcluirAlunoGrupo"+i);
btnExcluir.onclick = function(e)
{
var targ;
if (!e)
{
var e = window.event;
}
if (e.target)
{
targ = e.target;
}
var tableIn = document.getElementById("tabelaParticipantesGrupos");
var rowCountIn = tableIn.rows.length;
for (var j=2; j<rowCountIn; j++)
{
var rowIn = tableIn.rows[j];
var input = rowIn.cells[0].childNodes[0];
if(input != null && input.id == targ.id)
{
tableIn.deleteRow(j);
var checkCurso = document.getElementById("inputAlunoCourse"+targ.name);
checkCurso.disabled = "";
checkCurso.checked = "";
document.getElementById("tdAlunoCourse"+targ.name).style.color='black';
return false;
}
}
};
}
}
}
function montarLista()
{
var nameGroup = document.getElementById("inputNameGroup").value;
if(nameGroup == null || nameGroup == "" )
{
alert('Preencha o nome do grupo.');
return false;
}
var confirmacaoCriarGrupo=confirm("Deseja concluir a criação do novo grupo?");
if (confirmacaoCriarGrupo!=true)
{
return false;
}
else
{
var countAlunos = document.getElementById("inputCountAlunosCourse").value;
var courseId = document.getElementById("inputCourseID").value;
var stringAction = "course.do?method=showViewCreateGroup&courseId="+courseId+"&nomeCourse="+nameGroup;
var indice = 0;
var entrou = false;
for (var i=-1; i<countAlunos; i++)
{
var aluno = document.getElementById("inputAlunoGrupo"+i);
if(aluno != null)
{
stringAction += "&alunoId"+indice+"="+aluno.value;
indice++;
entrou = true;
}
}
stringAction += "&qtdAlunos="+indice;
if(!entrou)
{
alert('Convide algum aluno do curso para o grupo.')
return false;
}
document.getElementById("formCreateGroup").action = stringAction;
}
}
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',
'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',
'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',
'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}"/>
<div id="pBody" class="pBody">
<div id="pHeader" class="pHeader">
<jsp:include page="/jsp/conf/login.jsp" />
</div>
<jsp:include page="/jsp/conf/logo.jsp" />
<div id="pTitle" class="pTitle">
<h2>Grupos</h2>
</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>Grupos</li>
</ul>
</div>
<div id="pLeftMenu" class="pLeftMenu">
<c:set var="selectedPosition" value="6" scope="request" />
<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>
</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="${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>
</c:if>
</div>
<p/>
<p/>
<c:choose>
<c:when test="${viewCreateGroup == '2'}">
<div>
<table border="1" cellpadding="5" cellspacing="0" class="visualizarGrupo">
<tr bgcolor="#AAAAAA">
<th>Nome do Grupo</th>
<th>Integrantes</th>
<th>Timeline</th>
<th>Atividades</th>
</tr>
<c:forEach var="group" items="${groups}" varStatus="status">
<tr>
<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>
</tr>
</c:forEach>
</table>
</div>
</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">
<tr class="criarGrupos">
<td class="criarGrupos">
<div>
<b>Nome do Grupo:</b>
</div>
<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">
<tr class="criarGrupos">
<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>
</c:if>
</tr>
</table>
</td>
<td class="criarGrupos">
<input class='convidarRetirar' type="button" value="Convidar" 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>
</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: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>
</c:forEach>
</table>
</div>
</td>
</tr>
<tr class="criarGrupos">
<td class="criarGrupos">
<input type="submit" value="Concluir"/>
</td>
</tr>
</table>
</form>
</div>
</c:when>
</c:choose>
</div>
<jsp:include page="/jsp/conf/footer.jsp" />
</div>
</body>
</html>
WebContent/jsp/course/viewGroupsRelatorio.jsp
+89
Ver Arquivo
@@ -0,0 +1,89 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<!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>
<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">
<th>Nome do Grupo</th>
<c:forEach var="modulo" items="${modulos}" varStatus="status">
<th>${modulo}</th>
</c:forEach>
</tr>
<c:forEach var="relatorio" items="${relatorios}" varStatus="status">
<tr>
<td>${relatorio.nome}</td>
<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" />
</c:if>
<c:if test="${!s}">
<img src = "/amadeuslms/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>
</body>
</html>
WebContent/jsp/course/viewOneGroup.jsp
+60
Ver Arquivo
@@ -0,0 +1,60 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="UTF-8"%>
<%@page import="antlr.collections.List"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<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>
<script>
function resize()
{
window.resizeTo(440,480);
}
function openPersonTimeline(personID)
{
var groupID = document.getElementById("inputHiddenIdGroup").value;
var external = window.open("http://"+'localhost:8080/amadeuslms' + "/course.do?method=showViewPersonTimeline&groupID="+groupID+"&personID="+personID,'Grupo',
'height=480,width=600,toolbar=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no ,modal=yes');
}
</script>
<title>Grupo ${nomeGrupo}</title>
</head>
<body onload="resize();">
<input id="inputHiddenIdGroup" type="hidden" value="${group.id}"/>
<div>
<table border="1" cellpadding="5" cellspacing="0">
<tr bgcolor="#AAAAAA">
<th>Nome do Integrante</th>
<th>Função</th>
<th>Atividades</th>
</tr>
<c:forEach var="aluno" items="${alunos}" varStatus="status">
<tr>
<td><a href="#" onclick="openPersonTimeline(${aluno.id});">${aluno.name}</a></td>
<td>
<c:if test="${aluno.papel == 0}">Fundador/Moderador</c:if>
<c:if test="${aluno.papel == 1}">Moderador</c:if>
<c:if test="${aluno.papel == 2}">Membro</c:if>
</td>
<td align="center">
<c:if test="${aluno.status}">
<img src = "/amadeuslms/themes/default/imgs/icons/green.png" />
</c:if>
<c:if test="${!aluno.status}">
<img src = "/amadeuslms/themes/default/imgs/icons/red.png" />
</c:if>
</td>
</tr>
</c:forEach>
</table>
</div>
</body>
</html>
WebContent/jsp/course/viewPersonDayTimeline.jsp
+63
Ver Arquivo
@@ -0,0 +1,63 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="UTF-8"%>
<%@page import="antlr.collections.List"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<%@ 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/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>
<script>
function resize()
{
window.resizeTo(450,500);
}
</script>
<title>Atividades de ${nomePessoa} do Grupo ${nomeGrupo} - ${data}</title>
</head>
<body onload="resize();">
<h2>Atividades de ${nomePessoa} do Grupo ${nomeGrupo} - ${data}</h2>
<div>
<input type="button" value="<< Voltar" onClick="history.back(-1);"/>
<p/>
<table border="1" cellpadding="5" cellspacing="0">
<tr bgcolor="#AAAAAA">
<th>Hora</th>
<th>Atividade</th>
</tr>
<c:forEach var="log" items="${logs}" varStatus="status">
<tr>
<td><fmt:formatDate value="${log.date}" pattern="HH:mm:ss"/></td>
<td>
<c:if test="${log.codigo == 1}">Login</c:if>
<c:if test="${log.codigo == 2}">Logout</c:if>
<c:if test="${log.codigo == 3}">Nova Postagem no Fórum</c:if>
<c:if test="${log.codigo == 4}">Visualização do Fórum</c:if>
<c:if test="${log.codigo == 5}">Visualização de Material - ${log.materialName}</c:if>
<c:if test="${log.codigo == 6}">Respondeu Enquete</c:if>
<c:if test="${log.codigo == 7}">Abriu Jogo</c:if>
<c:if test="${log.codigo == 8}">Jogou</c:if>
<c:if test="${log.codigo == 9}">Entregou Material</c:if>
<c:if test="${log.codigo == 10}">Visualização de Video</c:if>
</td>
</tr>
</c:forEach>
</table>
<p/>
<input type="button" value="<< Voltar" onClick="history.back(-1);"/>
</div>
</body>
</html>
WebContent/mobile.html
+2 -2
Ver Arquivo
@@ -15,12 +15,12 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<head>
<title>Amadeus Mobile</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<META HTTP-EQUIV="Refresh" CONTENT="2; URL=/amadeuslms/mobile/login/loginHtml.jsp">
<META HTTP-EQUIV="Refresh" CONTENT="2; URL=/amadeusweb/mobile/login/loginHtml.jsp">
</head>
<body>
<div align="center">
<img src="/amadeuslms/mobile/imgs/amadeus_mobile.jpg" width="120px" height="150px" alt="logo">
<img src="/amadeusweb/mobile/imgs/amadeus_mobile.jpg" width="120px" height="150px" alt="logo">
<h2>Você está sendo direcionado para a página do Amadeus Mobile.</h2>
</div>
</body>
WebContent/themes/default/imgs/icons/green.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado

Depois

Largura:  |  Altura:  |  Tamanho: 598 B

WebContent/themes/default/imgs/icons/red.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado

Depois

Largura:  |  Altura:  |  Tamanho: 568 B