Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1050 → Rev 1051

/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportStudentsService.java
323,6 → 323,7
else
{
student.setPropinasEmDia(false);
student.setPropinasEmDiaYear(activeImportYear);
 
for(AlunoHistorico hist: alunoSiges.getHistoricos().getAlunoHistorico())
{
331,6 → 332,7
if(hist.getPropinaEmDia().equalsIgnoreCase("s"))
{
student.setPropinasEmDia(true);
student.setPropinasEmDiaYear(activeImportYear);
}
break;
}
/impl/src/java/pt/estgp/estgweb/services/sigesimports/LoadSumariesToPDF.java
67,7 → 67,7
}
AbstractDao.getCurrentSession().beginTransaction();
CourseUnit c = DaoFactory.getCourseUnitDaoImpl().get(courseUnitId);
ArrayOfAula arrayOfAulas = service.getSiGesWEBSoap().getAulas(new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), c.getImportYear(),c.getCode(),c.getSemestre());
ArrayOfAula arrayOfAulas = service.getSiGesWEBSoap().getAulas(new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), c.getImportYear(),c.getCode(),c.getSemestre(),c.getCourse().getCode());
 
if(arrayOfAulas != null && arrayOfAulas.getAula() != null)
{
139,7 → 139,7
//comentario de teste
try
{
arrayOfAulas = service.getSiGesWEBSoap().getAulas(new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), year,c.getCode(),DatesUtils.getSemestre());
arrayOfAulas = service.getSiGesWEBSoap().getAulas(new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), year,c.getCode(),DatesUtils.getSemestre(),c.getCourse().getCode());
break;
}
catch(Throwable t)
/impl/src/hbm/pt/estgp/estgweb/domain/GenericUser.hbm.xml
105,6 → 105,9
<property name="propinasEmDia" type="boolean" >
<column name="propinasEmDia" default="false"/>
</property>
<property name="propinasEmDiaYear" type="string" >
<column name="propinasEmDiaYear" length="10"/>
</property>
<set name="subscribedUnits" lazy="true" order-by="courseUnitId" table="subscribedunits">
<key column="studentId"/>
<many-to-many class="pt.estgp.estgweb.domain.CourseUnit" column="courseUnitId"/>
/impl/src/web/user/home/user.jsp
7,30 → 7,112
<%@ 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.UserSession" scope="request"/>
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/variables.less"/>
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/lavish-bootstrap.css"/>
 
 
<div class="portal">
<table class="columnTable" width="100%">
<tbody>
<tr>
 
<baco:hasRole role="services">
<td class="column">
<div class="block">
<div class="block">
<div class="panel panel-primary">
<div class="panel-heading"><bean:message key="intranet.home.curricular"/></div>
<div class="panel-body">
<!--<p><bean:message key="intranet.home.curricular"/></p>-->
<ul>
<li><html:link action="/user/startLoadCoursesProgramsFromHome"><bean:message key="courseunit.indexes"/> (Novo Estilo) </html:link></li>
<baco:hasRole role="admin,all,services,administrativeCouncil,courseCoordinator,courseDirector,scientificCouncil,pedagogicCouncil">
<li><html:link action="/user/startSelectCourseFromServiceZone"><bean:message key="course.select"/></html:link></li>
<li><html:link action="/user/startFindCourseUnitAdminFromServiceZone"><bean:message key="courseunit.search"/></html:link></li>
</baco:hasRole>
</ul>
</div>
</div>
</div>
<baco:hasRole role="admin,all,services">
<div class="block">
<div class="panel panel-primary">
<div class="panel-heading">Ferramentas Académicas</div>
<div class="panel-body">
<ul>
<li><html:link action="/user/configurationGrades">Épocas de Avaliação</html:link></li>
<li>Situação de Propinas de Alunos (Por implementar)</li>
<li><html:link action="/user/findProfile"><bean:message key="profile.search.user"/></html:link></li>
<li>Gerir Papeis das Comissões Curso (Por Implementar)</li>
</ul>
 
</div>
</div>
</div>
</baco:hasRole>
 
<baco:hasRole role="ci">
<div class="block">
<div class="panel panel-primary">
<div class="panel-heading">Ferramentas de Gestão do CI</div>
<div class="panel-body">
<ul>
<li>Configurações Gerais (Por implementar)</li>
<li>Tarefas Agendadas (Por implementar)</li>
<li>Criar um Backup SQL Agora (Por Implementar)</li>
<baco:isModuleOn module="intranet">
<li>
<html:link target="_blank" action="/user/courseUnitControllerAdminFromServiceZone?dispatch=createIntranetFolders">
<bean:message key="intranet.create.folders"/>
</html:link>
</li>
</baco:isModuleOn>
 
</ul>
 
</div>
</div>
</div>
</baco:hasRole>
 
 
 
</div>
</td>
</baco:hasRole>
<td class="column">
<baco:isModuleOn module="todos">
<jsp:include page="/user/home/todos.jsp"/>
</baco:isModuleOn>
</td>
</tr>
<baco:hasRole role="services">
<tr>
<td>
<div class="block">
<p><bean:message key="intranet.home.curricular"/></p>
<ul>
<li>
<html:link action="/user/startLoadCoursesProgramsFromHome"><bean:message key="courseunit.programs"/></html:link>
</li>
</ul>
<div class="panel panel-primary">
<div class="panel-heading">Comunicar</div>
<div class="panel-body">
<ul>
 
<baco:isModuleOn module="todos">
<baco:hasRole role="admin,all,services,administrativeCouncil,courseCoordinator,courseDirector,scientificCouncil,pedagogicCouncil">
<li>
<html:link action="/user/startSubmitTodoAnnouncementFromServiceZone">
<bean:message key="submit.todo.announcement"/>
</html:link>
</li>
 
</baco:hasRole>
<baco:hasRole role="admin,all,services,sendMailMessages">
<li>
<html:link action="/user/startSubmitMessage">
<bean:message key="submit.todo.message"/>
</html:link>
</li>
</baco:hasRole>
</baco:isModuleOn>
</ul>
 
</div>
</div>
</div>
</td>
</tr>
</baco:hasRole>
</tbody>
</table>
</div>
/impl/src/web/user/serviceZone/topnavConfigurationGrades.jsp
4,7 → 4,7
<%@ page import="jomm.web.utils.TopNav" %>
<%
TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
topNav.addNavPlace("/user/startServiceZone.do", "intranet.separator.service.zone.back");
topNav.addNavPlace("/user/startHome.do", "intranet.separator.home.back");
topNav.addNavPlace(null, "configuration.grades");
%>
<jsp:include page="/layout/topnav.jsp"/>