WebSVN - bacoAlunos - Path Comparison - / Rev 575 and / Rev 582

Ignore whitespace Rev 575 → Rev 582

/impl/conf/WEB-INF/web.xml
282,6 → 282,7
<url-pattern>/user/ajaxapis/ServicosImpressao</url-pattern>
</servlet-mapping>


<!--START FILES-->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>

 /impl/conf/directories/futureStudent.xml
 ,12 → 31,13
                 <leaf absolute="false" url="/public/portal/contactosGabineteComunicacao.html" proxy="estgp" id="contGabinetedeComunicacao" label="Gabinete de Comunicação"></leaf>
         </node>
         <node label="Biblioteca" id="biblioteca" group="1">
-                <leaf absolute="false" url="/public/portal/servicosBiblioteca.html" proxy="estgp" id="servBiblioteca" label="Apresentação"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaInformacaoUtilizador.html" proxy="estgp" id="servBibliotecaInfo" label="Informação"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaMediateca.html" proxy="estgp" id="servBibliotecaMediateca" label="Mediateca"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaclassificacao.html" proxy="estgp" id="servBibliotecaClassificacao" label="Classificação"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaContactos.html" proxy="estgp" id="servBibliotecaBiblioteca" label="Contactos"></leaf>
-                <leaf absolute="true" url="http://porbase.ipportalegre.pt/pacwebestg" proxy="estgp" id="servBibliotecacatalogo" label="Catálogo Online"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaApresentacao.html" proxy="estgp" id="servBiblioteca" label="Apresentação"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaServicos.html" proxy="estgp" id="servBibliotecaServ" label="Serviços"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaColeccoes.html" proxy="estgp" id="servBibliotecaColeccoes" label="Colecções"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaPublico.html" proxy="estgp" id="servBibliotecaPublico" label="Público"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaCatalogos.html" proxy="estgp" id="servBibliotecaCatalogos" label="Catálogos"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaRegulamento.html" proxy="estgp" id="servBiblioteRegulamento" label="Regulamento"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaContactos.html" proxy="estgp" id="servBibliotecaContactos" label="Contactos e Horários"></leaf>
         </node>
         <node label="PALV Erasmus" id="PALVErasmus" group="2">
                 <leaf absolute="false" url="/public/portal/PALVErasmusAlunosEstrangeirosESTG.html" proxy="estgp" id="PALVErasmusAlunosEstrangeiros" label="Os Alunos Estrangeiros na ESTG"></leaf>
 ,9 → 47,11
                 <leaf absolute="false" url="/public/portal/PALVErasmusProgramaErasmus.html" proxy="estgp" id="PALVErasmusProgramaErasmus" label="Programa Serctorial - Erasmus"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusActividadesElegiveis.html" proxy="estgp" id="PALVErasmusActividadesElegiveis" label="Actividades Elegiveis"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusMobilidadeEstudantes.html" proxy="estgp" id="PALVErasmusMobilidadeEstudantes" label="Mobilidade Estudantes"></leaf>
+                <leaf absolute="false" url="/public/portal/PALVErasmusParceirosESTG.html" proxy="estgp" id="PALVErasmusParceiros" label="Parceiros"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusFormularioEstudantes.html" proxy="estgp" id="PALVErasmusFomularioEstudantes" label="Formulários Estudantes"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusContactos.html" proxy="estgp" id="PALVErasmusContactos" label="Contactos"></leaf>
-        </node>
+        </node
         <node label="Orgãos de Gestão" id="OrgaosGestao" group="1">
                 <leaf absolute="false" url="/public/portal/orgaoDirector.html" proxy="estgp" id="orgaosDirector" label="Director"></leaf>
                 <leaf absolute="false" url="/public/portal/orgaosConselhoTecnicoCientifico.html" proxy="estgp" id="orgaosConselhoTecnicoCientifico" label="Conselho Técnico Científico"></leaf>

 /impl/conf/directories/utilsIntranet.xml
 ,7 → 10,8
         <leaf label="Projectos-AA,CA,GE,MKT" id="Projectos.Finais" absolute="false" remoteExtensionRoot="true" style="true" proxy="ionline" layout="true" url="/Intranet/Escola/Secretaria/Projectos.Finais"/>
         <leaf label="Actas" id="Actas" absolute="false" remoteExtensionRoot="true" style="true" proxy="ionline" layout="true" url="/Actas/Arquivo"/>
     </leaf>
