| /impl/conf/WEB-INF/struts/tiles-courseunits.xml |
|---|
| 177,6 → 177,12 |
| <put name="left" value="/user/courseunits/menu.jsp"/> |
| <put name="body" value="/user/courseunits/dossierTecnicoPedagogico.jsp"/> |
| </definition> |
| <definition name="page.courseunit.delete.admin" extends="base.separators.home"> |
| <put name="title" value="Apagar Unidades Curriculares Administração"/> |
| <put name="topnav" value="/admin/courseunits/topnavCourseUnitDeleteAdministration.jsp"/> |
| <put name="body" value="/admin/courseunits/courseUnitDeleteAdministration.jsp"/> |
| </definition> |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/courseunitprogram.fo.xsl |
|---|
| 608,7 → 608,7 |
| </fo:block> |
| </fo:table-cell> |
| <fo:table-cell background-color="#FFF" color="#000" border-bottom="1px solid gray" padding-right="0.1em" display-align="center"> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve"> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve" wrap-option="wrap" white-space-collapse="false" white-space-treatment="preserve"> |
| <xsl:value-of select="$value"/> |
| </fo:block> |
| </fo:table-cell> |
| 646,13 → 646,13 |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve" font-weight="bold"> |
| 1 - <xsl:value-of select="$field1"/> |
| </fo:block> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve"> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve" wrap-option="wrap" white-space-collapse="false" white-space-treatment="preserve"> |
| <xsl:value-of select="$value1"/> |
| </fo:block> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve" font-weight="bold"> |
| 2 - <xsl:value-of select="$field2"/> |
| </fo:block> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve"> |
| <fo:block text-align="left" padding="3pt" linefeed-treatment="preserve" wrap-option="wrap" white-space-collapse="false" white-space-treatment="preserve"> |
| <xsl:value-of select="$value2"/> |
| </fo:block> |
| </fo:table-cell> |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/courseunitevaluation.fo.xsl |
|---|
| 304,20 → 304,20 |
| <fo:table-column/> |
| <fo:table-body> |
| <fo:table-row> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" display-align="center" padding="3pt"><fo:block font-weight="bold"> Apreciação dos resultados quantitativos obtidos pelos estudantes </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block > <xsl:value-of select="//qualApreciacaoQuantitivos"/> </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" display-align="center" padding="3pt"><fo:block font-weight="bold"> Apreciação dos resultados quantitativos obtidos pelos estudantes </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block font-family="monospace" wrap-option="wrap" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve"> <xsl:value-of select="//qualApreciacaoQuantitivos"/> </fo:block> </fo:table-cell> |
| </fo:table-row> |
| <fo:table-row> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" display-align="center" padding="3pt"><fo:block font-weight="bold"> Apreciação do funcionamento da UC (Condições de funcionamento da UC; problemas detetados; identificação de práticas pedagógicas de mérito ou deficientes; etc.) </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block > <xsl:value-of select="//qualApreciacaoUC"/> </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block font-family="monospace" wrap-option="wrap" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve" > <xsl:value-of select="//qualApreciacaoUC"/> </fo:block> </fo:table-cell> |
| </fo:table-row> |
| <fo:table-row> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" display-align="center" padding="3pt"><fo:block font-weight="bold"> Apreciação do cumprimento do programa da UC (Adequação das metodologias de ensino/aprendizagem utilizadas; competências efetivamente adquiridas e cumprimento dos conteúdos planificados) </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block > <xsl:value-of select="//qualApreciacaoCumprimentoPrograma"/> </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block font-family="monospace" wrap-option="wrap" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve" > <xsl:value-of select="//qualApreciacaoCumprimentoPrograma"/> </fo:block> </fo:table-cell> |
| </fo:table-row> |
| <fo:table-row> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" display-align="center" padding="3pt"><fo:block font-weight="bold"> Conclusões (Pontos fortes e fracos; sugestões de melhoria e respetivo plano de ação para a sua concretização) </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block > <xsl:value-of select="//qualConclusoes"/> </fo:block> </fo:table-cell> |
| <fo:table-cell xsl:use-attribute-sets="myBorder" padding="3pt"><fo:block font-family="monospace" wrap-option="wrap" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve"> <xsl:value-of select="//qualConclusoes"/> </fo:block> </fo:table-cell> |
| </fo:table-row> |
| </fo:table-body> |
| </fo:table> |
| /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportStudentsService.java |
|---|
| 442,7 → 442,7 |
| //PASSO 1 |
| Set<CourseUnit> units = new HashSet<CourseUnit>(); |
| Set<CourseUnit> unitsFromSigesPersistentInBaco = new HashSet<CourseUnit>(); |
| ArrayOfDisciplina disciplinas = alunoSiges.getDisciplinasInscrito(); |
| for (Disciplina disciplina : disciplinas.getDisciplina()) |
| { |
| 473,18 → 473,18 |
| logger.warn(msg); |
| } |
| else |
| units.add(courseUnit); |
| unitsFromSigesPersistentInBaco.add(courseUnit); |
| } |
| //PASSO 2 |
| Iterator<CourseUnit> iter = units.iterator(); |
| StudentImpl sImpl = (StudentImpl) DaoFactory.getStudentDaoImpl().narrow(student); |
| //PASSO 2 - Sao retiradas da lista unitsFromSigesPersistentInBaco as que o aluno tem mas que foram removidas localmente |
| Iterator<CourseUnit> iter = unitsFromSigesPersistentInBaco.iterator(); |
| StudentImpl studentImpl = (StudentImpl) DaoFactory.getStudentDaoImpl().narrow(student); |
| while (iter.hasNext()) |
| { |
| CourseUnit courseUnit = iter.next(); |
| //In case of a comming proxy |
| if(sImpl.isLocalRemovedUnit(courseUnit)) |
| if(studentImpl.isLocalRemovedUnit(courseUnit)) |
| { |
| unitsLocallyRemovedNotAdded++; |
| String msg = "Removendo unidade: " + ((CourseUnitImpl)courseUnit).getSigesUniqueIdentifiers() + " - do aluno: " + student.getSigesCode() + " - Associacao existe no SIGES mas foi removido LOCALMENTE"; |
| 494,10 → 494,10 |
| } |
| } |
| //PASSO 3 |
| //PASSO 3 - Sao adicionadas ao aluno as unidades que o aluno ainda nao tiver da lista unitsFromSigesPersistentInBaco |
| if(student.getSubscribedUnits() != null) |
| { |
| for(CourseUnit c: units) |
| for(CourseUnit c: unitsFromSigesPersistentInBaco) |
| { |
| boolean isIn = false; |
| for(CourseUnit tc : student.getSubscribedUnits()) |
| 519,7 → 519,7 |
| } |
| } |
| else |
| student.setSubscribedUnits(units); |
| student.setSubscribedUnits(unitsFromSigesPersistentInBaco); |
| //PASSO 4 |
| //Remover unidades deste ano que nao vem do SIGES e que nao foram adicionadas localmente |
| 537,7 → 537,7 |
| { |
| boolean added = false; |
| for(CourseUnit c: units) |
| for(CourseUnit c: unitsFromSigesPersistentInBaco) |
| { |
| if(cUNow.equals(c)) |
| { |
| 548,7 → 548,7 |
| if(!added) |
| { |
| if(!sImpl.isLocalUnit(cUNow)) |
| if(!studentImpl.isLocalUnit(cUNow)) |
| { |
| String msg = "Removendo unidade: " + ((CourseUnitImpl)cUNow).getSigesUniqueIdentifiers() + " - do aluno: " + student.getSigesCode() + " - Associacao desapareceu do SIGES"; |
| serviceLogInfo(msg); |
| /impl/src/java/pt/estgp/estgweb/domain/views/CourseUnitView.java |
|---|
| 497,6 → 497,10 |
| return summariesJson; |
| } |
| public void setCdTurma(String cdTurma) { |
| this.cdTurma = cdTurma; |
| } |
| List<CourseUnitSummaryView> summariesFromJson = null; |
| /** |
| * |
| /impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java |
|---|
| 94,11 → 94,15 |
| if(anotherInstance instanceof CourseUnitImpl) |
| { |
| CourseUnitImpl anCourseUnit = (CourseUnitImpl) anotherInstance; |
| boolean turmaVazia =getCdTurma() == null || getCdTurma().trim().length() == 0; |
| boolean anotherTurmaVazia = anCourseUnit.getCdTurma() == null || anCourseUnit.getCdTurma().trim().length() == 0; |
| boolean turmasIguais = (turmaVazia && anotherTurmaVazia) || (!turmaVazia && !anotherTurmaVazia && getCdTurma().equals(anCourseUnit.getCdTurma())); |
| return anCourseUnit.getCode() != null && getCode() != null && getCode().equals(anCourseUnit.getCode()) && |
| anCourseUnit.getCourseCode() != null && getCourseCode() != null && getCourseCode().equals(anCourseUnit.getCourseCode()) && |
| anCourseUnit.getSemestre() != null && getSemestre() != null && getSemestre().equals(anCourseUnit.getSemestre()) && |
| anCourseUnit.getImportYear() != null && getImportYear() != null && getImportYear().equals(anCourseUnit.getImportYear()) && |
| anCourseUnit.getCdTurma() != null && getCdTurma() != null && getCdTurma().equals(anCourseUnit.getCdTurma()); |
| turmasIguais; |
| } |
| return false; |
| /impl/src/web/user/courseunits/courseunitEvaluation.jsp |
|---|
| 322,7 → 322,8 |
| function serData() |
| { |
| var data = $("#formEval").serialize(); |
| var data = $("#formEval").serialize().replace(/%0D%0A/g, '%0A').replace(/\r?\n/g, "\r\n"); |
| //alert(data); |
| $("#dispatch").val("saveEvaluation"); |
| //alert($("#dispatch").val()) |
| $("#autosave").html("Enviando...") |
| 340,7 → 341,7 |
| </script> |
| <div> |
| <a href="<%=request.getContextPath()%>/user/data.jsp?id=16606">Ver versões salvas pelos docentes</a> |
| <a target="_blank" href="<%=request.getContextPath()%>/user/data.jsp?id=<%=CourseUnitView.getEvaluationStreamId()%>">Ver versões salvas pelos docentes</a> |
| </div> |
| <div id="formEdit"> |
| <html:form styleId="formEval" action="/user/courseUnitEvaluationController"> |
| /impl/src/web/user/courseunits/courseunit.jsp |
|---|
| 172,31 → 172,32 |
| <div class="list-group-item"> |
| <logic:present name="CourseUnitView" property="programStreamId"> |
| <a href="<%=request.getContextPath()%>/repositoryStream/${CourseUnitView.programStreamId}"><bean:message key="courseunit.programfilepath"/></a> <!--(${CourseUnitView.programSize} Kb)--> |
| </logic:present> |
| <%--<logic:equal value="true" name="CourseUnitView" property="validProgram"> |
| (<bean:message key="courseunit.programfile.valid"/>) |
| </logic:equal>--%> |
| <logic:equal value="false" name="CourseUnitView" property="validProgram"> |
| (<label style="color:red">Não validada pela Comissão de Curso</label>) |
| </logic:equal> |
| <%--<logic:equal value="true" name="CourseUnitView" property="validProgram"> |
| (<bean:message key="courseunit.programfile.valid"/>) |
| </logic:equal>--%> |
| <logic:equal value="false" name="CourseUnitView" property="validProgram"> |
| (<label style="color:red">Não validada pela Comissão de Curso</label>) |
| </logic:equal> |
| <baco:isNotAdmin> |
| <logic:notEqual value="${CourseUnitView.coordinatorId}" name="UserSession" property="user.id"> |
| <baco:isTeacherOfCourseUnit courseUnitId="${CourseUnitView.id}"> |
| <logic:equal value="false" name="CourseUnitView" property="validProgram"> |
| <span class="badge"> <html:link action="/startLoadCourseUnitProgram?courseUnitId=${CourseUnitView.id}"><span class="glyphicon glyphicon-pencil"></span></html:link></span> |
| </logic:equal> |
| </baco:isTeacherOfCourseUnit> |
| </logic:notEqual> |
| <logic:equal value="${CourseUnitView.coordinatorId}" name="UserSession" property="user.id"> |
| <baco:isNotAdmin> |
| <logic:notEqual value="${CourseUnitView.coordinatorId}" name="UserSession" property="user.id"> |
| <baco:isTeacherOfCourseUnit courseUnitId="${CourseUnitView.id}"> |
| <logic:equal value="false" name="CourseUnitView" property="validProgram"> |
| <span class="badge"><html:link action="/startLoadCourseUnitProgram?courseUnitId=${CourseUnitView.id}"><span class="glyphicon glyphicon-pencil"></span></html:link></span> |
| <span class="badge"> <html:link action="/startLoadCourseUnitProgram?courseUnitId=${CourseUnitView.id}"><span class="glyphicon glyphicon-pencil"></span></html:link></span> |
| </logic:equal> |
| </baco:isTeacherOfCourseUnit> |
| </logic:notEqual> |
| <logic:equal value="${CourseUnitView.coordinatorId}" name="UserSession" property="user.id"> |
| <logic:equal value="false" name="CourseUnitView" property="validProgram"> |
| <span class="badge"><html:link action="/startLoadCourseUnitProgram?courseUnitId=${CourseUnitView.id}"><span class="glyphicon glyphicon-pencil"></span></html:link></span> |
| </logic:equal> |
| </baco:isNotAdmin> |
| <baco:isAdmin> |
| <html:link styleClass="btn btn-warning" action="/startLoadCourseUnitProgram?courseUnitId=${CourseUnitView.id}"><span class="glyphicon glyphicon-pencil"></span></html:link> |
| </baco:isAdmin> |
| </logic:equal> |
| </baco:isNotAdmin> |
| <baco:isAdmin> |
| <html:link styleClass="btn btn-warning" action="/startLoadCourseUnitProgram?courseUnitId=${CourseUnitView.id}"><span class="glyphicon glyphicon-pencil"></span></html:link> |
| </baco:isAdmin> |
| <logic:present name="CourseUnitView" property="programStreamId"> |
| <span class="badge" style="overflow: auto;display: inline-flex;height: 20px;"><a href="<%=request.getContextPath()%>/repositoryStream/${CourseUnitView.programStreamId}"><img src="<%=request.getContextPath()%>/imgs/mime/pdf.gif"/></a></span> |
| </logic:present> |
| <logic:notPresent name="CourseUnitView" property="programStreamId"> |
| /impl/src/web/user/home/teacher.jsp |
|---|
| 173,7 → 173,7 |
| for(CourseUnit cu: programs) |
| { |
| %> |
| <li><a href="<%=request.getContextPath()%>/user/startLoadCourseUnitEvaluation.do?courseUnitId=<%=cu.getId()%>"><%=cu.getName()%>/<%=cu.getCode()%> (<%=cu.getCourseName() + "/" +cu.getCourseCode() +"/" + cu.getCdTurma()%>)</a></li> |
| <li><a href="<%=request.getContextPath()%>/startLoadCourseUnitProgram.do?courseUnitView.id=<%=cu.getId()%>"><%=cu.getName()%>/<%=cu.getCode()%> (<%=cu.getCourseName() + "/" +cu.getCourseCode() +"/" + cu.getCdTurma()%>)</a></li> |
| <% |
| } |
| %> |
| /impl/src/web/user/home/user.jsp |
|---|
| 25,7 → 25,7 |
| <div class="panel-body"> |
| <!--<p><bean:message key="intranet.home.curricular"/></p>--> |
| <ul> |
| <li><html:link action="/user/coursePedagogicContents"><bean:message key="course.pedagogic.contents.admin"/> </html:link></li> |
| <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> |
| 41,6 → 41,10 |
| <div class="panel-heading">Ferramentas Académicas</div> |
| <div class="panel-body"> |
| <ul> |
| <baco:isAdmin> |
| <li><html:link action="/admin/courseUnitsDeleteAdmin">Administração de Unidades Curriculares (Remoções)</html:link></li> |
| </baco:isAdmin> |
| <li><html:link action="/user/coursePedagogicContents"><bean:message key="course.pedagogic.contents.admin"/> </html:link></li> |
| <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> |
| /impl/src/web/user/data.jsp |
|---|
| 81,7 → 81,7 |
| </table> |
| <div id="footer"> |
| <tiles:insert attribute="footer"/> |
| <jsp:include page="/layout/footer.jsp"/> |
| <!-- Fundo --> |
| </div> |