/branches/v3/impl/conf/language/MessageResources.properties |
---|
422,6 → 422,14 |
see.more=Ver mais |
questionario.email.subject=Por favo preencha o assunto |
questionario.email.from.email=Por favor preencha o email que quer que apareça como remetente |
questionario.email.from.person=Por favor preencha a pessoa ou a entidade ou orgão que quer que apareça como remetente |
questionario.email.message=Por favor preencha uma mensagem |
questionario.send.message.top.nav=Envio de Mensagem de Correio Eletronico aos Inquiridos |
#Cursos |
/branches/v3/impl/conf/WEB-INF/struts/tiles-pae-questionarios.xml |
---|
39,6 → 39,13 |
</definition> |
<definition name="page.pae.questionario.pedagogico.message" extends="page.pae.separators.home"> |
<put name="separator" value="1" type="string"/> |
<put name="topnav" value="/user/questionarios/pedagogicoEstudante/topnavQuestionarioPedagogicoSendMessage.jsp"/> |
<put name="body" value="/user/questionarios/pedagogicoEstudante/sendMessageQuestionarioRequisitados.jsp"/> |
</definition> |
<!-- Modulo do Pedagogico Estudantes --> |
<definition name="page.pae.questionario.courses.selection" extends="page.pae.separators.home"> |
<put name="separator" value="1" type="string"/> |
/branches/v3/impl/conf/WEB-INF/struts/struts-pae-questionarios.xml |
---|
10,6 → 10,7 |
<form-beans> |
<form-bean type="pt.estgp.estgweb.web.form.questionarios.QuestionarioForm" name="QuestionarioForm"/> |
<form-bean type="pt.estgp.estgweb.web.form.questionarios.QuestionarioRespostaForm" name="QuestionarioRespostaForm"/> |
<form-bean type="pt.estgp.estgweb.web.form.questionarios.QuestionarioMessage" name="QuestionarioMessage"/> |
</form-beans> |
<global-exceptions> |
89,6 → 90,30 |
<forward name="success" path="page.pae.separators.home"/> |
</action> |
<action path="/user/startQuestionariosPaeMessagePedagogico" forward="page.pae.questionario.pedagogico.message"/> |
<!--<action path="/user/startQuestionariosPaeMessageXPTO" forward="page.pae.questionario.XPTO.message"/>--> |
<action path="/user/questionariosPaeMessagePedagogico" |
type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioController" |
name="QuestionarioMessage" |
scope="request" |
parameter="dispatch" |
validate="true" |
input="page.pae.questionario.pedagogico.message"> |
<forward name="success" path="page.pae.questionario.see"/> |
</action> |
<!--Outros no futuro |
<action path="/user/questionariosPaeMessageXpto" |
type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioController" |
name="QuestionarioMessage" |
scope="request" |
parameter="dispatch" |
validate="true" |
input="page.pae.questionario.XPTO.message"> |
<forward name="success" path="page.pae.questionario.see.XPTO"/> |
</action> |
--> |
<!--%%%%%%%%%%%%%%%% Pedagogico Alunos Modulo %%%%%%%%%%%%%%%%%%%--> |
<action path="/user/questionarioPedagogicoStartChooseCourses" forward="page.pae.questionario.courses.selection"/> |
<action path="/user/questionarioPedagogicoStartCheckCourses" forward="page.pae.questionario.courses.check"/> |
/branches/v3/impl/conf/app.properties |
---|
18,8 → 18,8 |
site.url=@site.url@ |
#USAR APENAS ESTES DOIS EMAILS NAO DA PARA MAIS |
admin.email=ci@estgp.pt |
admin.email.2=jmachado@estgp.pt |
admin.email=@admin.email.1@ |
admin.email.2=@admin.email.2@ |
email.local.suffix.1=estgp.pt |
email.local.suffix.2=esae.pt |
30,9 → 30,9 |
email.local.suffix=estgp.pt |
email.server=smtp.gmail.com |
#to use example: bacodev1@estgp.pt bacodev2@estgp.pt |
email.user.prefix=bacodev |
email.user.sufix=@estgp.pt |
email.user.count=10 |
email.user.prefix=@email.user.prefix@ |
email.user.sufix=@email.user.sufix@ |
email.user.count=20 |
email.user=bacodev@estgp.pt |
email.password=@email.password@ |
email.from=bacodev@estgp.pt |
/branches/v3/impl/conf/template/email/message_ipp_pt.txt |
---|
New file |
0,0 → 1,24 |
|
<html> |
<head> |
<title>{1}</title> |
</head> |
<body> |
<p><i>Mensagem de:</i> {0}</p> |
<p><i>Assunto:</i> <b><u>{1}</u></b></p> |
{2} |
<p>Cumprimentos</p> |
<p>{0}</p> |
<p>Se pretender responder, use o email: {3}</p> |
--------------------------------------------- |
<p>Instituto Politécnico de Portalegre - Sistema PAE</p> |
<p><a href="http://pae.ipportalegre.pt">http://pae.ipportalegre.pt</a></p> |
</body> |
</html> |
/branches/v3/impl/conf/berserk/sd.xml |
---|
2783,8 → 2783,53 |
</filterChains> |
</service> |
QuestionarioSendMessage |
QuestionarioSendMessageCursoAfeto |
QuestionarioSendMessageUnidadeAfeta |
<service> |
<name>QuestionarioSendMessage</name> |
<implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass> |
<description></description> |
<isTransactional>true</isTransactional> |
<defaultMethod>sendMessage</defaultMethod> |
<filterChains> |
<chain name="Logger"/> |
<chain name="Session"/> |
<chain name="AuthenticatedUsers"/> |
<chain name="AdminsOrQuestionarioAdminsOrPedagogico"/> |
</filterChains> |
</service> |
<service> |
<name>QuestionarioSendMessageCursoAfeto</name> |
<implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass> |
<description></description> |
<isTransactional>true</isTransactional> |
<defaultMethod>sendMessageCursoAfeto</defaultMethod> |
<filterChains> |
<chain name="Logger"/> |
<chain name="Session"/> |
<chain name="AuthenticatedUsers"/> |
<chain name="AdminsOrQuestionarioAdminsOrPedagogico"/> |
</filterChains> |
</service> |
<service> |
<name>QuestionarioSendMessageUnidadeAfeta</name> |
<implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass> |
<description></description> |
<isTransactional>true</isTransactional> |
<defaultMethod>sendMessageUnidadeAfeta</defaultMethod> |
<filterChains> |
<chain name="Logger"/> |
<chain name="Session"/> |
<chain name="AuthenticatedUsers"/> |
<chain name="AdminsOrQuestionarioAdminsOrPedagogico"/> |
</filterChains> |
</service> |
<service> |
<name>SalvarFicheiro</name> |
<implementationClass>pt.estgp.estgweb.services.paginasseccoes.SalvarFicheiro</implementationClass> |
<description>Salvar Ficheiro</description> |
/branches/v3/impl/conf/berserk/fcd.xml |
---|
510,6 → 510,17 |
</filterChain> |
<filterChain> |
<name>AdminsOrQuestionarioAdminsOrPedagogico</name> |
<expression>AuthenticatedUsers && (RoleUsers("admin") || RoleUsers("questionarios.admin") || RoleUsers("pedagogicCouncil.president"))</expression> |
<description>Admins Control Chain</description> |
<invocationTiming>1</invocationTiming> |
<filterClass>pt.estgp.estgweb.filters.chains.AdminControlFilter</filterClass> |
</filterChain> |
</filterChainsDefinitions> |
/branches/v3/impl/src/java/jomm/web/utils/NavPlace.java |
---|
149,7 → 149,7 |
} |
catch(Exception e) |
{ |
logger.error(e,e); |
logger.info("Message " + msg + " does not exist in MessageProperties will use key"); |
} |
if(msg == null) |
return key; |
/branches/v3/impl/src/java/pt/estgp/estgweb/utils/Email.java |
---|
1,20 → 1,16 |
package pt.estgp.estgweb.utils; |
import jomm.utils.TemplateUtils; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.Globals; |
import pt.estgp.estgweb.services.email.SendEmailService; |
import javax.mail.*; |
import javax.mail.internet.MimeMessage; |
import javax.mail.internet.InternetAddress; |
import java.util.Properties; |
import javax.mail.Message; |
import java.io.Serializable; |
import java.util.ArrayList; |
import java.util.List; |
import java.util.ArrayList; |
import java.util.regex.Matcher; |
import java.util.regex.Pattern; |
import java.util.regex.Matcher; |
import java.text.MessageFormat; |
import java.io.Serializable; |
import pt.estgp.estgweb.Globals; |
/** |
* @author Jorge Machado |
* @date 20/Mar/2008 |
25,6 → 21,9 |
{ |
private static final Logger logger = Logger.getLogger(Email.class); |
private boolean systemAssumingTestEmail = false; |
private boolean isHtml = false; |
private String subject; |
private List<String> recipients; |
46,7 → 45,7 |
public Email(String subject, List<String> recipients, String from, String mailTemplateName, List<String> arguments) |
{ |
this.subject = subject; |
this.recipients = recipients; |
this.recipients = filterRecipients(recipients, arguments, mailTemplateName);; |
this.from = from; |
this.emailTemplateName = mailTemplateName; |
this.arguments = arguments; |
56,12 → 55,48 |
{ |
this.type = type; |
this.subject = subject; |
this.recipients = recipients; |
this.recipients = filterRecipients(recipients, arguments, mailTemplateName); |
this.from = from; |
this.emailTemplateName = mailTemplateName; |
this.arguments = arguments; |
} |
private List<String> filterRecipients(List<String> recipients,List<String> arguments,String template) |
{ |
if(Globals.TEST_ENVIRONEMENT) |
{ |
systemAssumingTestEmail = true; |
logger.info("SISTEMA EM MODO DE TESTES, iria enviar email para os seguintes recipientes:"); |
System.out.println(recipients); |
logger.info("Mensagem que ia ser enviada:"); |
logger.info(SendEmailService.getEmailTextMessage(template, arguments)); |
logger.info("SISTEMA EM MODO DE TESTES: Vai enviar apenas para o mail de testes"); |
recipients = new ArrayList<String>(); |
recipients.add(Globals.ADMIN_EMAIL); |
} |
return recipients; |
} |
private List<String> filterRecipients(List<String> recipients) |
{ |
if(Globals.TEST_ENVIRONEMENT) |
{ |
systemAssumingTestEmail = true; |
logger.info("SISTEMA EM MODO DE TESTES, iria enviar email para os seguintes recipientes:"); |
System.out.println(recipients); |
logger.info("Nao se sabe a Mensagem que ia ser enviada"); |
logger.info("SISTEMA EM MODO DE TESTES: Vai enviar apenas para o mail de testes"); |
recipients = new ArrayList<String>(); |
recipients.add(Globals.ADMIN_EMAIL); |
} |
return recipients; |
} |
public boolean isSystemAssumingTestEmail() { |
return systemAssumingTestEmail; |
} |
public String getFromName() { |
return fromName; |
} |
82,7 → 117,9 |
public void setRecipients(List<String> recipients) |
{ |
this.recipients = recipients; |
systemAssumingTestEmail = true;//ja nao estao sobre |
this.recipients = filterRecipients(recipients); |
} |
public String getFrom() |
/branches/v3/impl/src/java/pt/estgp/estgweb/Globals.java |
---|
138,6 → 138,9 |
public static final String EMAIL_SERVER_USERNAME = ConfigProperties.getProperty("email.user"); |
public static final String EMAIL_SERVER_PASSWORD = ConfigProperties.getProperty("email.password"); |
public static final String ADMIN_EMAIL = ConfigProperties.getProperty("admin.email"); |
public static final String ADMIN_EMAIL_2 = ConfigProperties.getProperty("admin.email.2"); |
public static final String SYSTEM_EMAIL_BOX = ConfigProperties.getProperty("email.from"); |
public static final String ANNOUNCEMENT_TYPE_NEWS = "news"; |
public static final String ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS = "top.flash.news"; |
357,9 → 360,12 |
public static final String EMAIL_COURSEUNIT_ANNOUNCEMENT_TEMPLATE_PT = "courseUnitAnnouncement_pt.txt"; |
public static final String EMAIL_COURSEUNIT_ANNOUNCEMENT_TEMPLATE_EN = "courseUnitAnnouncement_en.txt"; |
public static final String EMAIL_MESSAGE_TEMPLATE_EN = "message_en.txt"; |
public static final String EMAIL_MESSAGE_TEMPLATE_PT = "message_pt.txt"; |
public static final String EMAIL_MESSAGE_TEMPLATE_EN = "message_en.txt"; |
public static final String EMAIL_MESSAGE_IPP_TEMPLATE_PT = "message_ipp_pt.txt"; |
public static final String EMAIL_COURSEUNIT_WORK_SUBJECT_PT = ConfigProperties.getProperty("email.courseunit.work.subject.pt"); |
public static final String EMAIL_COURSEUNIT_WORK_SUBJECT_EN = ConfigProperties.getProperty("email.courseunit.work.subject.en"); |
public static final String EMAIL_COURSEUNIT_WORK_RELATIVE_URL = ConfigProperties.getProperty("email.courseunit.work.relative.url"); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/email/EMAILJob.java |
---|
35,7 → 35,7 |
public void runJob() |
{ |
if(Globals.TEST_ENVIRONEMENT) |
if(Globals.TEST_ENVIRONEMENT && !email.isSystemAssumingTestEmail()) |
{ |
String warn = "System in TEST Environement - will not send EMAIL"; |
logger.warn(warn); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/email/SendEmailService.java |
---|
16,10 → 16,7 |
import javax.mail.internet.MimeMessage; |
import java.io.UnsupportedEncodingException; |
import java.text.MessageFormat; |
import java.util.ArrayList; |
import java.util.Date; |
import java.util.List; |
import java.util.Properties; |
import java.util.*; |
/** |
* @author Jorge Machado |
54,7 → 51,7 |
} |
public void sendEmail(Email email) throws ServiceException |
{ |
if(Globals.TEST_ENVIRONEMENT) |
if(Globals.TEST_ENVIRONEMENT && !email.isSystemAssumingTestEmail()) |
{ |
String warn = "System in TEST Environement - will not send EMAIL"; |
logger.warn(warn); |
124,9 → 121,7 |
if(valid) |
{ |
String content = TemplateUtils.getOrLoadTemplate(Globals.TEMPLATE_EMAIL_PATH + "/" + email.getEmailTemplateName()); |
// Format the mail message |
String fullMessage = MessageFormat.format(content, email.getArguments().toArray()); |
String fullMessage = getEmailTextMessage(email); |
146,13 → 141,13 |
{ |
fullMessage += email.getFrom() != null && email.getFrom().length()>0 && !email.getFrom().equals(Globals.SYSTEM_EMAIL_BOX) ? "<br/><br/>Responda para " + email.getFrom() : "<br/><br/>Por favor não responda a este email"; |
fullMessage += " <br/> <br/> <h5> Mensagem Segura - enviada através da Google Apps Api através de baco 2015 </h5>"; |
fullMessage += " <br/> <br/> <h5> Mensagem Segura - enviada através da Google Apps Api </h5>"; |
} |
else |
{ |
fullMessage += email.getFrom() != null && email.getFrom().length()>0 && !email.getFrom().equals(Globals.SYSTEM_EMAIL_BOX) ? "\n\nResponda para " + email.getFrom() : "\n\nPor favor não responda a este email"; |
fullMessage += " \n\n Mensagem Segura - enviada através da Google Apps Api através de baco 2015"; |
fullMessage += " \n\n Mensagem Segura - enviada através da Google Apps Api "; |
} |
message.setText(fullMessage,"utf-8"); |
181,6 → 176,22 |
} |
} |
private static String getEmailTextMessage(Email email) |
{ |
return getEmailTextMessage( email.getEmailTemplateName(), email.getArguments().toArray()); |
} |
public static String getEmailTextMessage(String template,List<String> arguments) |
{ |
return getEmailTextMessage(template, arguments.toArray()); |
} |
public static String getEmailTextMessage(String template,Object[] arguments) |
{ |
String content = TemplateUtils.getOrLoadTemplate(Globals.TEMPLATE_EMAIL_PATH + "/" +template); |
// Format the mail message |
return MessageFormat.format(content, arguments); |
} |
public Email getSendUrlToFriendEmail(String url, String from, LangEnum langEnum, List<String> recipients) |
{ |
List<String> arguments = new ArrayList<String>(); |
293,6 → 304,54 |
return email; |
} |
public Email getMessageEmailAdulteredFromEmailIpp(String fromEmail, String from, String subject,String text, List<String> emails, User user) |
{ |
// # 0 : From |
// # 1 : Subject |
// # 2 : Text |
// # 2 : FromEmail Adultered in message |
List<String> arguments = new ArrayList<String>(); |
arguments.add(from); |
arguments.add(subject); |
arguments.add(text); |
arguments.add(fromEmail); |
String template; |
template = Globals.EMAIL_MESSAGE_IPP_TEMPLATE_PT; |
List<String> recipients = new ArrayList<String>(); |
for(String e: emails) |
{ |
if(Email.validEmail(e)) |
recipients.add(e); |
} |
logger.info("subject: " + subject); |
if(fromEmail == null) |
logger.info("user: " + user.getEmail()); |
else |
logger.info("user altered to: " + fromEmail); |
logger.info("template: " + template); |
logger.info("arguments:"); |
for(String arg: arguments) |
logger.info(arg); |
logger.info("recipients:"); |
for(String rec: recipients) |
logger.info(rec); |
logger.info("arguments end"); |
fromEmail = fromEmail == null ? user.getEmail() : fromEmail; |
Email email = new Email(subject ,recipients,fromEmail,template,arguments,Message.RecipientType.BCC); |
email.setFromName(from + " (PAE-IPP)"); |
email = new Email(subject ,recipients,fromEmail,template,arguments,Message.RecipientType.BCC); |
email.setFromName(from + " (PAE-IPP)"); |
return email; |
} |
public Email getMessageEmailOld(String from, String subject,String text, LangEnum langEnum, String target, List<User> users, User user) |
{ |
// # 0 : From |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java |
---|
480,8 → 480,7 |
catch (Exception e) |
{ |
logger.error(e, e); |
List<String> emails = new ArrayList<String>(); |
emails.add(ConfigProperties.getProperty("admin.email")); |
List<String> emails = ConfigProperties.getListValues("admin.email"); |
List<String> arguments = new ArrayList<String>(); |
String cause = e.getCause() == null ? "" : e.getCause().toString(); |
arguments.add((e.toString() + "\n" + cause).replace("\n","<br/>")); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/QuestionariosService.java |
---|
3,11 → 3,16 |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.domain.*; |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
import pt.estgp.estgweb.domain.dao.impl.AnnouncementDaoImpl; |
import pt.estgp.estgweb.domain.views.QuestionarioView; |
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.utils.Email; |
import pt.estgp.estgweb.web.exceptions.NotAuthorizedException; |
import pt.utl.ist.berserk.logic.serviceManager.IService; |
import java.util.List; |
import java.util.*; |
/** |
* Created by jorgemachado on 21/03/16. |
193,5 → 198,86 |
} |
SendEmailService sendEmailService = new SendEmailService(); |
public int sendMessage(boolean onlyNotAnswered,Long id,String msg,String emailFrom,String personFrom, String subject,UserSession userSession) |
{ |
String source = "questionario message"; |
AnnouncementDaoImpl.FindUsersResult result = DaoFactory.getQuestionarioDaoImpl().findUsersEmails(id,onlyNotAnswered); |
return sendEmails(id, msg, emailFrom, personFrom, subject, userSession, source, result); |
} |
public int sendMessageCursoAfeto(boolean onlyNotAnswered,Long id,String msg,String emailFrom,String personFrom, String subject,UserSession userSession) |
{ |
String source = "questionario curso message"; |
AnnouncementDaoImpl.FindUsersResult result = DaoFactory.getQuestionarioDaoImpl().findUsersEmailsPedagogico(onlyNotAnswered,id,0); |
return sendEmails(id, msg, emailFrom, personFrom, subject, userSession, source, result); |
} |
public int sendMessageUnidadeAfeta(boolean onlyNotAnswered,Long id,String msg,String emailFrom,String personFrom, String subject,UserSession userSession) |
{ |
String source = "questionario unidade message"; |
AnnouncementDaoImpl.FindUsersResult result = DaoFactory.getQuestionarioDaoImpl().findUsersEmailsPedagogico(onlyNotAnswered,0,id); |
return sendEmails(id, msg, emailFrom, personFrom, subject, userSession, source, result); |
} |
private int sendEmails(Long id, String msg, String emailFrom, String personFrom, String subject, UserSession userSession, String source, AnnouncementDaoImpl.FindUsersResult result) { |
List<String> usersToConsume = result.emails; |
logger.info("Scheduling mail jobs to " + result.users + " users: " + usersToConsume.size() + " recipients"); |
//while(usersToConsume.size() > 0) |
//{ |
// Iterator<String> iter = usersToConsume.iterator(); |
// List<String> usersToJob = new ArrayList<String>(); |
// int contador = 0; |
// while(iter.hasNext() && contador < 20) |
// { |
// usersToJob.add(iter.next()); |
// iter.remove(); |
// contador++; |
// } |
Email e = sendEmailService.getMessageEmailAdulteredFromEmailIpp(emailFrom, |
personFrom, |
subject, |
msg, |
usersToConsume, |
userSession.getUser()); |
e.setHtml(true); |
EMAILJob emailJob = new EMAILJob(e); |
JobScheduleService.getInstance().scheduleNow(emailJob,"Message Email (" + source + ":id " + id + ") from " + userSession.getUsername() + " as " + personFrom + " - subject:" + subject ,userSession); |
//} |
enviarComprovativoAoRemetente(id, msg, emailFrom, personFrom, subject, userSession, source,usersToConsume.size()); |
return result.users; |
} |
private void enviarComprovativoAoRemetente(Long id, String msg, String emailFrom, String personFrom, String subject, UserSession userSession, String source,int sentTo) |
{ |
Map<String,String> emailsComprovativos = new HashMap<String, String>(); |
if(Email.validEmail(userSession.getUser().getEmail())) |
emailsComprovativos.put(userSession.getUser().getEmail(),""); |
if(Email.validEmail(userSession.getUser().getOutEmail())) |
emailsComprovativos.put(userSession.getUser().getOutEmail(),""); |
if(Email.validEmail(userSession.getUser().getPreferrefEmail())) |
emailsComprovativos.put(userSession.getUser().getPreferrefEmail(),""); |
List<String> comprovativos = new ArrayList<String>(); |
comprovativos.addAll(emailsComprovativos.keySet()); |
if(comprovativos.size() > 0) |
{ |
Email e = sendEmailService.getMessageEmailAdulteredFromEmailIpp(emailFrom, |
personFrom, |
subject + " (COMPROVATIVO PAE) ", |
"<u>Olá " + userSession.getUser().getName() + " - Este é um comprovativo do seu envio de mensagem a " + sentTo + " Alunos</u><br/><br/>" + msg, |
comprovativos, |
userSession.getUser()); |
e.setHtml(true); |
EMAILJob emailJob = new EMAILJob(e); |
JobScheduleService.getInstance().scheduleNow(emailJob,"Message Email (" + source + ":id " + id + ") from " + userSession.getUsername() + " as " + personFrom + " - subject:" + subject ,userSession); |
} |
} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioDaoImpl.java |
---|
7,12 → 7,12 |
import org.hibernate.HibernateException; |
import org.hibernate.Query; |
import org.hibernate.criterion.Order; |
import pt.estgp.estgweb.domain.QuestionarioImpl; |
import pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto; |
import pt.estgp.estgweb.domain.QuestionarioResposta; |
import pt.estgp.estgweb.domain.QuestionarioRespostaRequisitada; |
import pt.estgp.estgweb.domain.*; |
import java.util.ArrayList; |
import java.util.HashMap; |
import java.util.List; |
import java.util.Map; |
import static org.hibernate.criterion.Restrictions.*; |
113,6 → 113,21 |
else |
return 0; |
} |
public long getNumeroUnidadesUsadas(long questionarioId) |
{ |
Query q = getCurrentSession().createQuery |
("select count(u.id) from u in class " + QuestionarioPedagogicoUnidadeCurricularAfeta.class.getName() + " " + |
" JOIN u.cursoAfeto c " + |
" JOIN c.questionario q " + |
" where u.usar = true AND q.id = " + questionarioId); |
Object result = q.uniqueResult(); |
if(result != null && ((Long)result) > 0) |
{ |
return (Long)result; |
} |
else |
return 0; |
} |
public long getNumeroRespostasRequisitadas(long questionarioId) |
{ |
129,7 → 144,83 |
return 0; |
} |
public AnnouncementDaoImpl.FindUsersResult findUsersEmails(Long id,boolean onlyNotAnswered) |
{ |
AnnouncementDaoImpl.FindUsersResult findUsersResult = new AnnouncementDaoImpl.FindUsersResult(); |
List<String> users = new ArrayList<String>(); |
findUsersResult.emails = users; |
Query q = AbstractDao.getCurrentSession().createQuery("SELECT " + |
" u.outEmail, u.preferrefEmail, u.email " + |
"from " + QuestionarioRespostaRequisitada.class.getName() + " rR " + |
"JOIN rR.questionario q " + |
"JOIN rR.user u " + |
"WHERE q.id = :id " + |
(onlyNotAnswered? " AND rR.resposta is null " : "" ) + |
"GROUP BY u.id"); |
q.setLong("id",id); |
List<Object[]> results = (List<Object[]>) q.list(); |
fullFillResults(findUsersResult, results); |
return findUsersResult; |
} |
public AnnouncementDaoImpl.FindUsersResult findUsersEmailsPedagogico(boolean onlyNotAnswered,long cursoAfetoId,long unidadeAfetaId) |
{ |
AnnouncementDaoImpl.FindUsersResult findUsersResult = new AnnouncementDaoImpl.FindUsersResult(); |
List<String> users = new ArrayList<String>(); |
findUsersResult.emails = users; |
Query q = AbstractDao.getCurrentSession().createQuery("SELECT " + |
" u.outEmail, u.preferrefEmail, u.email " + |
"from " + QuestionarioPedagogicoAlunoRequisitado.class.getName() + " aR " + |
"JOIN aR.respostaRequisitada rR " + |
"JOIN rR.user u " + |
"WHERE " + |
(cursoAfetoId > 0 ? |
" aR.tipologiaRequisitada.unidadeAfeta.cursoAfeto.id = " + cursoAfetoId : |
" aR.tipologiaRequisitada.unidadeAfeta.id = " + unidadeAfetaId) + |
(onlyNotAnswered? " AND rR.resposta is null " : "" ) + |
"GROUP BY u.id"); |
List<Object[]> results = (List<Object[]>) q.list(); |
fullFillResults(findUsersResult, results); |
return findUsersResult; |
} |
private void fullFillResults(AnnouncementDaoImpl.FindUsersResult findUsersResult, List<Object[]> results) { |
Map<String,String> emailsSet = new HashMap<String, String>(); |
for(Object[] result: results) |
{ |
if(result[0] != null) |
{ |
emailsSet.put((String) result[0],""); |
} |
if(result[1] != null) |
{ |
emailsSet.put((String) result[1],""); |
} |
if(result[2] != null) |
{ |
emailsSet.put((String) result[2],""); |
} |
} |
findUsersResult.emails.addAll(emailsSet.keySet()); |
findUsersResult.users = results.size(); |
} |
public static class QuestionarioStatsVars |
{ |
public long cursos; |
140,6 → 231,7 |
public long alunosDeUsadas; |
public long profsDeUsadas; |
public long unidadesUsadas; |
public long tipologiasUsadas; |
public long profsTimeStudents; |
public long respostasRequisitadas; |
public long respostasObtidas; |
155,16 → 247,17 |
" count(distinct c.id) AS cursos " + |
",count(distinct u.id) AS unidades " + |
",sum (u.profs) AS profs " + |
",sum (u.turmas) AS turmas " + |
",count(distinct t.cdTurma) AS turmas " + |
",sum (u.students) AS students " + |
",sum (case when u.usar = true then u.students else 0 end) AS alunosDeUsadas " + |
",sum (case when u.usar = true then u.profs else 0 end) AS profsDeUsadas " + |
",sum (case when u.usar = true then 1 else 0 end) AS unidadesUsadas " + |
",sum (case when u.usar = true then 1 else 1 end) AS unidadesTodasCheck " + |
",count(distinct a.aluno.id) AS alunosDeUsadas " + |
",count(distinct t.docenteAfeto.id) AS profsDeUsadas " + |
",count(distinct t.id) AS tipologiasRequisitadas " + |
",sum (case when u.usar = true then (u.profs * u.students) else 0 end) AS respostasEsperadas " + |
"from " + QuestionarioPedagogicoCursoAfeto.class.getName() + " c " + |
"JOIN c.questionario q " + |
"JOIN c.unidadesAfetas u " + |
"JOIN u.tipologiasRequisitadas t " + |
"JOIN t.alunosRequisitados a " + |
"WHERE q.id = :id " + |
"GROUP BY q.id"); |
181,13 → 274,14 |
questionarioStatsVars.alunos = (Long) results[4]; |
questionarioStatsVars.alunosDeUsadas = (Long) results[5]; |
questionarioStatsVars.profsDeUsadas = (Long) results[6]; |
questionarioStatsVars.unidadesUsadas = (Long) results[7]; |
if(((Long) results[8]) != questionarioStatsVars.unidades) |
logger.error("TEM UM ERRO NA QUERY, a contagem de usadas com o distinct da diferente de com o SUM"); |
questionarioStatsVars.profsTimeStudents = (Long) results[9]; |
questionarioStatsVars.tipologiasUsadas = (Long) results[7]; |
questionarioStatsVars.profsTimeStudents = (Long) results[8]; |
questionarioStatsVars.respostasRequisitadas = getNumeroRespostasRequisitadas(questionarioId); |
questionarioStatsVars.respostasObtidas = getNumeroRespostas(questionarioId); |
questionarioStatsVars.unidadesUsadas = getNumeroUnidadesUsadas(questionarioId); |
if(questionarioStatsVars.unidadesUsadas > questionarioStatsVars.unidades) |
logger.error("TEM UM ERRO NA QUERY, a contagem de usadas com o distinct da diferente de com o SUM"); |
} |
return questionarioStatsVars; |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfetoImpl.java |
---|
30,4 → 30,5 |
public void incStatTipologiasRequisitadas(){ setStatTipologiasRequisitadas(getStatTipologiasRequisitadas()+1);} |
public void incStatRespostasRequisitadas(){ setStatRespostasRequisitadas(getStatRespostasRequisitadas() + 1);} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/form/questionarios/QuestionarioMessage.java |
---|
New file |
0,0 → 1,118 |
package pt.estgp.estgweb.web.form.questionarios; |
import org.apache.struts.action.ActionErrors; |
import org.apache.struts.action.ActionMapping; |
import pt.estgp.estgweb.web.form.ApplicationForm; |
import javax.servlet.http.HttpServletRequest; |
public class QuestionarioMessage extends ApplicationForm |
{ |
boolean onlyNotAnswered = false; |
String message; |
private long cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId; |
String fromEmail; |
String fromPerson; |
String subject; |
String formDescription; |
String dispatch; |
long questionarioId; |
public long getQuestionarioId() { |
return questionarioId; |
} |
public void setQuestionarioId(long questionarioId) { |
this.questionarioId = questionarioId; |
} |
public String getDispatch() { |
return dispatch; |
} |
public void setDispatch(String dispatch) { |
this.dispatch = dispatch; |
} |
public String getFormDescription() { |
return formDescription; |
} |
public void setFormDescription(String formDescription) { |
this.formDescription = formDescription; |
} |
public String getSubject() { |
return subject; |
} |
public void setSubject(String subject) { |
this.subject = subject; |
} |
public boolean isOnlyNotAnswered() { |
return onlyNotAnswered; |
} |
public void setOnlyNotAnswered(boolean onlyNotAnswered) { |
this.onlyNotAnswered = onlyNotAnswered; |
} |
public String getFromEmail() { |
return fromEmail; |
} |
public void setFromEmail(String fromEmail) { |
this.fromEmail = fromEmail; |
} |
public String getFromPerson() { |
return fromPerson; |
} |
public void setFromPerson(String fromPerson) { |
this.fromPerson = fromPerson; |
} |
public String getMessage() { |
return message; |
} |
public void setMessage(String message) { |
this.message = message; |
} |
public long getCursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId() { |
return cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId; |
} |
public void setCursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId(long cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId) { |
this.cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId = cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId; |
} |
public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) |
{ |
ActionErrors errors = new ActionErrors(); |
if(getSubject() == null || getSubject().trim().length() == 0) |
{ |
addMessageWithKeys(errors,request,"errors.required","questionario.email.subject"); |
} |
if(getFromEmail() == null || getFromEmail().trim().length() == 0) |
{ |
addMessageWithKeys(errors,request,"errors.required","questionario.email.from.email"); |
} |
if(getFromPerson() == null || getFromPerson().trim().length() == 0) |
{ |
addMessageWithKeys(errors,request,"errors.required","questionario.email.from.person"); |
} |
if(getMessage() == null || getMessage().trim().length() == 0) |
{ |
addMessageWithKeys(errors,request,"errors.required","questionario.email.message"); |
} |
return errors; |
} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/QuestionarioController.java |
---|
11,6 → 11,7 |
import pt.estgp.estgweb.web.UserSessionProxy; |
import pt.estgp.estgweb.web.controllers.ApplicationDispatchController; |
import pt.estgp.estgweb.web.form.questionarios.QuestionarioForm; |
import pt.estgp.estgweb.web.form.questionarios.QuestionarioMessage; |
import pt.estgp.estgweb.web.utils.RequestUtils; |
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager; |
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager; |
254,7 → 255,85 |
} |
/******** |
* EMAILS QUESTIONARIO |
* @param mapping |
* @param form |
* @param request |
* @param response |
* @return |
* @throws Throwable |
*/ |
public ActionForward sendEmailQuestionario(ActionMapping mapping, |
ActionForm form, |
HttpServletRequest request, |
HttpServletResponse response) |
throws Throwable |
{ |
QuestionarioMessage frm = (QuestionarioMessage) form; |
IServiceManager sm = ServiceManager.getInstance(); |
String[] names = {"onlyNotAnswered","id","msg","emailFrom","personFrom","subject"}; |
Object[] args = { |
frm.isOnlyNotAnswered(), |
frm.getCursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId(), |
frm.getMessage(), |
frm.getFromEmail(), |
frm.getFromPerson(), |
frm.getSubject() |
}; |
int size = (Integer) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioSendMessage",args,names); |
addMessage(request,"submit.todo.message.success","" + size); |
return mapping.findForward("success"); |
} |
public ActionForward sendEmailQuestionarioCursoAfeto(ActionMapping mapping, |
ActionForm form, |
HttpServletRequest request, |
HttpServletResponse response) |
throws Throwable |
{ |
QuestionarioMessage frm = (QuestionarioMessage) form; |
IServiceManager sm = ServiceManager.getInstance(); |
String[] names = {"onlyNotAnswered","id","msg","emailFrom","personFrom","subject"}; |
Object[] args = { |
frm.isOnlyNotAnswered(), |
frm.getCursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId(), |
frm.getMessage(), |
frm.getFromEmail(), |
frm.getFromPerson(), |
frm.getSubject() |
}; |
int size = (Integer) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioSendMessageCursoAfeto",args,names); |
addMessage(request,"submit.todo.message.success","" + size); |
return mapping.findForward("success"); |
} |
public ActionForward sendEmailQuestionarioUnidadeAfeta(ActionMapping mapping, |
ActionForm form, |
HttpServletRequest request, |
HttpServletResponse response) |
throws Throwable |
{ |
QuestionarioMessage frm = (QuestionarioMessage) form; |
IServiceManager sm = ServiceManager.getInstance(); |
String[] names = {"onlyNotAnswered","id","msg","emailFrom","personFrom","subject"}; |
Object[] args = { |
frm.isOnlyNotAnswered(), |
frm.getCursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId(), |
frm.getMessage(), |
frm.getFromEmail(), |
frm.getFromPerson(), |
frm.getSubject() |
}; |
int size = (Integer) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioSendMessageUnidadeAfeta",args,names); |
addMessage(request,"submit.todo.message.success","" + size); |
return mapping.findForward("success"); |
} |
} |
/branches/v3/impl/src/doc/estgweb.eap |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/branches/v3/impl/src/web/user/home/teacherPae.jsp |
---|
26,9 → 26,11 |
<baco:hasRole role="admin,all,questionarios.gerais,questionarios.admin"> |
<div class="col-md-6 col-sm-12 col-xs-12"> |
<jsp:include page="panels/configsInfo.jsp"/> |
<baco:hasRole role="admin,all,services,questionarios.admin,questionarios.atribuicoes.admin,questionarios.tipologias.admin,questionarios.atribuicoes.check_teachers"> |
<jsp:include page="panels/configsInfo.jsp"/> |
</baco:hasRole> |
<jsp:include page="panels/configsGeraisSistema.jsp"/> |
<jsp:include page="panels/docs.jsp"/> |
<jsp:include page="panels/configsGeraisSistema.jsp"/> |
</div> |
<div class="col-md-6 col-sm-12 col-xs-12"> |
<jsp:include page="panels/academicTools.jsp"/> |
/branches/v3/impl/src/web/user/home/studentPae.jsp |
---|
15,5 → 15,8 |
<jsp:include page="/user/questionarios/respostasRequisitadas.jsp"/> |
</div> |
<div class="col-md-4 col-sm-12 col-xs-12"> |
<baco:hasRole role="admin,all,questionarios.gerais,questionarios.admin,pedagogicCouncil.president"> |
<jsp:include page="panels/questionarios.jsp"/> |
</baco:hasRole> |
<jsp:include page="panels/emailSet.jsp"/> |
</div> |
/branches/v3/impl/src/web/user/questionarios/questionarioAdmin.jsp |
---|
87,6 → 87,8 |
%> |
<div class="alert alert-success col-md-2 col-sm-2"> |
<bean:message key="questionario.state.ASSIGNATION_DETAILS"/> |
<html:link styleClass="btn btn-default" action="/user/questionarioPedagogicoStartCheckCourses.do?questionarioId=${Questionario.id}">Ver Atribuições</html:link> |
<html:link styleClass="btn btn-default" action="/user/questionarioPedagogicoStartChooseCourses.do?questionarioId=${Questionario.id}">Ver Seleção de Cursos</html:link> |
</div> |
<div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div> |
<% |
/branches/v3/impl/src/web/user/questionarios/questionariosList.jsp |
---|
97,7 → 97,14 |
</div> |
</logic:equal> |
<logic:notEqual name="q" property="state" value="OLAP"> |
<div class="alert alert-warning alert-small"> |
<% |
String alert = "warning"; |
if(q.getStateEnum() == QuestionarioImpl.State.PROCESSING || q.getStateEnum() == QuestionarioImpl.State.PROCESSING_WITH_ANSWERS) |
alert = "success"; |
else if(q.getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS) |
alert = "danger"; |
%> |
<div class="alert alert-<%=alert%> alert-small"> |
<bean:message key="questionario.state.${q.state}"/> |
</div> |
</logic:notEqual> |
/branches/v3/impl/src/web/user/questionarios/questionariosSee.jsp |
---|
100,7 → 100,14 |
</div> |
</logic:equal> |
<logic:notEqual name="q" property="state" value="OLAP"> |
<div class="alert alert-warning alert-small"> |
<% |
String alert = "warning"; |
if(q.getStateEnum() == QuestionarioImpl.State.PROCESSING || q.getStateEnum() == QuestionarioImpl.State.PROCESSING_WITH_ANSWERS) |
alert = "success"; |
else if(q.getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS) |
alert = "danger"; |
%> |
<div class="alert alert-<%=alert%> alert-small"> |
<bean:message key="questionario.state.${q.state}"/> |
</div> |
</logic:notEqual> |
/branches/v3/impl/src/web/user/questionarios/topnavQuestionarioSee.jsp |
---|
2,10 → 2,19 |
<%@page pageEncoding="UTF-8"%> |
<%@page import="jomm.web.utils.NavPlaceServer"%> |
<%@ page import="jomm.web.utils.TopNav" %> |
<%@ page import="pt.estgp.estgweb.web.form.questionarios.QuestionarioMessage" %> |
<% |
String qId = request.getParameter("questionarioId"); |
if(qId == null) |
qId = request.getParameter("questionario.id"); |
if(qId==null) |
{ |
QuestionarioMessage questionarioMessage = (QuestionarioMessage) request.getAttribute("QuestionarioMessage"); |
if(questionarioMessage != null) |
{ |
qId = "" + questionarioMessage.getQuestionarioId(); |
} |
} |
Long questionarioId = Long.parseLong(qId); |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/pedagogicoEstudanteAssignAnswers.jsp |
---|
138,24 → 138,32 |
<div class="alert alert-info">Por favor confira estes valores com os resultados apresentados no LOG</div> |
<table class="tablesorter-blue"> |
<thead> |
<th>Cursos Selecionados</th> |
<th>Total de Unidades</th> |
<th>Unidades Não Selecionadas</th> |
<th>Unidades Selecionadas</th> |
<th>Turmas Selecionadas</th> |
<th>Alunos Selecionados</th> |
<th>Professores Selecionados</th> |
<th>Máximo de questionários simples admitidos (Somatorio (Por cada Unidade Profs*Alunos))</th> |
<th>Cursos Selecionados</th> |
<th>Total de Unidades</th> |
<th>Unidades Não Selecionadas</th> |
<th>Unidades Selecionadas</th> |
<th>Turmas Selecionadas</th> |
<th>Alunos Selecionados</th> |
<th>Professores Selecionados</th> |
<th>Tipologias Selecionadas</th> |
<th>Respondidos</th> |
<th>Por Responder</th> |
<th>Respostas Requisitadas</th> |
</thead> |
<tbody> |
<td><%=questionarioStatsVars.cursos%></td> |
<td><%=questionarioStatsVars.unidades%></td> |
<td><%=questionarioStatsVars.unidades - questionarioStatsVars.unidadesUsadas%></td> |
<td><%=questionarioStatsVars.unidadesUsadas%></td> |
<td><%=questionarioStatsVars.turmas%></td> |
<td><%=questionarioStatsVars.alunosDeUsadas%></td> |
<td><%=questionarioStatsVars.profsDeUsadas%></td> |
<td><%=questionarioStatsVars.profsTimeStudents%></td> |
<td><%=questionarioStatsVars.cursos%></td> |
<td><%=questionarioStatsVars.unidades%></td> |
<td><%=questionarioStatsVars.unidades - questionarioStatsVars.unidadesUsadas%></td> |
<td><%=questionarioStatsVars.unidadesUsadas%></td> |
<td><%=questionarioStatsVars.turmas%></td> |
<td><%=questionarioStatsVars.alunosDeUsadas%></td> |
<td><%=questionarioStatsVars.profsDeUsadas%></td> |
<td><%=questionarioStatsVars.tipologiasUsadas%></td> |
<td><label class="label label-success" style="font-size: 1em"><%=questionarioStatsVars.respostasObtidas%></label></td> |
<td><label class="label label-danger" style="font-size: 1em"><%=(questionarioStatsVars.respostasRequisitadas-questionarioStatsVars.respostasObtidas)%></label></td> |
<td><label class="label label-info" style="font-size: 1em"><%=questionarioStatsVars.respostasRequisitadas%></label></td> |
</tbody> |
</table> |
</div> |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionarioDashBoard.jsp |
---|
4,8 → 4,9 |
<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %> |
<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %> |
<%@ page import="pt.estgp.estgweb.domain.dao.impl.QuestionarioDaoImpl" %> |
<%@ page import="pt.estgp.estgweb.web.form.questionarios.QuestionarioMessage" %> |
<%@ page import="java.net.URLEncoder" %> |
<%@ page import="java.util.List" %> |
<%@ page import="pt.estgp.estgweb.web.exceptions.NotAuthorizedException" %> |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> |
15,7 → 16,8 |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/> |
<html:errors/> |
<jomm:messages/> |
<% |
String questionarioIdStr = request.getParameter("questionarioId"); |
if(questionarioIdStr == null) |
27,6 → 29,11 |
Questionario quest = (Questionario) request.getAttribute("Questionario"); |
questionarioIdStr = quest.getId() + ""; |
} |
if(request.getAttribute("QuestionarioMessage") != null) |
{ |
questionarioIdStr = "" + ((QuestionarioMessage) request.getAttribute("QuestionarioMessage")).getQuestionarioId(); |
} |
} |
long questionarioId = Long.parseLong(questionarioIdStr); |
57,6 → 64,18 |
<baco:clearOperation name="Questionario" op="QUESTIONARIO_START_PROCESSEMENT"> |
<button class="btn btn-success" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá abrir o questionário para os alunos!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/user/questionariosPaeYearSemestre.do?dispatch=startProcessement&questionarioId=${Questionario.id}"><span class="icon icon-play"> </span> Iniciar Questionário</button> |
</baco:clearOperation> |
<td> |
<% |
String descEncoded = URLEncoder.encode(questionario.getDescription(),"ISO-8859-1"); |
request.setAttribute("descEncoded",descEncoded); |
%> |
<html:link styleClass="btn btn-default" action="/user/startQuestionariosPaeMessagePedagogico.do?questionarioId=${Questionario.id}&formDescription=Mensagem para os alunos: ${descEncoded}&targetDispatch=sendEmailQuestionario&cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId=${Questionario.id}"> |
<span class="glyphicon glyphicon-envelope"> </span> Enviar para todos os Cursos |
</html:link> |
</td> |
<a href="<%=request.getContextPath()%>/user/questionariosPaeMessagePedagogico.do"/> |
</div> |
<div class="col-sm-12"> |
<table class="tablesorter-blue"> |
68,6 → 87,7 |
<th>Turmas Selecionadas</th> |
<th>Alunos Selecionados</th> |
<th>Professores Selecionados</th> |
<th>Tipologias Selecionadas</th> |
<th>Respondidos</th> |
<th>Por Responder</th> |
<th>Respostas Requisitadas</th> |
81,6 → 101,7 |
<td><%=questionarioStatsVars.turmas%></td> |
<td><%=questionarioStatsVars.alunosDeUsadas%></td> |
<td><%=questionarioStatsVars.profsDeUsadas%></td> |
<td><%=questionarioStatsVars.tipologiasUsadas%></td> |
<td><label class="label label-success" style="font-size: 1em"><%=questionarioStatsVars.respostasObtidas%></label></td> |
<td><label class="label label-danger" style="font-size: 1em"><%=(questionarioStatsVars.respostasRequisitadas-questionarioStatsVars.respostasObtidas)%></label></td> |
<td><label class="label label-info" style="font-size: 1em"><%=questionarioStatsVars.respostasRequisitadas%></label></td> |
99,6 → 120,7 |
<th>Respondidos</th> |
<th>Por Responder</th> |
<th>Total</th> |
<th></th> |
</thead> |
<tbody> |
<% |
124,6 → 146,15 |
<td><label class="label <%=respostasCurso > 0 ? "label-success":"label-warning"%>" style="font-size: 1em"><%=respostasCurso%></label></td> |
<td><label class="label label-danger" style="font-size: 1em"><%=cursoAfeto.getStatRespostasRequisitadas() - respostasCurso%></label></td> |
<td><label class="label label-info" style="font-size: 1em"><%=cursoAfeto.getStatRespostasRequisitadas()%></label></td> |
<td> |
<% |
String nomeCursoEncoded = URLEncoder.encode(cursoAfeto.getNome(),"ISO-8859-1"); |
request.setAttribute("nomeCursoEncoded",nomeCursoEncoded); |
%> |
<html:link styleClass="btn btn-default" action="/user/startQuestionariosPaeMessagePedagogico.do?questionarioId=${Questionario.id}&formDescription=Mensagem para os alunos do curso ${nomeCursoEncoded} (${cursoAfeto.codigoCurso})&targetDispatch=sendEmailQuestionarioCursoAfeto&cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId=${cursoAfeto.id}"> |
<span class="glyphicon glyphicon-envelope"> </span> |
</html:link> |
</td> |
</tr> |
<% |
} |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/sendMessageQuestionarioRequisitados.jsp |
---|
New file |
0,0 → 1,165 |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> |
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSession" scope="request"/> |
<% |
/* IServiceManager sm = ServiceManager.getInstance(); |
String[] names = new String[]{}; |
Object[] args = new Object[]{}; |
List<String> importYears = (List<String>) sm.execute(RequestUtils.getRequester(request, response), "LoadCoursesImportYears", args, names); |
request.setAttribute("importYears", importYears);*/ |
%> |
<logic:present name="QuestionarioMessage"> |
<logic:notEmpty name="QuestionarioMessage" property="message"> |
<script> |
$(document).ready( |
function(){ |
setText(); |
} |
); |
function setText() |
{ |
$("#editor").html('<bean:write name="QuestionarioMessage" property="message" filter="false"/>'); |
} |
</script> |
</logic:notEmpty> |
</logic:present> |
<html:form styleId="formSubmitMessage" styleClass="form-horizontal" action="/user/questionariosPaeMessagePedagogico" enctype="multipart/form-data" onsubmit="this.form.message.value=$('#editor').html();"> |
<jsp:useBean id="QuestionarioMessage" type="pt.estgp.estgweb.web.form.questionarios.QuestionarioMessage" scope="request"/> |
<% |
String targetDispatch = request.getParameter("targetDispatch"); |
String formDescription = request.getParameter("formDescription"); |
String cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId = request.getParameter("cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId"); |
String questionarioId = request.getParameter("questionarioId"); |
if(formDescription!=null) |
QuestionarioMessage.setFormDescription(formDescription); |
if(targetDispatch!=null) |
QuestionarioMessage.setDispatch(targetDispatch); |
if(cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId != null) |
QuestionarioMessage.setCursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId(Long.parseLong(cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId)); |
if(questionarioId != null) |
QuestionarioMessage.setQuestionarioId(Long.parseLong(questionarioId)); |
%> |
<html:hidden property="formDescription"/> |
<div class="alert alert-info">Esta funcionalidade apenas está disponivel a membros do Pedagógico e à Administração</div> |
<div class="panel panel-default"> |
<div class="panel-heading">${QuestionarioMessage.formDescription}</div> |
<div class="panel-body"> |
<jomm:messages/> |
<html:errors/> |
<input type="hidden" name="dispatch" value="${QuestionarioMessage.dispatch}"/> |
<html:hidden property="cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId"/> |
<html:hidden property="formDescription"/> |
<html:hidden property="message"/> |
<html:hidden property="questionarioId"/> |
<div class="form-group row"> |
<div class="control-label col-sm-2">Nome ou Entidade que representa</div> |
<div class="col-sm-10"> |
<html:text styleId="sendAnnouncementEmail" styleClass="form-control" property="fromPerson"/> |
</div> |
</div> |
<div class="form-group row"> |
<div class="control-label col-sm-2">Email que aparece como Remetente</div> |
<div class="col-sm-10"> |
<html:text styleId="sendAnnouncementEmail" styleClass="form-control" property="fromEmail"/> |
</div> |
</div> |
<div class="form-group row"> |
<div class="control-label col-sm-2"><bean:message key="submit.todo.message.subject"/></div> |
<div class="col-sm-10"> |
<html:text styleId="subject" styleClass="form-control" property="subject"/> |
</div> |
</div> |
<div class="form-group row"> |
<div class="control-label col-sm-2" for="person"><bean:message key="submit.todo.message.target.person"/></div> |
<div class="col-sm-10"> |
<html:select styleId="person" styleClass="form-control" property="onlyNotAnswered"> |
<html:option value="true">Enviar apenas a quem têm questionários por responder</html:option> |
<html:option value="false">Enviar a Todos os Inquiridos</html:option> |
</html:select> |
</div> |
</div> |
<div class="form-group row"> |
<div class="col-sm-12"> |
<div class="btn-toolbar" data-role="editor-toolbar" data-target="#editor"> |
<!-- <div class="btn-group"> |
<a class="btn dropdown-toggle" data-toggle="dropdown" title="Font"><i class="aweicon-font"></i><b class="caret"></b></a> |
<ul class="dropdown-menu"> |
</ul> |
</div> |
<div class="btn-group"> |
<a class="btn dropdown-toggle" data-toggle="dropdown" title="Font Size"><i class="aweicon-text-height"></i> <b class="caret"></b></a> |
<ul class="dropdown-menu"> |
<li><a data-edit="fontSize 5"><font size="5">Huge</font></a></li> |
<li><a data-edit="fontSize 3"><font size="3">Normal</font></a></li> |
<li><a data-edit="fontSize 1"><font size="1">Small</font></a></li> |
</ul> |
</div>--> |
<div class="btn-group"> |
<a class="btn btn-default" data-edit="bold" title="Bold (Ctrl/Cmd+B)"><i class="aweicon-bold"></i></a> |
<a class="btn btn-default" data-edit="italic" title="Italic (Ctrl/Cmd+I)"><i class="aweicon-italic"></i></a> |
<a class="btn btn-default" data-edit="strikethrough" title="Strikethrough"><i class="aweicon-strikethrough"></i></a> |
<a class="btn btn-default" data-edit="underline" title="Underline (Ctrl/Cmd+U)"><i class="aweicon-underline"></i></a> |
</div> |
<div class="btn-group"> |
<a class="btn btn-default" data-edit="insertunorderedlist" title="Bullet list"><i class="aweicon-list-ul"></i></a> |
<a class="btn btn-default" data-edit="insertorderedlist" title="Number list"><i class="aweicon-list-ol"></i></a> |
<a class="btn btn-default" data-edit="outdent" title="Reduce indent (Shift+Tab)"><i class="aweicon-indent-left"></i></a> |
<a class="btn btn-default" data-edit="indent" title="Indent (Tab)"><i class="aweicon-indent-right"></i></a> |
</div> |
<div class="btn-group"> |
<a class="btn btn-default" data-edit="justifyleft" title="Align Left (Ctrl/Cmd+L)"><i class="aweicon-align-left"></i></a> |
<a class="btn btn-default" data-edit="justifycenter" title="Center (Ctrl/Cmd+E)"><i class="aweicon-align-center"></i></a> |
<a class="btn btn-default" data-edit="justifyright" title="Align Right (Ctrl/Cmd+R)"><i class="aweicon-align-right"></i></a> |
<a class="btn btn-default" data-edit="justifyfull" title="Justify (Ctrl/Cmd+J)"><i class="aweicon-align-justify"></i></a> |
</div> |
<div class="btn-group"> |
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"><i class="aweicon-link"></i></a> |
<div class="dropdown-menu input-append"> |
<input class="span2" placeholder="URL" type="text" data-edit="createLink"/> |
<button class="btn" type="button">Add</button> |
</div> |
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="aweicon-cut"></i></a> |
</div> |
<div class="btn-group"> |
<a class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"><i class="aweicon-picture"></i></a> |
<input type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" /> |
</div> |
<div class="btn-group"> |
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="aweicon-undo"></i></a> |
<a class="btn btn-default" data-edit="redo" title="Redo (Ctrl/Cmd+Y)"><i class="aweicon-repeat"></i></a> |
</div> |
</div> |
<div id="editor"> |
<bean:message key="submit.todo.email.content"/>… |
</div> |
</div> |
</div> |
<button class="btn btn-success" onclick="this.form.message.value=$('#editor').html(); this.form.submit()"><bean:message key="submit.todo.message"/></button> |
</div> |
</div> |
</html:form> |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionarioCourseDashBoard.jsp |
---|
5,6 → 5,7 |
<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %> |
<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfeta" %> |
<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %> |
<%@ page import="java.net.URLEncoder" %> |
<%@ page import="java.util.List" %> |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
46,6 → 47,7 |
",sum (case when u.usar = true AND rR.resposta is null then 1 else 0 end) AS porResponder " + |
",sum (case when u.usar = true AND rR.resposta is null then 0 else 1 end) AS respostasObtidas " + |
",count(distinct a.aluno)" + |
",u.id" + |
" from u in class " + QuestionarioPedagogicoUnidadeCurricularAfeta.class.getName() + " " + |
" join u.cursoAfeto c " + |
" join u.tipologiasRequisitadas t " + |
68,9 → 70,10 |
<th class="filter-name filter-select">Docente</th> |
<th>Tipologia</th> |
<th>Turma</th> |
<th>Por Responder</th> |
<th>Respondidos</th> |
<th>Estudantes</th> |
<th>Por Resp.</th> |
<th>Resp.</th> |
<th>Alunos</th> |
<th></th> |
</thead> |
<tbody> |
<% |
88,6 → 91,19 |
<td><label class="label label-danger" style="font-size: 1em"><%=tipologia[6]%></label></td> |
<td><label class="label <%=((Long)tipologia[7]) > 0 ? "label-success":"label-warning"%>" style="font-size: 1em"><%=tipologia[7]%></label></td> |
<td><label class="label label-info" style="font-size: 1em"><%=tipologia[8]%></label></td> |
<td> |
<% |
Long unidadeId = (Long) tipologia[9]; |
request.setAttribute("unidadeId",unidadeId); |
%> |
<% |
String nomeCursoEncoded = URLEncoder.encode(tipologia[1] + "(" + tipologia[0] + ")", "ISO-8859-1"); |
request.setAttribute("nomeUnidadeEncoded",nomeCursoEncoded); |
%> |
<html:link styleClass="btn btn-default" action="/user/startQuestionariosPaeMessagePedagogico.do?questionarioId=${Questionario.id}&formDescription=Mensagem para os alunos: ${nomeUnidadeEncoded}&targetDispatch=sendEmailQuestionarioUnidadeAfeta&cursoAfetoOrUnidadeAfetaOrQuestionarioAfetoId=${unidadeId}"> |
<span class="glyphicon glyphicon-envelope"> </span> |
</html:link> |
</td> |
</tr> |
<% |
} |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/topnavQuestionarioPedagogicoSendMessage.jsp |
---|
New file |
0,0 → 1,33 |
<%@page contentType="text/html"%> |
<%@page pageEncoding="UTF-8"%> |
<%@page import="jomm.web.utils.NavPlaceServer"%> |
<%@ page import="jomm.web.utils.TopNav" %> |
<%@ page import="pt.estgp.estgweb.web.form.questionarios.QuestionarioMessage" %> |
<% |
String qId = request.getParameter("questionarioId"); |
if(qId == null) |
qId = request.getParameter("questionario.id"); |
if(qId==null) |
{ |
QuestionarioMessage questionarioMessage = (QuestionarioMessage) request.getAttribute("QuestionarioMessage"); |
if(questionarioMessage != null) |
{ |
qId = "" + questionarioMessage.getQuestionarioId(); |
} |
} |
Long questionarioId = Long.parseLong(qId); |
/* |
IServiceManager sm = ServiceManager.getInstance(); |
String[] names = {"questionarioId"}; |
Object[] args = {questionarioId}; |
QuestionarioImpl questionario = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"loadQuestionarioAdmin",args,names); |
*/ |
TopNav topNav = NavPlaceServer.getInstance().createTopNav(request); |
topNav.addNavPlace("/user/homePae.do", "intranet.separator.home.back"); |
topNav.addNavPlace("/user/seeQuestionarios.do", "surveys"); |
topNav.addNavPlace("/user/seeQuestionario.do?questionarioId=" + questionarioId, "survey.see",""+questionarioId); |
topNav.addNavPlace(null, "questionario.send.message.top.nav"); |
%> |
<jsp:include page="/layout/topnav.jsp"/> |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/pedagogicoEstudanteCoursesCheck.jsp |
---|
18,6 → 18,9 |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
<script> |
ping(); |
</script> |
<% |
String qId = request.getParameter("questionarioId"); |
if(qId == null) |
/branches/v3/impl/build.properties |
---|
161,6 → 161,8 |
#EMAIL SERVER SMTP GOOGLE |
email.password=DUMMY_PASSWORD_GMAIL |
email.user.prefix=bacodev |
email.user.sufix=@estgp.pt |
#email templates |
sms.templates.dir=/template/sms |
240,3 → 242,7 |
##Em testes colocar a true |
test.control.var=false |
admin.email.1=ci@estgp.pt |
admin.email.2=jmachado@estgp.pt |
/branches/v3/impl/build.xml |
---|
455,6 → 455,8 |
<replacefilter token="@hibernate.show.sql@" value="${hibernate.show.sql}"/> |
</replace>--> |
<replace file="${app.properties.build}/app.properties"> |
<replacefilter token="@admin.email.1@" value="${admin.email.1}"/> |
<replacefilter token="@admin.email.2@" value="${admin.email.2}"/> |
<replacefilter token="@tmp.dir@" value="${tmp.dir}"/> |
<replacefilter token="@data.dir@" value="${data.dir}"/> |
<replacefilter token="@out.dir@" value="${out.dir}"/> |
473,6 → 475,8 |
<!--System instance type specifications--> |
<replacefilter token="@email.password@" value="${email.password}"/> |
<replacefilter token="@email.user.sufix@" value="${email.user.sufix}"/> |
<replacefilter token="@email.user.prefix@" value="${email.user.prefix}"/> |
<replacefilter token="@test.control.var@" value="${test.control.var}"/> |
<replacefilter token="@mode.pae.enabled@" value="${mode.pae.enabled}"/> |