-        <leaf absolute="false" label="Horários" layout="true" proxy="estgp" id="horarios" url="/intranet/escola/horarios.html">
+            <leaf absolute="false" label="Horários" layout="true" proxy="estgp" id="horarios" url="/intranet/escola/horarios.html">
+                <leaf absolute="false" label="Horários de CET" layout="true" proxy="estgp" id="horariosCet" url="/intranet/escola/horarios_cets.html"/>
                 <leaf absolute="false" label="Horários de Licenciaturas" layout="true" proxy="estgp" id="horariosLicenciaturas" url="/intranet/escola/horarios_licenciaturas.html"/>
                 <leaf absolute="false" label="Horários de Mestrados" layout="true" proxy="estgp" id="horariosMestrados" url="/intranet/escola/horarios_mestrados.html"/>
                 <leaf absolute="false" label="Horários de Docentes" layout="true" proxy="estgp" id="horariosDocentes" url="/intranet/escola/horarios_Docentes.html"/>

/impl/conf/directories/student.xml
1,70 → 1,72
+
+
+
+ 1
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 /impl/conf/directories/teacher.xml
 ,24 → 23,26
                 <leaf absolute="false" url="/public/portal/contactosGabineteComunicacao.html" proxy="estgp" id="contGabinetedeComunicacao" label="Gabinete de Comunicação"></leaf>
         </node>
         <node label="Biblioteca" id="biblioteca" group="1">
-                <leaf absolute="false" url="/public/portal/servicosBiblioteca.html" proxy="estgp" id="servBiblioteca" label="Apresentação"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaInformacaoUtilizador.html" proxy="estgp" id="servBibliotecaInfo" label="Informação"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaMediateca.html" proxy="estgp" id="servBibliotecaMediateca" label="Mediateca"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaclassificacao.html" proxy="estgp" id="servBibliotecaClassificacao" label="Classificação"></leaf>
-                <leaf absolute="false" url="/public/portal/servicosBibliotecaContactos.html" proxy="estgp" id="servBibliotecaBiblioteca" label="Contactos"></leaf>
-                <leaf absolute="true" url="http://porbase.ipportalegre.pt/pacwebestg" proxy="estgp" id="servBibliotecacatalogo" label="Catálogo Online"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaApresentacao.html" proxy="estgp" id="servBiblioteca" label="Apresentação"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaServicos.html" proxy="estgp" id="servBibliotecaServ" label="Serviços"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaColeccoes.html" proxy="estgp" id="servBibliotecaColeccoes" label="Colecções"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaPublico.html" proxy="estgp" id="servBibliotecaPublico" label="Público"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaCatalogos.html" proxy="estgp" id="servBibliotecaCatalogos" label="Catálogos"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaRegulamento.html" proxy="estgp" id="servBiblioteRegulamento" label="Regulamento"></leaf>
+                <leaf absolute="false" url="/public/portal/servicosBibliotecaContactos.html" proxy="estgp" id="servBibliotecaContactos" label="Contactos e Horários"></leaf>
         </node>
         <node label="PALV Erasmus" id="PALVErasmus" group="2">
