Commit ef7fecf2 authored by didonet's avatar didonet

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 {
//- alerta para requisicoes de viagem
public static Object findAllOpenTravelRequisitions(){
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
......
......@@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
import org.springframework.roo.addon.entity.RooEntity;
......@@ -25,6 +26,7 @@ public class Course {
private Integer workload;
@Column(columnDefinition="text")
private String program;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "course")
......
......@@ -40,16 +40,22 @@ public class Recommendation {
* Relacionamento com colegas e professores:
* Capacidade de expressão oral:
* Capacidade de expressão escrita: */
@Column(columnDefinition="text")
private String interest;
@Column(columnDefinition="text")
private String persistence;
@Column(columnDefinition="text")
private String intelectualCapability;
@Column(columnDefinition="text")
private String relationshipCoWorkers;
@Column(columnDefinition="text")
private String vocalExpression;
@Column(columnDefinition="text")
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). */
......
......@@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Column;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
......@@ -33,6 +34,7 @@ public class SectionPos {
@ManyToOne
private Course course;
@Column(columnDefinition="text")
private String program;
@ManyToOne
......
......@@ -144,7 +144,7 @@ public class Subscription {
Outros: Qual? lê ( ) entende ( ) fala ( ) escreve ( )*/
//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;
//11) Recomendação:
......
......@@ -76,10 +76,15 @@ public class TravelRequisition {
private TicketKind ticketKind;
private String destinations;
private String tripStartDate;
private String tripEndDate;
//valor só da passagem
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date ticketStartDate;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date ticketEndDate;
private String ticketValue;
......@@ -90,6 +95,8 @@ public class TravelRequisition {
private String observations;
private String ticketPurchasePrice;
public static Object findTravelRequisitions(String requestStatus, String year) {
String sql = "";
if (!requestStatus.isEmpty())
......@@ -158,7 +165,7 @@ public class TravelRequisition {
phr = new Phrase("Unidade: ", ReportUtil.getNormalTextFont());
p.add(phr);
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());
p.add(phr);
}
......@@ -274,7 +281,7 @@ public class TravelRequisition {
document.add(p);
p = new Paragraph("( ) Pagar diárias no Caravelle Licitado ( ) Apenas efetuar reserva no Hotel Licitado", ReportUtil.getNormalTextFont());
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);
//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 {
document.add(p);
p = new Paragraph("TRECHO: "+tr.destinations, ReportUtil.getNormalTextFont());
document.add(p);
p = new Paragraph("SAÍDA: "+tr.tripStartDate, ReportUtil.getNormalTextFont());
p = new Paragraph("SAÍDA: "+tr.ticketStartDate, ReportUtil.getNormalTextFont());
document.add(p);
p = new Paragraph("RETORNO: "+tr.tripEndDate, ReportUtil.getNormalTextFont());
p = new Paragraph("RETORNO: "+tr.ticketEndDate, ReportUtil.getNormalTextFont());
document.add(p);
p = new Paragraph();
......@@ -300,7 +307,7 @@ public class TravelRequisition {
p.add(phr);
if (tr.ticketValue != null) {
phr = new Phrase(tr.ticketValue, ReportUtil.getNormalTextFont());
phr = new Phrase(tr.ticketValue.toString(), ReportUtil.getNormalTextFont());
p.add(phr);
}
......
......@@ -31,6 +31,14 @@ privileged aspect TravelRequisition_Roo_JavaBean {
public String TravelRequisition.getProfession() {
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) {
......@@ -125,20 +133,20 @@ privileged aspect TravelRequisition_Roo_JavaBean {
this.destinations = destinations;
}
public String TravelRequisition.getTripStartDate() {
return this.tripStartDate;
public Date TravelRequisition.getTicketStartDate() {
return this.ticketStartDate;
}
public void TravelRequisition.setTripStartDate(String tripStartDate) {
this.tripStartDate = tripStartDate;
public void TravelRequisition.setTicketStartDate(Date ticketStartDate) {
this.ticketStartDate = ticketStartDate;
}
public String TravelRequisition.getTripEndDate() {
return this.tripEndDate;
public Date TravelRequisition.getTicketEndDate() {
return this.ticketEndDate;
}
public void TravelRequisition.setTripEndDate(String tripEndDate) {
this.tripEndDate = tripEndDate;
public void TravelRequisition.setTicketEndDate(Date ticketEndDate) {
this.ticketEndDate = ticketEndDate;
}
public String TravelRequisition.getTicketValue() {
......
......@@ -25,9 +25,9 @@ privileged aspect TravelRequisition_Roo_ToString {
sb.append("TicketKind: ").append(getTicketKind()).append(", ");
sb.append("TicketValue: ").append(getTicketValue()).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("TripStartDate: ").append(getTripStartDate());
sb.append("TicketStartDate: ").append(getTicketStartDate());
return sb.toString();
}
......
......@@ -2,5 +2,5 @@ package br.ufpr.c3sl.sapos.models.scholar.enums;
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;
@RooWebScaffold( path = "travelrequisitions", formBackingObject = TravelRequisition.class)
@RequestMapping("/travelrequisitions")
@Controller
public class TravelRequisitionController {
public class TravelRequisitionController {
@RequestMapping(method = RequestMethod.POST)
public String create(@Valid TravelRequisition travelRequisition, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
if (bindingResult.hasErrors()) {
uiModel.addAttribute("travelRequisition", travelRequisition);
addDateTimeFormatPatterns(uiModel);
return "travelrequisitions/create";
addDateTimeFormatPatterns(uiModel);
return "travelrequisitions/create";
}
Person p = travelRequisition.getPerson();
......@@ -56,8 +56,8 @@ public class TravelRequisitionController {
Person p = travelRequisition.getPerson();
String message = new String();
message = "A requisição de viagem de "+p.getName();
if (travelRequisition.getRequestStatus() == RequestStatus.Anulada)
message += " foi ANULADA.";
if (travelRequisition.getRequestStatus() == RequestStatus.Cancelada)
message += " foi CANCELADA.";
else if (travelRequisition.getRequestStatus() == RequestStatus.Negada)
message += " foi NEGADA.";
else if (travelRequisition.getRequestStatus() == RequestStatus.Confirmada)
......
......@@ -41,7 +41,15 @@ privileged aspect TravelRequisitionController_Roo_Controller {
// travelRequisition.persist();
// 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)
public String TravelRequisitionController.createForm(Model uiModel) {
uiModel.addAttribute("travelRequisition", new TravelRequisition());
......@@ -126,12 +134,7 @@ privileged aspect TravelRequisitionController_Roo_Controller {
public java.util.Collection<RequestStatus> TravelRequisitionController.populateRequestStatuses() {
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 enc = httpServletRequest.getCharacterEncoding();
if (enc == null) {
......
......@@ -5,7 +5,7 @@
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
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
<!-- HTTP security configurations -->
<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"/>
......
......@@ -6,9 +6,9 @@
directory. The located property files are parsed and their values can
then be used within application context files in the form of
${propertyKey}.
-->
-->
<context:property-placeholder location="classpath*:META-INF/spring/*.properties"/>
<!--
<!--
Turn on AspectJ @Configurable support. As a result, any time you
instantiate an object, Spring will attempt to perform dependency
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
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_destinations=Destinations
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripstartdate=Trip Start Date
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripenddate=Trip End Date
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketvalue=Ticket Value
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketstartdate=Trip Start Date
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketenddate=Trip End Date
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_requeststatus=Request Status
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_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_classroom=Class Room
......
......@@ -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_place=Local
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_enddate=At
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_startdate=Data inicial da viagem
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_totalvalue=Valor Total
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_tripstartdate=Sada
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_tripenddate=Retorno
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketvalue=Valor da Passagem
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketstartdate=Sada (passagem)
label_br_ufpr_c3sl_sapos_models_scholar_travelrequisition_ticketenddate=Retorno (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_requeststatus=Status da Requisio
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_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_classroom=Sala da Aula
......
......@@ -8,4 +8,4 @@
<a href="${home}" name="${fn:escapeXml(home_label)}" title="${fn:escapeXml(home_label)}">
<img id = "img_banner" style="width: 100%" src="${banner}" />
</a>
</div>
\ No newline at end of file
</div>
\ No newline at end of file
......@@ -8,7 +8,7 @@
<spring:message code="security_login_unsuccessful" htmlEscape="false"/>
<c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}" />
.
</p>
</p>
</div>
</c:if>
<c:if test="${empty param.login_error}">
......
......@@ -15,5 +15,5 @@
<input type="submit" value="Save"/>
</form>
</form>
</div>
......@@ -8,7 +8,7 @@
<spring:message code="error_resourcenotfound_problemdescription" />
</p>
<c:if test="${not empty exception}">
<p>
<p>
<h4>
<spring:message code="exception_details" />
</h4>
......
......@@ -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_grade" property="grade" z="clivGE2OFc6Wld+CLitF/sAXddU="/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Transcript_frequency" property="frequency" z="rLQfQM3aCKOI9biFAIRRtKNmVKs="/>
</table:table>
</table:table>
</page:list>
</div>
......@@ -18,11 +18,11 @@
<field:input field="justification" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_justification" z="user-managed"/>
<field:select field="tripKind" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripKind" items="${tripkinds}" path="tripkinds" z="user-managed"/>
<field:input field="dayNumber" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_dayNumber" validationMessageCode="field_invalid_integer" z="user-managed"/>
<field:input field="tripStartDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripStartDate" z="user-managed"/>
<field:input field="tripEndDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripEndDate" z="user-managed"/>
<hr/>
<b>Datas</b>
<field:datetime dateTimePattern="${travelrequisition_ticketstartdate_date_format}" field="ticketStartDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketStartDate" z="user-managed"/>
<field:datetime dateTimePattern="${travelrequisition_ticketenddate_date_format}" field="ticketEndDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketEndDate" z="user-managed"/>
<p/>
<field:datetime dateTimePattern="${travelrequisition_startdate_date_format}" field="startDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_startDate" z="user-managed"/>
<field:datetime dateTimePattern="${travelrequisition_enddate_date_format}" field="endDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_endDate" z="user-managed"/>
......@@ -33,7 +33,9 @@
<field:input field="registrationValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_registrationValue" z="user-managed"/>
<field:select field="ticketKind" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketKind" items="${ticketkinds}" path="ticketkinds" z="user-managed"/>
<field:input field="ticketValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketValue" z="user-managed"/>
<p/>
<field:input field="totalValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_totalValue" z="user-managed"/>
<field:input field="ticketPurchasePrice" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketPurchasePrice" z="user-managed"/>
<hr/>
<b>Outros</b>
......
......@@ -15,7 +15,8 @@
<table:column property="ticketValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketValue" z="user-managed"/>
<table:column property="totalValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_totalValue" z="user-managed"/>
<table:column property="ticketPurchasePrice" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketPurchasePrice" z="user-managed"/>
<table:column property="requestStatus" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_requestStatus" z="user-managed"/>
</table:table>
</page:list>
......
......@@ -47,8 +47,8 @@
<field:display field="justification" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_justification" object="${travelrequisition}" z="user-managed"/>
<field:display field="tripKind" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripKind" object="${travelrequisition}" z="user-managed"/>
<field:display field="dayNumber" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_dayNumber" object="${travelrequisition}" z="user-managed"/>
<field:display field="tripStartDate" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripStartDate" object="${travelrequisition}" z="user-managed"/>
<field:display field="tripEndDate" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripEndDate" object="${travelrequisition}" z="user-managed"/>
<field:display field="ticketStartDate" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketStartDate" object="${travelrequisition}" z="user-managed"/>
<field:display field="ticketEndDate" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketEndDate" object="${travelrequisition}" z="user-managed"/>
<br/>
<hr/>
......@@ -65,6 +65,7 @@
<field:display field="ticketKind" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketKind" object="${travelrequisition}" z="user-managed"/>
<field:display field="ticketValue" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketValue" object="${travelrequisition}" z="user-managed"/>
<field:display field="totalValue" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_totalValue" object="${travelrequisition}" z="user-managed"/>
<field:display field="ticketPurchasePrice" id="s_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketPurchasePrice" object="${travelrequisition}" z="user-managed"/>
<br/>
<hr/>
......
......@@ -18,11 +18,11 @@
<field:input field="justification" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_justification" z="user-managed"/>
<field:select field="tripKind" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripKind" items="${tripkinds}" path="tripkinds" z="user-managed"/>
<field:input field="dayNumber" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_dayNumber" validationMessageCode="field_invalid_integer" z="user-managed"/>
<field:input field="tripStartDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripStartDate" z="user-managed"/>
<field:input field="tripEndDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_tripEndDate" z="user-managed"/>
<hr/>
<b>Datas</b>
<field:datetime dateTimePattern="${travelrequisition_ticketstartdate_date_format}" field="ticketStartDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketStartDate" z="user-managed"/>
<field:datetime dateTimePattern="${travelrequisition_ticketenddate_date_format}" field="ticketEndDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketEndDate" z="user-managed"/>
<p/>
<field:datetime dateTimePattern="${travelrequisition_startdate_date_format}" field="startDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_startDate" z="user-managed"/>
<field:datetime dateTimePattern="${travelrequisition_enddate_date_format}" field="endDate" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_endDate" z="user-managed"/>
......@@ -34,6 +34,7 @@
<field:select field="ticketKind" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketKind" items="${ticketkinds}" path="ticketkinds" z="user-managed"/>
<field:input field="ticketValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketValue" z="user-managed"/>
<field:input field="totalValue" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_totalValue" z="user-managed"/>
<field:input field="ticketPurchasePrice" id="c_br_ufpr_c3sl_sapos_models_scholar_TravelRequisition_ticketPurchasePrice" z="user-managed"/>
<hr/>
<b>Outros</b>
......
......@@ -9,7 +9,7 @@
</p>
<c:if test="${not empty exception}">
<p>
<h4>
<h4>
<spring:message code="exception_details" />
</h4>
<spring:message var="message" code="exception_message" />
......
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