Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 819 → Rev 831

/impl/conf/language/MessageResourcesCourse.properties
87,6 → 87,6
course.menu.casos=Casos de sucesso
course.menu.parceiros=Parceiros
course.menu.faq=FAQ
course.menu.publicacoes=Publicações
 
 
status=Curso Activo
/impl/src/java/pt/estgp/estgweb/services/email/ReadEmailService.java
20,6 → 20,8
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
 
import org.apache.log4j.Logger;
import jomm.utils.DesUtils;
90,7 → 92,7
 
String host = userSession.getUser().getPop3server();
String username = userSession.getUser().getPop3username();
String password = userSession.getUser().getPop3password(); //DesUtils.getInstance().decrypt(userSession.getUser().getPop3password());
String password = DesUtils.getInstance().decrypt(userSession.getUser().getPop3password()); //DesUtils.getInstance().decrypt(userSession.getUser().getPop3password());
String provider = "pop3";
if (host == null || username == null || password == null || host.trim().length() == 0 || password.trim().length() == 0 || username.trim().length() == 0)
{
110,7 → 112,7
store.connect(host, username, password);
}
Folder inbox = store.getFolder("INBOX");
Folder inbox = store.getFolder("Inbox");
if (inbox == null)
{
logger.warn("No INBOX for user:" + userSession.getUser().getId());
119,13 → 121,41
inbox.open(Folder.READ_ONLY);
List<IPopEmail> popMessages = new ArrayList<IPopEmail>();
int count = inbox.getMessageCount();
final String usernameF = username;
Message[] arrayMessages = inbox.getMessages();
Comparator<Message> messageComparator = new Comparator<Message>() {
public int compare(Message m1, Message m2) {
try {
if (m1.getSentDate() == null || m2.getSentDate() == null)
return 0;
return m2.getSentDate().compareTo(m1.getSentDate());
} catch (MessagingException ex) {
logger.error(ex,ex);
}
return 0;
}
};
 
for (int i = count; i > count - Globals.POP_MAX_MESSAGES && i > 0; i--)
Arrays.sort(arrayMessages, messageComparator);
if(usernameF.startsWith("jmachado"))
for(Message m : arrayMessages)
{
System.out.println("folder " + m.getFolder().getName() + " - " + m.getFolder().getType() + " - " + m.getSubject());
}
System.out.println("arrayMessages.length " + arrayMessages.length);
for (int i = 0; i < Globals.POP_MAX_MESSAGES && i < arrayMessages.length ; i++)
{
 
try
{
Message message = inbox.getMessage(i);
System.out.println("i" + i);
Message message = arrayMessages[i];
System.out.println("folder " + message.getFolder().getName());
DefaultPopEmail popEmail = new DefaultPopEmail();
String date = DatesUtils.getStringFromDate(message.getSentDate());
popEmail.setDate(date);
/impl/src/java/pt/estgp/estgweb/services/profile/CurriculumService.java
1,22 → 1,20
package pt.estgp.estgweb.services.profile;
 
import pt.utl.ist.berserk.logic.serviceManager.IService;
import pt.estgp.estgweb.services.data.RepositoryService;
import pt.estgp.estgweb.services.expceptions.ServiceException;
import pt.estgp.estgweb.domain.views.*;
import jomm.utils.FilesUtils;
import org.apache.log4j.Logger;
import pt.estgp.estgweb.domain.*;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.domain.enums.RecordEnum;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.domain.dao.impl.CourseUnitDaoImpl;
import pt.estgp.estgweb.domain.views.*;
import pt.estgp.estgweb.filters.chains.ResourceAccessControlEnum;
import pt.estgp.estgweb.services.data.RepositoryService;
import pt.estgp.estgweb.services.expceptions.ServiceException;
import pt.estgp.estgweb.utils.DatesUtils;
import org.apache.log4j.Logger;
import pt.utl.ist.berserk.logic.serviceManager.IService;
 
import java.io.InputStream;
import java.util.*;
 
import jomm.utils.FilesUtils;
 
/*
* @author Goncalo Luiz gedl [AT] rnl [DOT] ist [DOT] utl [DOT] pt
*
136,11 → 134,19
userView.setContributorRecords(RecordView.getViews(new ArrayList<Record>(u.getContributorRecords())));
}
 
Set<CourseUnit> responsableCourseUnits = null;
Set<CourseUnit> courseUnits = null;
if(u instanceof Teacher)
{
Teacher teacher = (Teacher) u;
courseUnits = new HashSet<CourseUnit>(DaoFactory.getCourseUnitDaoImpl().loadTeachedImportYearUnits(teacher.getId(), DatesUtils.getImportYear()));
responsableCourseUnits = new HashSet<CourseUnit>(DaoFactory.getCourseUnitDaoImpl().loadResponsableImportYearUnits(teacher.getId(), DatesUtils.getImportYear()));
userView.setResponsableCourseUnits(new ArrayList<CourseUnitView>());
for(CourseUnit c: responsableCourseUnits)
{
CourseUnitView courseUnitView = new CourseUnitView(c);
userView.getResponsableCourseUnits().add(courseUnitView);
}
}
else if(u instanceof Student)
{
/impl/src/java/pt/estgp/estgweb/domain/views/UserView.java
71,6 → 71,8
private List<CourseUnitView> courseUnits;
private List<CourseUnitGradeView> grades;
 
private List<CourseUnitView> responsableCourseUnits;
 
public UserView()
{}
 
123,6 → 125,14
}
}
 
public List<CourseUnitView> getResponsableCourseUnits() {
return responsableCourseUnits;
}
 
public void setResponsableCourseUnits(List<CourseUnitView> responsableCourseUnits) {
this.responsableCourseUnits = responsableCourseUnits;
}
 
public boolean isAutoBlockMode() {
return autoBlockMode;
}
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
101,6 → 101,12
.add(eq("st.id", teacherId)).addOrder(Order.asc("importYear")).addOrder(Order.asc("name")).list();
}
 
public List<CourseUnitImpl> loadResponsableImportYearUnits(long teacherId, String importYear)
{
return createCriteria().add(eq("importYear", importYear))
.add(eq("responsableTeacher.id", teacherId)).addOrder(Order.asc("importYear")).addOrder(Order.asc("name")).list();
}
 
public List<CourseUnit> loadTeachedImportYearSemestreUnits(long teacherId, String importYear, String semestre)
{
Criteria c =createCriteria()
/impl/src/hbm/pt/estgp/estgweb/domain/GenericUser.hbm.xml
122,6 → 122,10
<property name="unitCheck" type="boolean"/>
<property name="academicDegree" type="string"/>
<property name="localRemovedTeachedUnits" type="string"/>
<set name="responsibleUnits" lazy="true" order-by="name">
<key column="responsableTeacher"/>
<one-to-many class="pt.estgp.estgweb.domain.CourseUnit"/>
</set>
<set name="teachedUnits" lazy="true" order-by="courseUnitId" table="teachedunits">
<key column="teacherId"/>
<many-to-many class="pt.estgp.estgweb.domain.CourseUnit" column="courseUnitId"/>
/impl/src/web/public/profile/profileHome.jsp
130,6 → 130,30
<%
}
%>
 
<%
if (ProfileForm.getUserView().getUser() instanceof Teacher)
{
%>
<tr>
<th>
<bean:message key="courseunit.responsable"/>
</th>
<td>
<logic:present name="ProfileForm" property="userView.responsableCourseUnits">
<ul>
<logic:iterate id="courseUnit" name="ProfileForm" property="userView.responsableCourseUnits">
<li>
(<bean:write name="courseUnit" property="importYear"/>) <html:link action="${user}/startLoadCourseUnit${fromAction}?courseUnitView.id=${courseUnit.id}"><bean:write name="courseUnit" property="name"/> (<bean:write name="courseUnit" property="code"/>)</html:link>
</li>
</logic:iterate>
</ul>
</logic:present>
</td>
</tr>
<%
}
%>
</table>
<%
if(ProfileForm.getUserView().getCreatorRecords() != null && ProfileForm.getUserView().getCreatorRecords().size() > 0)
/impl/src/web/public/courses/courseMenu.jsp
24,6 → 24,7
<li><html:link action="/startLoadMenuCourse?type=${CourseView.degree}&courseView.id=${CourseView.id}&content=casos"><bean:message key="course.menu.casos"/></html:link></li>
<li><html:link action="/startLoadMenuCourse?type=${CourseView.degree}&courseView.id=${CourseView.id}&content=parceiros"><bean:message key="course.menu.parceiros"/></html:link></li>
<li><html:link action="/startLoadMenuCourse?type=${CourseView.degree}&courseView.id=${CourseView.id}&content=faq"><bean:message key="course.menu.faq"/></html:link></li>
<li><html:link action="/startLoadMenuCourse?type=${CourseView.degree}&courseView.id=${CourseView.id}&content=publicacoes"><bean:message key="course.menu.publicacoes"/></html:link></li>
</ul>
</div>
</div>