Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 808 → Rev 812

/impl/conf/WEB-INF/struts/tiles-assessments.xml
New file
0,0 → 1,60
<?xml version="1.0" encoding="UTF-8" ?>
 
<!--<!DOCTYPE tiles-definitions PUBLIC-->
<!--"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"-->
<!--"http://struts.apache.org/dtds/tiles-config_1_1.dtd">-->
 
<tiles-definitions>
 
<definition name="page.submit.assessment.from.serviceZone" extends="page.separators.serviceZone">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavCreateAssessment.jsp"/>
<put name="body" value="/user/assessments/submitAssessment.jsp"/>
</definition>
 
<definition name="page.list.assessments.from.serviceZone" extends="page.separators.serviceZone">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavListAssessment.jsp"/>
<put name="body" value="/user/assessments/listAssessments.jsp"/>
</definition>
 
<definition name="page.submit.schedule.from.serviceZone" extends="page.separators.serviceZone">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavScheduleAssessment.jsp"/>
<put name="body" value="/user/assessments/scheduleAssessment.jsp"/>
</definition>
 
<definition name="page.submit.editSchedule.from.serviceZone" extends="page.separators.serviceZone">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavEditScheduleAssessment.jsp"/>
<put name="body" value="/user/assessments/editScheduleAssessment.jsp"/>
</definition>
 
<definition name="page.submit.assessment.response.from.home" extends="page.separators.home">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/home/topnavResponseAssessment.jsp"/>
<put name="body" value="/user/assessments/submitAssessmentResponse.jsp"/>
</definition>
 
<definition name="page.configure.correct.assessment.from.serviceZone" extends="page.separators.home">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavConfigureCorrectAssessment.jsp"/>
<put name="body" value="/user/assessments/switchCorrectAssessment.jsp"/>
</definition>
<definition name="page.list.questionsOrResponsesCorrect.from.serviceZone" extends="page.separators.home">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavAssessmentToCorrect.jsp"/>
<put name="body" value="/user/assessments/listQuestionsOrResponsesToCorrect.jsp"/>
</definition>
<definition name="page.submit.correct.assessment.response.from.serviceZone" extends="page.separators.home">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavCorrectAssessmentResponse.jsp"/>
<put name="body" value="/user/assessments/submitCorrectAssessmentResponse.jsp"/>
</definition>
<definition name="page.submit.correct.question.responses.from.serviceZone" extends="page.separators.home">
<put name="title" value="Prova"/>
<put name="topnav" value="/user/serviceZone/topnavCorrectAssessmentQuestionResponses.jsp"/>
<put name="body" value="/user/assessments/submitCorrectQuestionResponses.jsp"/>
</definition>
 
</tiles-definitions>
/impl/conf/WEB-INF/struts/struts-assessment.xml
New file
0,0 → 1,141
<?xml version="1.0" encoding="UTF-8"?>
 
<!--<!DOCTYPE struts-config PUBLIC-->
<!--"-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"-->
<!--"http://struts.apache.org/dtds/struts-config_1_3.dtd">-->
 
<struts-config>
 
<form-beans>
<form-bean type="pt.estgp.estgweb.web.form.assessments.AssessmentsForm" name="AssessmentsForm"/>
</form-beans>
 
<global-exceptions>
 
</global-exceptions>
 
<global-forwards>
 
</global-forwards>
 
<action-mappings>
 
<action path="/user/submitAssessmentFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.assessment.from.serviceZone"
validate="true">
<forward name="serviceZone" path="page.separators.serviceZone"/>
</action>
 
<action path="/user/scheduleAssessmentFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.schedule.from.serviceZone"
validate="true">
<forward name="serviceZone" path="page.separators.serviceZone"/>
</action>
 
<action path="/user/editScheduleAssessmentFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.editSchedule.from.serviceZone"
validate="false">
<forward name="serviceZone" path="page.separators.serviceZone"/>
</action>
 
<action path="/user/startAssessmentResponseFromHome" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=loadResponse&amp;from=Home"/>
<action path="/user/submitAssessmentResponseFromHome"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.assessment.response.from.home"
validate="false">
<forward name="home" path="page.separators.home"/>
</action>
 
<action path="/user/submitConfigureCorrectAssessmentFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.configure.correct.assessment.from.serviceZone"
validate="false">
<forward name="listQuestionsOrResponsesToCorrect" path="page.list.questionsOrResponsesCorrect.from.serviceZone"/>
</action>
 
<action path="/user/chooseQuestionOrAssessmentToCorrectFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.list.questionsOrResponsesCorrect.from.serviceZone"
validate="false">
<!--<forward name="listQuestionsOrResponsesToCorrect" path="page.list.questionsOrResponsesCorrect.from.serviceZone"/>-->
</action>
 
<!--SUBMETER CORRECCAO A UMA PROVA INDIVIDUAL-->
<action path="/user/startSubmitCorrectAssessmentResponseFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=loadCorrectResponse&amp;from=ServiceZone"/>
<action path="/user/submitCorrectAssessmentResponseFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.correct.assessment.response.from.serviceZone"
validate="false">
<forward name="serviceZone" path="page.separators.serviceZone"/>
<forward name="listQuestionsOrResponsesToCorrect" path="page.list.questionsOrResponsesCorrect.from.serviceZone"/>
</action>
 