-                <leaf absolute="false" url="/public/portal/PALVErasmusDocentesEstrangeirosESTG.html" proxy="estgp" id="PALVErasmusAlunosEstrangeiros" label="Os Docentes Estrangeiros na ESTG"></leaf>
-                <leaf absolute="false" url="/public/portal/PALVErasmusDocentesESTGEstrangeiro.html" proxy="estgp" id="PALVErasmusEstrangeiroDocentes" label="Os Docentes da ESTG no Estrangeiro"></leaf>
+                <leaf absolute="false" url="/public/portal/PALVErasmusAlunosEstrangeirosESTG.html" proxy="estgp" id="PALVErasmusAlunosEstrangeiros" label="Os Alunos Estrangeiros na ESTG"></leaf>
+                <leaf absolute="false" url="/public/portal/PALVErasmusAlunosESTGEstrangeiro.html" proxy="estgp" id="PALVErasmusEstrangeiroAlunos" label="Os Alunos da ESTG no Estrangeiro"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusObjectivos.html" proxy="estgp" id="PALVErasmusObjectivos" label="Objectivos"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusPaises.html" proxy="estgp" id="PALVErasmusPaises" label="Países Participantes"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusProgramaErasmus.html" proxy="estgp" id="PALVErasmusProgramaErasmus" label="Programa Serctorial - Erasmus"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusActividadesElegiveis.html" proxy="estgp" id="PALVErasmusActividadesElegiveis" label="Actividades Elegiveis"></leaf>
-                <leaf absolute="false" url="/public/portal/PALVErasmusMobilidadeDocentes.html" proxy="estgp" id="PALVErasmusMobilidadeDocentes" label="Mobilidade Docentes"></leaf>
-                <leaf absolute="false" url="/public/portal/PALVErasmusFormularioDocentes.html" proxy="estgp" id="PALVErasmusFomularioDocentes" label="Formulários Docentes"></leaf>
+                <leaf absolute="false" url="/public/portal/PALVErasmusMobilidadeEstudantes.html" proxy="estgp" id="PALVErasmusMobilidadeEstudantes" label="Mobilidade Estudantes"></leaf>
+                <leaf absolute="false" url="/public/portal/PALVErasmusParceirosESTG.html" proxy="estgp" id="PALVErasmusParceiros" label="Parceiros"></leaf>
+                <leaf absolute="false" url="/public/portal/PALVErasmusFormularioEstudantes.html" proxy="estgp" id="PALVErasmusFomularioEstudantes" label="Formulários Estudantes"></leaf>
                 <leaf absolute="false" url="/public/portal/PALVErasmusContactos.html" proxy="estgp" id="PALVErasmusContactos" label="Contactos"></leaf>
-        </node>
+        </node
         <node label="Orgãos de Gestão" id="OrgaosGestao" group="1">
                 <leaf absolute="false" url="/public/portal/orgaoDirector.html" proxy="estgp" id="orgaosDirector" label="Director"></leaf>

/impl/src/java/pt/estgp/estgweb/filters/filters/Session.java
54,6 → 54,7
if(userSession != null && new Date().getTime() - userSession.getSaveDate().getTime() < TIMEOUT_SESSION)
{
putSessionInArgs(userSession,request);
userSession.setSaveDate(new Date()); //todo NOVO refrescar a sessao
return;
}
}
75,6 → 76,7
userSession.reset();
}
userSession.setSaveDate(new Date());
userSession.setUpdateDate(new Date());
DaoFactory.getUserSessionDaoImpl().saveOrUpdate(userSession);
putSessionInArgs(userSession,request);
}

 /impl/src/hbm/pt/estgp/estgweb/domain/UserSession.hbm.xml
 ,7 → 11,7
             <generator class="assigned"/>
         </id>
         <discriminator column="discrimitator"/>
-        <timestamp name="updateDate" unsaved-value="null"/>
+        <property name="updateDate" type="timestamp"/>
         <property name="saveDate" type="timestamp"/>
         <property name="ipAddress" type="string"/>
         <property name="language" type="string"/>

 /impl/src/web/user/contacts/listTeachers.jsp
 ,10 → 1,10
 <%@ page import="pt.estgp.estgweb.Globals" %>
-<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-nested.tld" prefix="nested" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%
 ,7 → 88,7
                             ${userView.ext}
                         </td>
                         <td>
-                            ${userView.username}@<%=Globals.EMAIL_LOCAL_SUFFIX%>
+                            ${userView.safeEmail}
                         </td>
                     </tr>
                 </logic:iterate>

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 575 → Rev 582