Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 619 → Rev 630

/impl/conf/app.properties
97,6 → 97,12
estgp.proxy.host=
estgp.proxy.port=
 
server.conteudos.start.path=
server.conteudos=http://localhost:9090/conteudos
conteudos.encoding=UTF-8
conteudos.proxy.host=
conteudos.proxy.port=
 
proxy.extensions=html htm php asp aspx dhtml jsp py
 
################################################
/impl/conf/template/email/message_pt.txt
5,9 → 5,9
<title>{1}</title>
</head>
<body>
<h3>Caros {4}</h3>
<!--<h3>Caros {4}</h3>-->
 
<p>Um nova mensagem foi enviada por {0}:</p>
<!--<p>Um nova mensagem foi enviada por {0}:</p>-->
 
{1}
 
20,4 → 20,4
<p>Instituto Politécnico de Portalegre</p>
<p><a href="http://www.estgp.pt">http://www.estgp.pt</a></p>
</body>
</html>
</html>
/impl/conf/directories/futureStudent.xml
6,7 → 6,7
<group>2</group>
</groupsDeclaration>
<node label="A ESTG" id="ESTG" group="1">
<leaf absolute="false" url="/public/portal/estgMensagemDirector.html" proxy="estgp" id="estgDirector" label="Mensagem do Director"></leaf>
<leaf absolute="false" url="/pagina.php?nome_id=MensagemDirector" proxy="conteudos" id="estgDirector" label="Mensagem do Director"></leaf>
<leaf absolute="false" url="/public/portal/estgComoChegarEstg.html" proxy="estgp" id="estgChegar" label="Como Chegar à ESTG"></leaf>
<leaf absolute="false" url="/public/portal/estgPassado.html" proxy="estgp" id="estgPassado" label="O nosso Passado"></leaf>
<leaf absolute="false" url="/public/portal/estgPresente.html" proxy="estgp" id="estgPresente" label="O Presente"></leaf>
/impl/src/java/pt/estgp/estgweb/utils/Email.java
72,6 → 72,11
return recipients;
}
 
public void setRecipients(List<String> recipients)
{
this.recipients = recipients;
}
 
