Commit ef7fecf2 authored by didonet's avatar didonet
Browse files

Added attributes to the travel requisition class.

Changed the type of the "program" attribute at SectionPos and Course
parent c15b69e2
...@@ -98,7 +98,7 @@ public class Configuration { ...@@ -98,7 +98,7 @@ public class Configuration {
//- alerta para requisicoes de viagem //- alerta para requisicoes de viagem
public static Object findAllOpenTravelRequisitions(){ public static Object findAllOpenTravelRequisitions(){
return entityManager().createNativeQuery( return entityManager().createNativeQuery(
"select * from travel_requisition where request_status = 'Aberta'", TravelRequisition.class).getResultList(); "select * from travel_requisition where request_status = 'Aberta' OR request_status = 'Confirmada'", TravelRequisition.class).getResultList();
} }
//- mostrar perto da data final de bolsa //- mostrar perto da data final de bolsa
......
...@@ -4,6 +4,7 @@ import java.util.HashSet; ...@@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.springframework.roo.addon.entity.RooEntity; import org.springframework.roo.addon.entity.RooEntity;
...@@ -25,6 +26,7 @@ public class Course { ...@@ -25,6 +26,7 @@ public class Course {
private Integer workload; private Integer workload;
@Column(columnDefinition="text")
private String program; private String program;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "course") @OneToMany(cascade = CascadeType.ALL, mappedBy = "course")
......
...@@ -40,16 +40,22 @@ public class Recommendation { ...@@ -40,16 +40,22 @@ public class Recommendation {
* Relacionamento com colegas e professores: * Relacionamento com colegas e professores:
* Capacidade de expressão oral: * Capacidade de expressão oral:
* Capacidade de expressão escrita: */ * Capacidade de expressão escrita: */
@Column(columnDefinition="text")
private String interest; private String interest;
@Column(columnDefinition="text")
private String persistence; private String persistence;
@Column(columnDefinition="text")
private String intelectualCapability; private String intelectualCapability;
@Column(columnDefinition="text")
private String relationshipCoWorkers; private String relationshipCoWorkers;
@Column(columnDefinition="text")
private String vocalExpression; private String vocalExpression;
@Column(columnDefinition="text")
private String writingExpression; private String writingExpression;
/* 5) Descreva o potencial e a habilidade do candidato para uma carreira científica (uma descrição de pontos positivos e negativos é mais útil que comentários genéricos). */ /* 5) Descreva o potencial e a habilidade do candidato para uma carreira científica (uma descrição de pontos positivos e negativos é mais útil que comentários genéricos). */
......
...@@ -4,6 +4,7 @@ import java.util.HashSet; ...@@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.persistence.Column;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -33,6 +34,7 @@ public class SectionPos { ...@@ -33,6 +34,7 @@ public class SectionPos {
@ManyToOne @ManyToOne
private Course course; private Course course;
@Column(columnDefinition="text")
private String program; private String program;
@ManyToOne @ManyToOne
......
...@@ -144,7 +144,7 @@ public class Subscription { ...@@ -144,7 +144,7 @@ public class Subscription {
Outros: Qual? lê ( ) entende ( ) fala ( ) escreve ( )*/ Outros: Qual? lê ( ) entende ( ) fala ( ) escreve ( )*/
//10) Quais são suas motivações para fazer o Mestrado/Doutorado em Informática? //10) Quais são suas motivações para fazer o Mestrado/Doutorado em Informática?
@Column(columnDefinition="alter table Subscription change motivations motivations text") @Column(columnDefinition="text")
private String motivations; private String motivations;
//11) Recomendação: //11) Recomendação:
......
...@@ -76,10 +76,15 @@ public class TravelRequisition { ...@@ -76,10 +76,15 @@ public class TravelRequisition {
private TicketKind ticketKind; private TicketKind ticketKind;
private String destinations; private String destinations;
private String tripStartDate; //valor só da passagem
@Temporal(TemporalType.DATE)
private String tripEndDate; @DateTimeFormat(style = "S-")
private Date ticketStartDate;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date ticketEndDate;
private String ticketValue; private String ticketValue;
...@@ -90,6 +95,8 @@ public class TravelRequisition { ...@@ -90,6 +95,8 @@ public class TravelRequisition {
private String observations; private String observations;
private String ticketPurchasePrice;
public static Object findTravelRequisitions(String requestStatus, String year) { public static Object findTravelRequisitions(String requestStatus, String year) {
String sql = ""; String sql = "";
if (!requestStatus.isEmpty()) if (!requestStatus.isEmpty())
...@@ -158,7 +165,7 @@ public class TravelRequisition { ...@@ -158,7 +165,7 @@ public class TravelRequisition {
phr = new Phrase("Unidade: ", ReportUtil.getNormalTextFont()); phr = new Phrase("Unidade: ", ReportUtil.getNormalTextFont());
p.add(phr); p.add(phr);
Professor prof = Professor.findProfessor(person.getId()); Professor prof = Professor.findProfessor(person.getId());
if (prof != null) { if (prof != null && prof.getSiape() != null) {
phr = new Phrase(" Matrícula SIAPE: "+prof.getSiape(), ReportUtil.getNormalTextFont()); phr = new Phrase(" Matrícula SIAPE: "+prof.getSiape(), ReportUtil.getNormalTextFont());
p.add(phr); p.add(phr);
} }
...@@ -274,7 +281,7 @@ public class TravelRequisition { ...@@ -274,7 +281,7 @@ public class TravelRequisition {
document.add(p); document.add(p);
p = new Paragraph("( ) Pagar diárias no Caravelle Licitado ( ) Apenas efetuar reserva no Hotel Licitado", ReportUtil.getNormalTextFont()); p = new Paragraph("( ) Pagar diárias no Caravelle Licitado ( ) Apenas efetuar reserva no Hotel Licitado", ReportUtil.getNormalTextFont());
document.add(p); document.add(p);
p = new Paragraph("Valor das diárias (preenchido pela PRPPG) ", ReportUtil.getNormalTextFont()); p = new Paragraph("Valor das diárias (preenchido pela PRPPG): ", ReportUtil.getNormalTextFont());
document.add(p); document.add(p);
//3 – DIÁRIAS (Em caso de opção pelo pagamento do Hotel licitado NÃO será pago diárias na conta do beneficiário) //3 – DIÁRIAS (Em caso de opção pelo pagamento do Hotel licitado NÃO será pago diárias na conta do beneficiário)
...@@ -290,9 +297,9 @@ public class TravelRequisition { ...@@ -290,9 +297,9 @@ public class TravelRequisition {
document.add(p); document.add(p);
p = new Paragraph("TRECHO: "+tr.destinations, ReportUtil.getNormalTextFont()); p = new Paragraph("TRECHO: "+tr.destinations, ReportUtil.getNormalTextFont());
document.add(p); document.add(p);
p = new Paragraph("SAÍDA: "+tr.tripStartDate, ReportUtil.getNormalTextFont()); p = new Paragraph("SAÍDA: "+tr.ticketStartDate, ReportUtil.getNormalTextFont());
document.add(p); document.add(p);
p = new Paragraph("RETORNO: "+tr.tripEndDate, ReportUtil.getNormalTextFont()); p = new Paragraph("RETORNO: "+tr.ticketEndDate, ReportUtil.getNormalTextFont());
document.add(p); document.add(p);
p = new Paragraph(); p = new Paragraph();
...@@ -300,7 +307,7 @@ public class TravelRequisition { ...@@ -300,7 +307,7 @@ public class TravelRequisition {
p.add(phr); p.add(phr);
if (tr.ticketValue != null) { if (tr.ticketValue != null) {
phr = new Phrase(tr.ticketValue, ReportUtil.getNormalTextFont()); phr = new Phrase(tr.ticketValue.toString(), ReportUtil.getNormalTextFont());
p.add(phr); p.add(phr);
} }
......
...@@ -31,6 +31,14 @@ privileged aspect TravelRequisition_Roo_JavaBean { ...@@ -31,6 +31,14 @@ privileged aspect TravelRequisition_Roo_JavaBean {
public String TravelRequisition.getProfession() { public String TravelRequisition.getProfession() {
return this.profession; return this.profession;
}
public String TravelRequisition.getTicketPurchasePrice (){
return this.ticketPurchasePrice;
}
public void TravelRequisition.setTicketPurchasePrice(String ticketPurchasePrice){
this.ticketPurchasePrice = ticketPurchasePrice;
} }
public void TravelRequisition.setProfession(String profession) { public void TravelRequisition.setProfession(String profession) {
...@@ -125,20 +133,20 @@ privileged aspect TravelRequisition_Roo_JavaBean { ...@@ -125,20 +133,20 @@ privileged aspect TravelRequisition_Roo_JavaBean {
this.destinations = destinations; this.destinations = destinations;
} }
public String TravelRequisition.getTripStartDate() { public Date TravelRequisition.getTicketStartDate() {
return this.tripStartDate; return this.ticketStartDate;
} }
public void TravelRequisition.setTripStartDate(String tripStartDate) { public void TravelRequisition.setTicketStartDate(Date ticketStartDate) {
this.tripStartDate = tripStartDate; this.ticketStartDate = ticketStartDate;
} }
public String TravelRequisition.getTripEndDate() { public Date TravelRequisition.getTicketEndDate() {
return this.tripEndDate; return this.ticketEndDate;
} }
public void TravelRequisition.setTripEndDate(String tripEndDate) { public void TravelRequisition.setTicketEndDate(Date ticketEndDate) {
this.tripEndDate = tripEndDate; this.ticketEndDate = ticketEndDate;
} }
public String TravelRequisition.getTicketValue() { public String TravelRequisition.getTicketValue() {
......
...@@ -25,9 +25,9 @@ privileged aspect TravelRequisition_Roo_ToString { ...@@ -25,9 +25,9 @@ privileged aspect TravelRequisition_Roo_ToString {
sb.append("TicketKind: ").append(getTicketKind()).append(", "); sb.append("TicketKind: ").append(getTicketKind()).append(", ");
sb.append("TicketValue: ").append(getTicketValue()).append(", "); sb.append("TicketValue: ").append(getTicketValue()).append(", ");
sb.append("TotalValue: ").append(getTotalValue()).append(", "); sb.append("TotalValue: ").append(getTotalValue()).append(", ");
sb.append("TripEndDate: ").append(getTripEndDate()).append(", "); sb.append("TicketEndDate: ").append(getTicketEndDate()).append(", ");
sb.append("TripKind: ").append(getTripKind()).append(", "); sb.append("TripKind: ").append(getTripKind()).append(", ");
sb.append("TripStartDate: ").append(getTripStartDate()); sb.append("TicketStartDate: ").append(getTicketStartDate());
return sb.toString(); return sb.toString();
} }
......
...@@ -2,5 +2,5 @@ package br.ufpr.c3sl.sapos.models.scholar.enums; ...@@ -2,5 +2,5 @@ package br.ufpr.c3sl.sapos.models.scholar.enums;
public enum RequestStatus { public enum RequestStatus {
Aberta, Negada, Confirmada, Anulada; Aberta, Negada, Confirmada, Concluida, Cancelada;
} }
...@@ -22,14 +22,14 @@ import br.ufpr.c3sl.sapos.models.scholar.enums.RequestStatus; ...@@ -22,14 +22,14 @@ import br.ufpr.c3sl.sapos.models.scholar.enums.RequestStatus;
@RooWebScaffold( path = "travelrequisitions", formBackingObject = TravelRequisition.class) @RooWebScaffold( path = "travelrequisitions", formBackingObject = TravelRequisition.class)
@RequestMapping("/travelrequisitions") @RequestMapping("/travelrequisitions")
@Controller @Controller
public class TravelRequisitionController { public class TravelRequisitionController {
@RequestMapping(method = RequestMethod.POST) @RequestMapping(method = RequestMethod.POST)
public String create(@Valid TravelRequisition travelRequisition, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { public String create(@Valid TravelRequisition travelRequisition, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
uiModel.addAttribute("travelRequisition", travelRequisition); uiModel.addAttribute("travelRequisition", travelRequisition);
addDateTimeFormatPatterns(uiModel); addDateTimeFormatPatterns(uiModel);
return "travelrequisitions/create"; return "travelrequisitions/create";
} }
Person p = travelRequisition.getPerson(); Person p = travelRequisition.getPerson();
...@@ -56,8 +56,8 @@ public class TravelRequisitionController { ...@@ -56,8 +56,8 @@ public class TravelRequisitionController {
Person p = travelRequisition.getPerson(); Person p = travelRequisition.getPerson();
String message = new String(); String message = new String();
message = "A requisição de viagem de "+p.getName(); message = "A requisição de viagem de "+p.getName();
if (travelRequisition.getRequestStatus() == RequestStatus.Anulada) if (travelRequisition.getRequestStatus() == RequestStatus.Cancelada)
message += " foi ANULADA."; message += " foi CANCELADA.";
else if (travelRequisition.getRequestStatus() == RequestStatus.Negada) else if (travelRequisition.getRequestStatus() == RequestStatus.Negada)
message += " foi NEGADA."; message += " foi NEGADA.";
else if (travelRequisition.getRequestStatus() == RequestStatus.Confirmada) else if (travelRequisition.getRequestStatus() == RequestStatus.Confirmada)
......
...@@ -41,7 +41,15 @@ privileged aspect TravelRequisitionController_Roo_Controller { ...@@ -41,7 +41,15 @@ privileged aspect TravelRequisitionController_Roo_Controller {
// travelRequisition.persist(); // travelRequisition.persist();
// return "redirect:/travelrequisitions/" + encodeUrlPathSegment(travelRequisition.getId().toString(), httpServletRequest); // return "redirect:/travelrequisitions/" + encodeUrlPathSegment(travelRequisition.getId().toString(), httpServletRequest);
// } // }
void TravelRequisitionController.addDateTimeFormatPatterns(Model uiModel) {
uiModel.addAttribute("travelrequisition_ticketstartdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
uiModel.addAttribute("travelrequisition_ticketenddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
uiModel.addAttribute("travelrequisition_startdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
uiModel.addAttribute("travelrequisition_enddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
@RequestMapping(params = "form", method = RequestMethod.GET) @RequestMapping(params = "form", method = RequestMethod.GET)
public String TravelRequisitionController.createForm(Model uiModel) { public String TravelRequisitionController.createForm(Model uiModel) {
uiModel.addAttribute("travelRequisition", new TravelRequisition()); uiModel.addAttribute("travelRequisition", new TravelRequisition());
...@@ -126,12 +134,7 @@ privileged aspect TravelRequisitionController_Roo_Controller { ...@@ -126,12 +134,7 @@ privileged aspect TravelRequisitionController_Roo_Controller {
public java.util.Collection<RequestStatus> TravelRequisitionController.populateRequestStatuses() { public java.util.Collection<RequestStatus> TravelRequisitionController.populateRequestStatuses() {
return Arrays.asList(RequestStatus.class.getEnumConstants()); return Arrays.asList(RequestStatus.class.getEnumConstants());
} }
void TravelRequisitionController.addDateTimeFormatPatterns(Model uiModel) {
uiModel.addAttribute("travelrequisition_startdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
uiModel.addAttribute("travelrequisition_enddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
String TravelRequisitionController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) { String TravelRequisitionController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
String enc = httpServletRequest.getCharacterEncoding(); String enc = httpServletRequest.getCharacterEncoding();
if (enc == null) { if (enc == null) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd"> http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
<!-- HTTP security configurations --> <!-- HTTP security configurations -->
<http auto-config="true" use-expressions="true"> <http auto-config="true" use-expressions="true">
<form-login login-processing-url="/resources/j_spring_security_check" login-page="/login" authentication-failure-url="/login?login_error=t"/> <form-login login-processing-url="/resources/j_spring_security_check" login-page="/login" authentication-failure-url="/login?login_error=t"/>
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
directory. The located property files are parsed and their values can directory. The located property files are parsed and their values can
then be used within application context files in the form of then be used within application context files in the form of
${propertyKey}. ${propertyKey}.
--> -->
<context:property-placeholder location="classpath*:META-INF/spring/*.properties"/> <context:property-placeholder location="classpath*:META-INF/spring/*.properties"/>
<!-- <!--
Turn on AspectJ @Configurable support. As a result, any time you Turn on AspectJ @Configurable support. As a result, any time you
instantiate an object, Spring will attempt to perform dependency instantiate an object, Spring will attempt to perform dependency
injection on that object. This occurs for instantiation via the "new" injection on that object. This occurs for instantiation via the "new"
......
...@@ -420,14 +420,15 @@ label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_daynumber=Number of da ...@@ -420,14 +420,15 @@ label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_daynumber=Number of da
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_totalvalue=Total Value label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_totalvalue=Total Value
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketkind=Ticket Kind label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketkind=Ticket Kind
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_destinations=Destinations label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_destinations=Destinations
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripstartdate=Trip Start Date label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketstartdate=Trip Start Date
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripenddate=Trip End Date label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketenddate=Trip End Date
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketvalue=Ticket Value label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketvalue=Estimated Ticket Value
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_registrationvalue=Registration Value label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_registrationvalue=Registration Value
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_requeststatus=Request Status label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_requeststatus=Request Status
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_observations=Observations label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_observations=Observations
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_plural=Travel Requisitions label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_plural=Travel Requisitions
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_version=Version label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_version=Version
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketpurchaseprice=Ticket Purchase Price
label_br_ufpr_c3sl_sapos_models_scholar_sectionpos=Section Pos label_br_ufpr_c3sl_sapos_models_scholar_sectionpos=Section Pos
label_br_ufpr_c3sl_sapos_models_scholar_sectionpos_classroom=Class Room label_br_ufpr_c3sl_sapos_models_scholar_sectionpos_classroom=Class Room
......
...@@ -405,20 +405,21 @@ label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_justification=Justific ...@@ -405,20 +405,21 @@ label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_justification=Justific
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_conference=Conferncia label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_conference=Conferncia
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_place=Local label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_place=Local
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripkind=Deslocamento label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripkind=Deslocamento
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_startdate=De label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_startdate=Data inicial da viagem
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_enddate=At label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_enddate=Data final
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_daynumber=Nmero de Dirias label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_daynumber=Nmero de Dirias
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_totalvalue=Valor Total label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_totalvalue=Valor Total
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketkind=Bilhete de Passagem label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketkind=Bilhete de Passagem
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_destinations=Trecho label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_destinations=Trecho
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripstartdate=Sada label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketstartdate=Sada (passagem)
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripenddate=Retorno label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketenddate=Retorno (passagem)
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketvalue=Valor da Passagem label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketvalue=Valor da Passagem Orado
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_registrationvalue=Valor da Inscrio label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_registrationvalue=Valor da Inscrio
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_requeststatus=Status da Requisio label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_requeststatus=Status da Requisio
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_observations=Observaes label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_observations=Observaes
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_plural=Requisies de Viagem label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_plural=Requisies de Viagem
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_version=Version label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_version=Version
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketpurchaseprice=Preo de compra da passagem
label_br_ufpr_c3sl_sapos_models_scholar_sectionpos=Turma label_br_ufpr_c3sl_sapos_models_scholar_sectionpos=Turma
label_br_ufpr_c3sl_sapos_models_scholar_sectionpos_classroom=Sala da Aula label_br_ufpr_c3sl_sapos_models_scholar_sectionpos_classroom=Sala da Aula
......
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
<a href="${home}" name="${fn:escapeXml(home_label)}" title="${fn:escapeXml(home_label)}"> <a href="${home}" name="${fn:escapeXml(home_label)}" title="${fn:escapeXml(home_label)}">
<img id = "img_banner" style="width: 100%" src="${banner}" /> <img id = "img_banner" style="width: 100%" src="${banner}" />
</a> </a>
</div> </div>
\ No newline at end of file \ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<spring:message code="security_login_unsuccessful" htmlEscape="false"/> <spring:message code="security_login_unsuccessful" htmlEscape="false"/>
<c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}" /> <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}" />
. .
</p> </p>
</div> </div>
</c:if> </c:if>
<c:if test="${empty param.login_error}"> <c:if test="${empty param.login_error}">
......
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
<input type="submit" value="Save"/> <input type="submit" value="Save"/>
</form> </form>
</div> </div>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<spring:message code="error_resourcenotfound_problemdescription" /> <spring:message code="error_resourcenotfound_problemdescription" />
</p> </p>
<c:if test="${not empty exception}"> <c:if test="${not empty exception}">
<p> <p>
<h4> <h4>
<spring:message code="exception_details" /> <spring:message code="exception_details" />
</h4> </h4>
......
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_concept" property="concept" nullvalue="Nulo" z="user-managed"/> <table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_concept" property="concept" nullvalue="Nulo" z="user-managed"/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_grade" property="grade" z="clivGE2OFc6Wld+CLitF/sAXddU="/> <table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_grade" property="grade" z="clivGE2OFc6Wld+CLitF/sAXddU="/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_frequency" property="frequency" z="rLQfQM3aCKOI9biFAIRRtKNmVKs="/> <table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_frequency" property="frequency" z="rLQfQM3aCKOI9biFAIRRtKNmVKs="/>
</table:table> </table:table>
</page:list> </page:list>
</div> </div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment