Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1990 → Rev 1991

/branches/grupo3/impl/src/hbm/pt/estgp/estgweb/domain/Course.hbm.xml
80,7 → 80,7
<column name="separatedTurmas" default="false"/>
</property>
 
<!-- 13/12/2017-->
<!-- Documento 13/12/2017 -->
<property name="courseReportDocument" type="text">
<column name="courseReportDocument" sql-type="LONGTEXT"/>
</property>
/branches/grupo3/impl/src/hbm/pt/estgp/estgweb/domain/Configuration.hbm.xml
15,6 → 15,7
<property name="saveDate" type="timestamp"/>
<property name="interfaceImportYear" type="string"/>
 
<!-- -->
<property name="courseReportImportYear" type="string">
<column name="courseReportImportYear" default="201617"/>
</property>
/branches/grupo3/impl/src/web/user/courses/coursereport/templates.jsp
475,7 → 475,7
<thead>
<tr>
<th rowspan="2">Mover</th>
<th rowspan="2">Código</th>
<th rowspan="2">Codigo</th>
<th rowspan="2">Unidade Curricular</th>
<th rowspan="2">Cumprimento do Programa</th>
<th rowspan="2">Alunos Inscritos</th>
664,7 → 664,7
</div>
<div class="form-group clearfix">
<div class="col-md-2 control-label">
<button class="btn btn-default" ng-click="generateChart(comp)">Refrescar/Gerar Gráfico</button>
<button class="btn btn-default" ng-click="generateChart(comp)">Refrescar/Gerar Grafico</button>
</div>
<div class="col-md-10">
<label ng-if="comp.image.identifier"> Limites do PDF </label>
739,7 → 739,7
</div>
<div class="form-group clearfix">
<div class="col-md-2 control-label">
<button class="btn btn-default" ng-click="generateChart(comp)">Refrescar/Gerar Gráfico</button>
<button class="btn btn-default" ng-click="generateChart(comp)">Refrescar/Gerar Grafico</button>
</div>
<div class="col-md-10">
<label ng-if="comp.image.identifier"> Limites do PDF </label>
/branches/grupo3/impl/src/web/user/home/teacher.jsp
80,7 → 80,8
 
 
<div class="panel panel-primary">
<div class="panel-heading"><bean:message key="intranet.course.units"/> - <%=yearFormatted%>
<div class="panel-heading">
<bean:message key="intranet.course.units"/> - <%=yearFormatted%>
</div>
<div class="panel-body">
 
158,6 → 159,8
TeacherImpl tLoggedIn = (TeacherImpl) DaoFactory.getTeacherDaoImpl().get(UserSession.getUser().getId());
boolean hasCommisionsOrCoordinations = tLoggedIn.hasCoordinationsOrBelongToCourseCommissions();
 
request.setAttribute("tLoggedIn",tLoggedIn);
 
AbstractDao.getCurrentSession().getTransaction().commit();
if (hasCommisionsOrCoordinations) {
%>
188,7 → 191,7
<html:link action="/user/startSubmitMessageCourseComission">
Consultar Docentes
</html:link>
</div>-->
</div>-->
<div class="list-group-item">
<html:link
action="/user/startLoadCoursesProgramsFromHome?importYear=${UserSession.nowConfiguration.interfaceImportYear}&forUser=courseCommission">Atalho para as validações (${UserSession.nowConfiguration.interfaceImportYear})</html:link>
203,10 → 206,14
action="/user/courseReportTools?importYear=${UserSession.nowConfiguration.previousInterfaceImportYear}">Utilitários do Relatório de Curso (${UserSession.nowConfiguration.previousInterfaceImportYear})</html:link>
</div>
 
<div class="list-group-item">
<html:link action="/user/editCourseReport.do?courseCode=44&year=${UserSession.nowConfiguration.courseReportImportYear}">Editar o relatório de Curso</html:link>
</div>
<!-- URLS - editar relatorio de curso -->
<logic:iterate id="codCourse" name="tLoggedIn" property="coordinatorCourses" type="pt.estgp.estgweb.domain.Course">
<div class="list-group-item">
<html:link action="/user/editCourseReport.do?courseCode=${codCourse.code}&year=${UserSession.nowConfiguration.courseReportImportYear}">Editar o relatório de Curso do ano (${UserSession.nowConfiguration.courseReportImportYear})</html:link>
</div>
</logic:iterate>
 
 
</div>
<!--</li>
</ul>-->