<!--SUBMETER CORRECCAO ÀS RESPOSTAS DE UMA QUESTÃO INDIVIDUAL-->
<action path="/user/startSubmitCorrectQuestionResponsesFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=loadQuestionResponses&amp;from=ServiceZone"/>
<action path="/user/submitCorrectQuestionResponsesFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.correct.question.responses.from.serviceZone"
validate="false">
<forward name="serviceZone" path="page.separators.serviceZone"/>
<forward name="listQuestionsOrResponsesToCorrect" path="page.list.questionsOrResponsesCorrect.from.serviceZone"/>
</action>
 
<!--<action path="/user/startLoadSurveyNodeGraphs" forward="page.load.survey.node.graphs"/>-->
<!--<action path="/user/startListSurveyStats" forward="/user/surveysControllerFromServiceZone.do?dispatch=listStats"/>-->
<action path="/user/generateEvaluationsPdfFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=generateEvaluationsPdf&amp;from=ServiceZone"/>
<action path="/user/startCorrectAssessmentFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=startCorrect&amp;from=ServiceZone"/>
<action path="/user/startScheduleAssessmentFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=schedule&amp;from=ServiceZone"/>
<action path="/user/startEditScheduleAssessmentFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=editSchedule&amp;from=ServiceZone"/>
<action path="/user/startCloneAssessmentFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=clone&amp;from=ServiceZone"/>
<action path="/user/startEditAssessmentFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=edit&amp;from=ServiceZone"/>
<action path="/user/startListAssessmentsFromServiceZone" forward="page.list.assessments.from.serviceZone"/>
<action path="/user/startSubmitAssessmentFromServiceZone" forward="/user/assessmentsControllerFromServiceZone.do?dispatch=create&amp;from=ServiceZone"/>
<action path="/user/assessmentsControllerFromServiceZone"
type="pt.estgp.estgweb.web.controllers.assessments.AssessmentController"
name="AssessmentsForm"
scope="request"
parameter="dispatch"
input="page.submit.assessment.from.serviceZone"
validate="false">
<forward name="listAssessments" path="page.list.assessments.from.serviceZone"/>
<forward name="loadQuestionResponses" path="page.submit.correct.question.responses.from.serviceZone"/>
<forward name="loadCorrectResponse" path="page.submit.correct.assessment.response.from.serviceZone"/>
<forward name="startCorrect" path="page.configure.correct.assessment.from.serviceZone"/>
<forward name="response" path="page.submit.assessment.response.from.home"/>
<!--<forward name="stats" path="page.list.survey.stats"/>-->
<forward name="schedule" path="page.submit.schedule.from.serviceZone"/>
<forward name="editSchedule" path="page.submit.editSchedule.from.serviceZone"/>
<forward name="serviceZone" path="page.separators.serviceZone"/>
<forward name="from.add.role" path="page.submit.assessment.from.serviceZone"/>
</action>
 
</action-mappings>
 
</struts-config>
/impl/conf/app.properties
442,7 → 442,8
pop.container.use=true
#pop.container.use=false
pop.web.interface=http://mail.estgp.pt/exchange
pop.server=mail.estgp.pt
#pop.server=mail.estgp.pt
pop.server=pop.gmail.com
pop.use.default.server=true
pop.use.username.and.password.first.authentication=true
pop.max.messages=15
575,4 → 576,4
assessments.correctA.0=anonymous
assessments.correctA.1=notAnonymous
assessments.correction.selection.0=question
assessments.correction.selection.1=assessment
assessments.correction.selection.1=assessment
/impl/src/java/pt/estgp/estgweb/services/email/SendEmailService.java
56,10 → 56,12
{
valid=true;
message.addRecipient(email.getType(),new InternetAddress(recipient));
logger.info("Adding recipient to transport:"+recipient);
}
}
if(valid)
{
 
String content = TemplateUtils.getOrLoadTemplate(Globals.TEMPLATE_EMAIL_PATH + "/" + email.getEmailTemplateName());
// Format the mail message
String fullMessage = MessageFormat.format(content, email.getArguments().toArray());
74,7 → 76,9
else
message.setHeader("Content-Type","text/plain; charset=\"utf-8\"");
message.setHeader("Content-Transfer-Encoding", "quoted-printable");
logger.info("Sending email to transport:"+fullMessage);
 
 
Transport.send(message);
}
}
167,7 → 171,16
if(Email.validEmail(u.getOutEmail()))
recipients.add(u.getOutEmail());
}
logger.info("subject: " + subject);
logger.info("user: " + user.getEmail());
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");
return new Email(subject ,recipients,user.getEmail(),template,arguments,Message.RecipientType.BCC);
}
 
/impl/src/java/pt/estgp/estgweb/web/tags/CanManageTag.java
70,7 → 70,9
 
 
IInternal iInternal = (IInternal) owned;
if(userSession.getUser() == null && iInternal.isInternal())
System.out.println("userSession: " + userSession);
System.out.println("iInternal: " + iInternal);
if((userSession==null || userSession.getUser() == null) && iInternal.isInternal())
{
return false;
}
78,10 → 80,10
{
boolean valid = Boolean.parseBoolean(this.valid);
IValid iValid = (IValid) owned;
return owned != null && userSession.getUser() != null && (iValid.isValid() == valid && owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
return owned != null && userSession != null && userSession.getUser() != null && (iValid.isValid() == valid && owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
}
else
return owned != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
return owned != null && userSession != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
 
}