| /impl/src/java/pt/estgp/estgweb/services/courseunits/LoadTeachedUnitsAnnouncementsService.java |
|---|
| 6,6 → 6,7 |
| import pt.estgp.estgweb.domain.dao.DaoFactory; |
| import pt.estgp.estgweb.services.courseunits.impl.DefaultCourseUnitAnnouncements; |
| import pt.estgp.estgweb.Globals; |
| import pt.estgp.estgweb.utils.DatesUtils; |
| import java.util.List; |
| import java.util.ArrayList; |
| 25,17 → 26,28 |
| return courseUnitAnnouncementsLst; |
| Teacher t = DaoFactory.getTeacherDaoImpl().load(userSession.getUser().getId()); |
| Set<CourseUnit> units = t.getTeachedUnits(); |
| DatesUtils.SemestreModerate semestreModerate = DatesUtils.getSemestreModerate(); |
| String semestre = null; |
| if(semestreModerate == DatesUtils.SemestreModerate.S1) |
| semestre = "S1"; |
| else if(semestreModerate == DatesUtils.SemestreModerate.S2) |
| semestre = "S2"; |
| List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadTeachedImportYearSemestreUnits(t.getId(), DatesUtils.getImportYear(),semestre); |
| if(units == null) |
| return courseUnitAnnouncementsLst; |
| for(CourseUnit c: units) |
| { |
| if(c.getAnnouncements() != null && c.getAnnouncements().size()>0) |
| List<Announcement> announcements = DaoFactory.getCourseUnitAnnouncementDaoImpl().loadLastAnnouncements(c.getId(),Globals.HOME_MAX_COURSE_UNIT_ANNOUNCEMENTS,Globals.HOME_COURSE_UNIT_ANNOUNCEMENTS_EXPIRED_DAYS); |
| if(announcements != null && announcements.size()>0) |
| { |
| DefaultCourseUnitAnnouncements courseUnitAnnouncements = new DefaultCourseUnitAnnouncements(); |
| courseUnitAnnouncements.setCourseUnit(c); |
| List<AnnouncementView> announcementViews = new ArrayList<AnnouncementView>(); |
| for(Announcement a :c.getAnnouncements()) |
| for(Announcement a :announcements) |
| { |
| if(announcementViews.size() > Globals.HOME_MAX_COURSE_UNIT_ANNOUNCEMENTS) |
| break; |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/LoadSubscribedUnitsAnnouncementsService.java |
|---|
| 9,6 → 9,7 |
| import pt.estgp.estgweb.domain.dao.DaoFactory; |
| import pt.estgp.estgweb.services.courseunits.impl.DefaultCourseUnitAnnouncements; |
| import pt.estgp.estgweb.Globals; |
| import pt.estgp.estgweb.utils.DatesUtils; |
| import java.util.Set; |
| import java.util.List; |
| 28,17 → 29,26 |
| return courseUnitAnnouncementsLst; |
| Student t = DaoFactory.getStudentDaoImpl().load(userSession.getUser().getId()); |
| Set<CourseUnit> units = t.getSubscribedUnits(); |
| DatesUtils.SemestreModerate semestreModerate = DatesUtils.getSemestreModerate(); |
| String semestre = null; |
| if(semestreModerate == DatesUtils.SemestreModerate.S1) |
| semestre = "S1"; |
| else if(semestreModerate == DatesUtils.SemestreModerate.S2) |
| semestre = "S2"; |
| List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadSubscribedImportYearSemestreUnits(t.getId(), DatesUtils.getImportYear(),semestre); |
| if(units == null) |
| return courseUnitAnnouncementsLst; |
| for(CourseUnit c: units) |
| { |
| if(c.getAnnouncements() != null && c.getAnnouncements().size() > 0) |
| List<Announcement> announcements = DaoFactory.getCourseUnitAnnouncementDaoImpl().loadLastAnnouncements(c.getId(),Globals.HOME_MAX_COURSE_UNIT_ANNOUNCEMENTS,Globals.HOME_COURSE_UNIT_ANNOUNCEMENTS_EXPIRED_DAYS); |
| if(announcements != null && announcements.size() > 0) |
| { |
| DefaultCourseUnitAnnouncements courseUnitAnnouncements = new DefaultCourseUnitAnnouncements(); |
| courseUnitAnnouncements.setCourseUnit(c); |
| List<AnnouncementView> announcementViews = new ArrayList<AnnouncementView>(); |
| for(Announcement a :c.getAnnouncements()) |
| List<AnnouncementView> announcementViews = new ArrayList<AnnouncementView>(); |
| for(Announcement a :announcements) |
| { |
| if(announcementViews.size() > Globals.HOME_MAX_COURSE_UNIT_ANNOUNCEMENTS) |
| break; |