| /impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitEvaluation.java |
|---|
| 57,6 → 57,7 |
| CourseUnit c = DaoFactory.getCourseUnitDaoImpl().get(coursUnitId); |
| CourseUnitEvaluation evaluation = c.getCourseUnitEvaluation(); |
| if(evaluation == null) |
| { |
| 127,11 → 128,13 |
| //NOVO |
| /* |
| if(cuv.isClosed()) |
| { |
| RepositoryFileImpl repoFile = repositoryService.loadView(cu.getEvaluationStreamId()); |
| sendPdfFtpIonline(cu,errors,userSession,path,repoFile.getLastVersion().getSaveDate(),null); |
| } |
| */ |
| } |
| public String generatePdf(CourseUnitEvaluation cuv, CourseUnit c) throws IOException, TransformerException, FOPException { |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/LoadCourseUnitService.java |
|---|
| 42,8 → 42,9 |
| public CourseUnitView run(long id, boolean initTeachers, boolean initStudents, boolean initBlog, UserSession userSession) throws ServiceException |
| { |
| CourseUnit c = DaoFactory.getCourseUnitDaoImpl().get(id); |
| c.setCourseUnitEvaluation(DaoFactory.getCourseUnitEvaluationDaoImpl().narrow(c.getCourseUnitEvaluation())); |
| c.setCourseUnitProgram(DaoFactory.getCourseUnitProgramDaoImpl().narrow(c.getCourseUnitProgram())); |
| if(c == null) |
| return null; |
| CourseUnitView cV = new CourseUnitView(c,initTeachers,initStudents,initBlog); |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/CreateCourseUnitAdminService.java |
|---|
| 1,16 → 1,14 |
| package pt.estgp.estgweb.services.courseunits; |
| import pt.utl.ist.berserk.logic.serviceManager.IService; |
| import pt.estgp.estgweb.domain.views.CourseUnitView; |
| import pt.estgp.estgweb.domain.views.CourseUnitAssignementView; |
| import pt.estgp.estgweb.domain.UserSession; |
| import org.apache.log4j.Logger; |
| import pt.estgp.estgweb.Globals; |
| import pt.estgp.estgweb.domain.CourseUnit; |
| import pt.estgp.estgweb.domain.CourseUnitAssignement; |
| import pt.estgp.estgweb.domain.DomainObjectFactory; |
| import pt.estgp.estgweb.domain.UserSession; |
| import pt.estgp.estgweb.domain.dao.DaoFactory; |
| import pt.estgp.estgweb.domain.views.CourseUnitView; |
| import pt.estgp.estgweb.services.expceptions.ServiceException; |
| import pt.estgp.estgweb.Globals; |
| import org.apache.log4j.Logger; |
| import pt.utl.ist.berserk.logic.serviceManager.IService; |
| /* |
| * @author Goncalo Luiz gedl [AT] rnl [DOT] ist [DOT] utl [DOT] pt |
| 38,7 → 36,12 |
| CourseUnit courseUnit; |
| if(cUV.getId() > 0) |
| { |
| courseUnit = DaoFactory.getCourseUnitDaoImpl().get(cUV.getId()); |
| courseUnit.setCourseUnitEvaluation(DaoFactory.getCourseUnitEvaluationDaoImpl().narrow(courseUnit.getCourseUnitEvaluation())); |
| courseUnit.setCourseUnitProgram(DaoFactory.getCourseUnitProgramDaoImpl().narrow(courseUnit.getCourseUnitProgram())); |
| } |
| else |
| { |
| courseUnit = DomainObjectFactory.createCourseUnitImpl(); |
| /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportStudentsService.java |
|---|
| 135,7 → 135,7 |
| List<String> arguments = new ArrayList<String>(); |
| String cause = e.getCause() == null ? "" : e.getCause().toString(); |
| arguments.add((e.toString() + "\n" + cause).replace("\n","<br/>")); |
| Email email = new Email("Erro de importação de alunos",emails,"baco@estgp.pt","messageToAdmin_pt.txt",arguments); |
| Email email = new Email("Erro de importa��o de alunos",emails,"baco@estgp.pt","messageToAdmin_pt.txt",arguments); |
| new SendEmailService().sendEmail(email); |
| } |
| 268,7 → 268,7 |
| public static void main(String[] args) throws ServiceException |
| { |
| String year = DatesUtils.getImportYear(); |
| System.out.println("YEAR:" + year); |
| System.out.println("YEAR:" + year); |
| if(args != null && args.length > 0) |
| year = args[0]; |
| new ImportStudentsService().run(year); |
| /impl/src/java/pt/estgp/estgweb/services/sigesimports/SincronizeLastYearCourseUnitProgramsService.java |
|---|
| 107,7 → 107,8 |
| if(novaFicha || (!cu.isValidProgram() && !cloneOnlyNews)) |
| { |
| updated++; |
| ((CourseUnitProgramImpl)cu.getCourseUnitProgram()).cloneFrom(cuOld.getCourseUnitProgram()); |
| CourseUnitProgramImpl cProgram = (CourseUnitProgramImpl) DaoFactory.getCourseUnitProgramDaoImpl().narrow(cu.getCourseUnitProgram()); |
| cProgram.cloneFrom(cuOld.getCourseUnitProgram()); |
| List<String> errors = new ArrayList<String>(); |
| service.createPdf(cu,errors); |
| } |
| 243,9 → 244,10 |
| cuInto.setValidProgram(false); |
| } |
| logger.info("AQUI"); |
| ((CourseUnitProgramImpl)cuInto.getCourseUnitProgram()).cloneFrom(cuFrom.getCourseUnitProgram()); |
| DaoFactory.getCourseUnitProgramDaoImpl().saveOrUpdate(((CourseUnitProgramImpl)cuInto.getCourseUnitProgram())); |
| DaoFactory.getCourseUnitProgramPart2DaoImpl().saveOrUpdate(((CourseUnitProgramImpl)cuInto.getCourseUnitProgram()).getCourseUnitProgramPart2()); |
| CourseUnitProgramImpl cProgram = (CourseUnitProgramImpl) DaoFactory.getCourseUnitProgramDaoImpl().narrow(cuInto.getCourseUnitProgram()); |
| cProgram.cloneFrom(cuFrom.getCourseUnitProgram()); |
| DaoFactory.getCourseUnitProgramDaoImpl().saveOrUpdate((cuInto.getCourseUnitProgram())); |
| DaoFactory.getCourseUnitProgramPart2DaoImpl().saveOrUpdate((cuInto.getCourseUnitProgram()).getCourseUnitProgramPart2()); |
| SaveCourseUnitProgram service = new SaveCourseUnitProgram(); |
| List<String> errors = new ArrayList<String>(); |
| /impl/src/web/user/courseunits/courseunit.jsp |
|---|
| 30,11 → 30,13 |
| <jomm:messages/> |
| <div id="contentPane"> |
| <h1>${CourseUnitView.name} (${CourseUnitView.code}) - (${CourseUnitView.semestre})</h1> |
| <h1>${CourseUnitView.name} (${CourseUnitView.code}) - (${CourseUnitView.semestre}) - ${CourseUnitView.importYear})</h1> |
| <table width="100%" cellpadding="0" cellspacing="2" border="0"> |
| <tr> |
| <td valign="top" class="seccao"> |
| <label class="WARNING">Atenção o relatório de avaliação deve ser preenchido no ano 2014-2015 (Entrar no 2014-2015 pelo menu lateral esquerdo antes de clicar em relatório de avaliação e confirmar no titulo da unidade).</label> |
| <baco:hasRole role="admin,all,services"> |
| <ul> |
| <li> |
| /impl/src/web/user/courseunits/menu.jsp |
|---|
| 71,9 → 71,9 |
| if(CourseUnitView.getResponsableTeacher().getId() == UserSession.getUser().getId() |
| || |
| CourseUnitView.isOwnedBy(UserSession.getUser(),false) |
| // || |
| //Validation Role e o papel da comissão de curso |
| //UserSession.getUser().hasRole(CourseUnitView.getCourseView().getValidationRole()) |
| || |
| // Validation Role e o papel da comissão de curso |
| UserSession.getUser().hasRole(CourseUnitView.getCourseView().getValidationRole()) |
| ) |
| { |
| %> |