public String getFrom()
{
return from;
/impl/src/java/pt/estgp/estgweb/services/email/EMAILJob.java
1,18 → 1,15
package pt.estgp.estgweb.services.email;
 
import org.apache.log4j.Logger;
import pt.estgp.estgweb.services.expceptions.ServiceException;
import pt.estgp.estgweb.services.jobs.JobHandler;
import pt.estgp.estgweb.services.sms.SMSJob;
import pt.estgp.estgweb.services.sms.SmsService;
import pt.estgp.estgweb.services.expceptions.ServiceException;
import pt.estgp.estgweb.domain.User;
import pt.estgp.estgweb.utils.Email;
 
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
 
import org.apache.log4j.Logger;
import jomm.utils.TemplateUtils;
 
/**
* @author Jorge Machado
* @date 11/Jul/2008
38,7 → 35,36
{
try
{
new SendEmailService().sendEmail(email);
List<String> recipientsOriginal = new ArrayList<String>();
List<String> recipients = new ArrayList<String>();
recipients.addAll(email.getRecipients());
recipientsOriginal.addAll(email.getRecipients());
while(recipients.size() > 0)
{
List<String> recipientsToSend = new ArrayList<String>();
 
int contador = 0;
Iterator<String> iter = recipients.iterator();
while(iter.hasNext() && contador < 20)
{
recipientsToSend.add(iter.next());
iter.remove();
contador++;
}
email.setRecipients(recipientsToSend);
new SendEmailService().sendEmail(email);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
logger.error(e,e);
}
}
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
logger.error(e,e);
}
email.setRecipients(recipientsOriginal);
}
catch (ServiceException e)
{
/impl/src/java/pt/estgp/estgweb/services/jobs/JobDeamon.java
33,6 → 33,7
JobRunner jobRunner = new JobRunner((JobHandler) j.getJobHandler());
jobRunner.run();
j.setExecuted(true);
Thread.sleep(2000);
}
AbstractDao.getCurrentSession().getTransaction().commit();
Thread.sleep(Globals.JOB_DEAMON_SLEEP_SECONDS*1000);
/impl/src/java/pt/estgp/estgweb/services/announcements/CreateAnnouncementService.java
1,29 → 1,27
package pt.estgp.estgweb.services.announcements;
 
import org.apache.log4j.Logger;
import org.apache.struts.util.MessageResources;
import pt.estgp.estgweb.Globals;
import pt.estgp.estgweb.services.sms.SMSJob;
import pt.estgp.estgweb.services.jobs.JobScheduleService;
import pt.estgp.estgweb.services.email.EMAILJob;
import pt.estgp.estgweb.services.email.SendEmailService;
import pt.estgp.estgweb.services.data.ImageManager;
import pt.estgp.estgweb.domain.*;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.domain.enums.LangEnum;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.domain.views.AnnouncementView;
import pt.estgp.estgweb.domain.views.CourseView;
import pt.estgp.estgweb.domain.views.CourseUnitView;
import pt.estgp.estgweb.domain.views.UserView;
import pt.estgp.estgweb.services.data.ImageManager;
import pt.estgp.estgweb.services.email.EMAILJob;
import pt.estgp.estgweb.services.email.SendEmailService;
import pt.estgp.estgweb.services.jobs.JobScheduleService;
import pt.estgp.estgweb.services.sms.SMSJob;
import pt.estgp.estgweb.utils.ConfigProperties;
import pt.estgp.estgweb.utils.Email;
import pt.estgp.estgweb.utils.RoleManager;
import pt.estgp.estgweb.utils.Email;
import pt.utl.ist.berserk.logic.serviceManager.IService;
 
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
 
/**
* @author Fabio Velez
90,18 → 88,32
public List<UserView> sendMessage(HttpServletRequest request, String from, String year, String department, long courseId, long courseUnitId, String semestre, MessageTarget target, String text,String subject, UserSession userSession)
{
List<User> users = DaoFactory.getAnnouncementDaoImpl().findUsers(year,department,courseId,courseUnitId,semestre,target);
 
Email e = sendEmailService.getMessageEmail(
jomm.utils.MessageResources.getMessage(request,"user.role." + from),
subject,
text,
LangEnum.PORTUGUESE,
jomm.utils.MessageResources.getMessage(request,"submit.todo.message." + target.getTarget()),
users,
userSession.getUser());
e.setHtml(true);
EMAILJob emailJob = new EMAILJob(e);
JobScheduleService.getInstance().scheduleNow(emailJob,"Message Email from " + userSession.getUsername() + " as " + from + ": year:" + year + " - department:" + department + " - courseId:" + courseId + " - courseUnitId:" + courseUnitId + " - semestre:" + semestre + " - target:" + target + " - subject:" + subject ,userSession);
List<User> usersToConsume = new ArrayList<User>();
for(User u: users)
usersToConsume.add(u);
while(usersToConsume.size() > 0)
{
Iterator<User> iter = usersToConsume.iterator();
List<User> usersToJob = new ArrayList<User>();
int contador = 0;
while(iter.hasNext() && contador < 20)
{
usersToJob.add(iter.next());
iter.remove();
contador++;
}
Email e = sendEmailService.getMessageEmail(
jomm.utils.MessageResources.getMessage(request,"user.role." + from),
subject,
text,
LangEnum.PORTUGUESE,
jomm.utils.MessageResources.getMessage(request,"submit.todo.message." + target.getTarget()),
usersToJob,
userSession.getUser());
e.setHtml(true);
EMAILJob emailJob = new EMAILJob(e);
JobScheduleService.getInstance().scheduleNow(emailJob,"Message Email from " + userSession.getUsername() + " as " + from + ": year:" + year + " - department:" + department + " - courseId:" + courseId + " - courseUnitId:" + courseUnitId + " - semestre:" + semestre + " - target:" + target + " - subject:" + subject ,userSession);
}
List<UserView> userViews = UserView.getViews(users);
return userViews;
}
/impl/src/java/pt/estgp/estgweb/web/DirWebProxy.java
128,7 → 128,6
else
finalURL = server + URIUtil.encodePath(path, "ISO-8859-1");
URL url = new URL(finalURL);
System.out.println("FINAL_URL:" + finalURL);
 
if (useOutputStream != null && useOutputStream.equals("true"))
{
/impl/src/web/layout/navigationLeftMenu.jsp
12,7 → 12,6
<div class="listClean">
<ul>
<li>
<a href="<%=request.getContextPath()%>/dir/student?role=student&menu=menu.alunos"><bean:message key="menu.alunos"/></a>
</li>
<li>
/impl/src/web/user/courses/directedCoordinatedCourses.jsp
304,7 → 304,7
<nested:hidden property="id"/>
<nested:checkbox property="validProgram"/></td>
</baco:hasRole>
<td>${courseUnitView.code}</td>
<td><a href="<%=request.getContextPath()%>/user/startLoadCourseUnitFromHome.do?id=${courseUnitView.id}">${courseUnitView.code}</a></td>
<td>
<baco:hasRole role="teacher">
<a href="<%=request.getContextPath()%>/repositoryStream/${courseUnitView.programStreamId}">${courseUnitView.name}</a>
348,7 → 348,7
<nested:hidden property="id"/>
<nested:checkbox property="validProgram"/></td>
</baco:hasRole>
<td>${courseUnitView.code}</td>
<td><a href="<%=request.getContextPath()%>/user/startLoadCourseUnitFromHome.do?id=${courseUnitView.id}">${courseUnitView.code}</a></td>
<td><a href="<%=request.getContextPath()%>/repositoryStream/${courseUnitView.programStreamId}">${courseUnitView.name}</a></td>
<td>${courseUnitView.teachersSnipet}</td>
</tr>
/impl/src/web/user/home/todos.jsp
89,10 → 89,10
<%=MessageResources.getMessage(request, toDoCat.getDescription())%> (<%=toDoCat.getTotalToDo()%>) <img alt="abrir" src="<%=request.getContextPath() + img%>" onclick="this.src=showOrHide('<%=toDoCat.getDescription()%>','<%=request.getContextPath() + imgClose%>','<%=request.getContextPath() + imgOpen%>')" >
</p>
 
 
 
<ul id="<%=toDoCat.getDescription()%>" style="<%=style%>">
<%
<%
for (IToDo todo : toDoCat.getAllToDos())
{
 
139,4 → 139,4
<%
}
%>
</div>
</div>
/impl/etc/conteudos.sql
New file
0,0 → 1,53
-- MySQL dump 10.13 Distrib 5.1.37, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: conteudos
-- ------------------------------------------------------
-- Server version 5.1.37-1ubuntu5
 
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
--
-- Table structure for table `pagina`
--
 
DROP TABLE IF EXISTS `pagina`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pagina` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`html` text NOT NULL,
`nome_id` varchar(255) NOT NULL,
`categoria` varchar(45) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
 
--
-- Dumping data for table `pagina`
--
 
LOCK TABLES `pagina` WRITE;
/*!40000 ALTER TABLE `pagina` DISABLE KEYS */;
INSERT INTO `pagina` VALUES (1,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n','eee',''),(2,'','tttt',''),(3,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n<p>\r\n &nbsp;</p>\r\n<h1>\r\n Principal</h1>\r\n','principal','Alunos'),(4,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n<p>\r\n &nbsp;</p>\r\n<ol>\r\n <li>\r\n <strong>eqweqwe</strong></li>\r\n <li>\r\n qweqwe</li>\r\n <li>\r\n qweqweqwe</li>\r\n <li>\r\n qweqweqweqwe</li>\r\n</ol>\r\n<p>\r\n <a href=\"http://www.google.com\">Google</a></p>\r\n','teste','catDeTeste'),(5,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n','rtyu','catDeTeste'),(6,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n','AlunosTeste','Alunos'),(7,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n','Alunos Teste2','Alunos'),(8,'<p>\r\n This is some <strong>sample text</strong>.</p>\r\n<ol>\r\n <li>\r\n dasfgdsfgs</li>\r\n <li>\r\n dfgsd</li>\r\n <li>\r\n <u>fgsdfg</u></li>\r\n</ol>\r\n','Pagina de Teste','Gatos'),(9,'','Pagina de Teste Nova','cat1'),(10,'<div class=\"seccao\">\r\n <h2>\r\n Mensagem do Director</h2>\r\n <p>\r\n Caros alunos,</p>\r\n <p>\r\n &Eacute; com enorme satisfa&ccedil;&atilde;o que vos desejamos as boas vindas &agrave; ESTG, ou renovamos esses votos, no in&iacute;cio deste ano lectivo, o qual ser&aacute; uma vez mais de mudan&ccedil;a, em virtude da entrada em vigor dos novos estatutos da nossa Escola. Partilhamos convosco o regozijo de vos oferecermos uma escola mais din&acirc;mica e melhor preparada para vos apoiar:</p>\r\n <p>\r\n Temos uma oferta formativa est&aacute;vel e j&aacute; consolidada, mas simultaneamente inovadora, caracterizada por uma incessante adapta&ccedil;&atilde;o a novas necessidades e exig&ecirc;ncias da envolvente. No que respeita a cursos de licenciatura &ndash; 1&ordm; ciclo, temos 12 cursos em funcionamento, num total de 15 vari&aacute;veis, incluindo o regime p&oacute;s-laboral e os diversos ramos, disponibilizando um leque diversificado de op&ccedil;&otilde;es, destacando-se a oferta de est&aacute;gios curriculares e optativos, semin&aacute;rios e projectos. Com o intuito de disponibilizar uma oferta formativa mais alargada proporcionamos, no ano lectivo 2009/10, a frequ&ecirc;ncia de 3 cursos de Mestrado - 2&ordm; ciclo e p&oacute;s-gradua&ccedil;&otilde;es, que abrangem as diversas &aacute;reas cient&iacute;ficas ministradas na ESTG. Constitui ainda o leque de oferta formativa desta escola cursos de especializa&ccedil;&atilde;o tecnol&oacute;gica e cursos de curta dura&ccedil;&atilde;o, isoladamente ou em parceria com outras institui&ccedil;&otilde;es.</p>\r\n <p>\r\n O nosso corpo docente &eacute; cada vez mais qualificado e est&aacute; permanentemente empenhado em contribuir para o sucesso educativo dos estudantes, sendo evid&ecirc;ncia desse facto a mais de uma dezena de candidaturas de docentes da ESTG ao PROTEC aprovadas.</p>\r\n <p>\r\n Por todas estas raz&otilde;es, mas tamb&eacute;m pela exig&ecirc;ncia, pelo rigor e pela permanente orienta&ccedil;&atilde;o para os alunos somos uma escola integrada na primeira institui&ccedil;&atilde;o de ensino superior a receber um certificado de qualidade na sua globalidade, em que a qualidade &eacute; reconhecida &agrave;s actividades que realizamos e que pretendemos cada vez maior com o vosso contributo e para vosso benef&iacute;cio. Como desafio para um futuro pr&oacute;ximo surge a certifica&ccedil;&atilde;o ao n&iacute;vel da responsabilidade social. Apresento-vos os meus votos de bom trabalho e que alcancem o mais amplo sucesso.</p>\r\n <p>\r\n &nbsp;</p>\r\n <p align=\"center\">\r\n <img src=\"http://deptal.estgp.pt:9090/static/public/portal/imagens/presidente.gif\" style=\"border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: solid; border-right-style: solid; border-bottom-style: solid; border-left-style: solid; width: 156px; height: 211px; \" /><br />\r\n Artur Rom&atilde;o<br />\r\n (O Director)</p>\r\n <ul>\r\n </ul>\r\n</div>\r\n','MensagemDirector','FuturosAlunos');
/*!40000 ALTER TABLE `pagina` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
-- Dump completed on 2011-02-03 22:13:54
/impl/etc/conteudosEmPHP.zip
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream