Commit 4b72035e authored by Fabiano Sluzarski's avatar Fabiano Sluzarski

Search Sapos integrated, desistanceDate added on registration and

Entrants Data report added
parent 3d1e56c2
......@@ -128,11 +128,9 @@ public class Professor extends Person {
if (r.getStartDate() == null)
cell = new PdfPCell(new Paragraph("--", ReportUtil.getTableTextFont()));
else {
String admissionYear_s;
admissionYear_s = r.getStartDate().toString().substring(0, 4);
Integer admissionYear_i = new Integer(admissionYear_s);
cell = new PdfPCell(new Paragraph(ReportUtil.getOrdinalNumber(todayYear-admissionYear_i)+" ano", ReportUtil.getTableTextFont()));
long diff = ReportUtil.getTodayDate().getTimeInMillis() - r.getStartDate().getTime();
long dayDifference = diff / (1000 * 60 * 60 * 24);
cell = new PdfPCell(new Paragraph(ReportUtil.getOrdinalNumber((int)dayDifference / 365)+" ano", ReportUtil.getTableTextFont()));
}
table.addCell(cell);
}
......
......@@ -111,27 +111,25 @@ public class ReportUtil {
switch (i)
{
case 0:
return "primeiro";
case 1:
return "primeiro";
case 2:
return "segundo";
case 3:
return "terceiro";
case 4:
return "quarto";
case 5:
return "quinto";
case 6:
return "sexto";
case 7:
return "sétimo";
case 8:
return "oitavo";
case 9:
return "nono";
case 10:
return "décimo";
return "primeiro";
case 1:
return "segundo";
case 2:
return "terceiro";
case 3:
return "quarto";
case 4:
return "quinto";
case 5:
return "sexto";
case 6:
return "sétimo";
case 7:
return "oitavo";
case 8:
return "nono";
case 9:
return "décimo";
}
return null;
}
......
package br.ufpr.c3sl.sapos.models.scholar;
import java.io.IOException;
import java.math.BigInteger;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
......@@ -63,7 +64,6 @@ public class Registration {
@DateTimeFormat(style = "S-")
private Date proficiencyDate;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date startDate;
......@@ -75,6 +75,10 @@ public class Registration {
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date defenseDate;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date desistanceDate;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
......@@ -186,6 +190,40 @@ public class Registration {
" order by p.name" , Registration.class).getResultList();
}
public static long countEntrantsYearRegKind(String year, String regKind) {
BigInteger count = (BigInteger) entityManager().createNativeQuery("select count(*) from registration where" +
" extract (year from start_date) = "+year+
" and reg_kind = '"+regKind+"'").getSingleResult();
return count.longValue();
}
public static long countDropoutsYearRegKind(String year, String regKind) {
BigInteger count = (BigInteger) entityManager().createNativeQuery("select count(*) from registration where" +
" extract (year from desistance_date) = "+year+
" and reg_kind = '"+regKind+"' and reg_status='Desistente'").getSingleResult();
return count.longValue();
}
public static long countConcludedYearRegKind(String year, String regKind) {
BigInteger count = (BigInteger) entityManager().createNativeQuery("select count(*) from registration where " +
"extract (year from defense_date) = "+year+
" and reg_kind = '"+regKind+"' and reg_status='Concluida'").getSingleResult();
return count.longValue();
}
public static long countTotalActivesRegKind(String regKind) {
BigInteger count = (BigInteger) entityManager().createNativeQuery("select count(*) from registration where reg_kind = '"+regKind+"' and " +
"reg_status='Ativa'").getSingleResult();
return count.longValue();
}
public static long countGrantKindByName(String grantName, String grantKind, String regKind) {
BigInteger count = (BigInteger) entityManager().createNativeQuery("select count(*) from student_grant a, registration b," +
" grant_kind c where c.id = a.grant_kind and registration = b.id and reg_kind='"+regKind+"' and end_date is null" +
" and c.name='"+grantName+"' and c.kind='"+grantKind+"'").getSingleResult();
return count.longValue();
}
public static Registration getAtiveRegistration(Student s) {
Registration reg = null;
......@@ -317,5 +355,60 @@ public class Registration {
e.printStackTrace();
}
}
public static void entrantsDataReportPdf(String year, String regKind, HttpServletResponse response) {
response.setContentType("application/pdf");
//left,right,top,bottom margins
Document document = new Document(PageSize.A4, 80, 80, 80, 80);
Paragraph p = new Paragraph();
//String gender = (student.getGender() == GenderKind.M) ? "o" : "a";
try {
try {
ReportUtil.getPdfWriter(document,response);
//PdfWriter writer = ReportUtil.getPdfWriter(document,response);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
document.open();
p = new Paragraph(regKind, ReportUtil.getTitleTextFont());
document.add(p);
document.add(Chunk.NEWLINE);
p = new Paragraph(year, ReportUtil.getTitleTextFont());
document.add(p);
document.add(Chunk.NEWLINE);
p = new Paragraph("Ingressantes: "+countEntrantsYearRegKind(year,regKind), ReportUtil.getNormalTextFont());
document.add(p);
p = new Paragraph("Desistentes: "+countDropoutsYearRegKind(year, regKind), ReportUtil.getNormalTextFont());
document.add(p);
p = new Paragraph("Concluidos: "+countConcludedYearRegKind(year, regKind), ReportUtil.getNormalTextFont());
document.add(p);
p = new Paragraph("Ativos em "+year+": "+countTotalActivesRegKind(regKind), ReportUtil.getNormalTextFont());
document.add(p);
document.add(Chunk.NEWLINE);
p = new Paragraph("Bolsas", ReportUtil.getTitleTextFont());
document.add(p);
List<GrantKind> names = GrantKind.findAllGrantKinds();
for (GrantKind g : names) {
if (g.getName().equals(g.getKind()))
p = new Paragraph(g.getName()+": "+countGrantKindByName(g.getName(), g.getKind(), regKind), ReportUtil.getNormalTextFont());
else
p = new Paragraph(g.getName()+" ("+g.getKind()+"): "+countGrantKindByName(g.getName(), g.getKind(), regKind), ReportUtil.getNormalTextFont());
document.add(p);
}
document.close();
} catch (DocumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
......@@ -99,6 +99,14 @@ privileged aspect Registration_Roo_JavaBean {
this.defenseDate = defenseDate;
}
public Date Registration.getDesistanceDate() {
return this.desistanceDate;
}
public void Registration.setDesistanceDate(Date desistanceDate) {
this.desistanceDate = desistanceDate;
}
public Date Registration.getStartInterruption() {
return this.startInterruption;
}
......
......@@ -33,6 +33,7 @@ privileged aspect Registration_Roo_ToString {
sb.append("Salary: ").append(getSalary()).append(", ");
sb.append("SameResearchArea: ").append(getSameResearchArea()).append(", ");
sb.append("StartDate: ").append(getStartDate()).append(", ");
sb.append("DesistanceDate: ").append(getDesistanceDate()).append(", ");
sb.append("StartInterruption: ").append(getStartInterruption()).append(", ");
sb.append("Student: ").append(getStudent()).append(", ");
sb.append("StudentGrants: ").append(getStudentGrants() == null ? "null" : getStudentGrants().size()).append(", ");
......
......@@ -65,7 +65,7 @@ public class RegistrationController {
@RequestParam(value = "regStatus", required = false) String regStatus, Model model) {
model.addAttribute("registrations", Registration.findRegistrationsPerAdvisor(id, regStatus));
return "registrations/liststudentssimple";
}
}
@RequestMapping(value = "registrationsstatement", method = RequestMethod.GET)
public String transcriptsStatement() {
......@@ -113,4 +113,18 @@ public class RegistrationController {
return "registrations/liststudentssimple";
}
@RequestMapping(value = "entrantsdata", method = RequestMethod.GET)
public String entrantsData() {
return "registrations/entrantsdata";
}
@RequestMapping(value="entrantsdatapdf",method = RequestMethod.GET)
public void entrantsDataPdf(@RequestParam(value = "sectionYear", required = true) String year,
@RequestParam(value = "regKind", required = true) String regKind,
Model model,
HttpServletResponse response) {
Registration.entrantsDataReportPdf(year, regKind, response);
}
}
......@@ -69,14 +69,6 @@
<!-- <user-service> -->
<!-- password="edc2feedd895bd72f6aed5df35197073090e4b0e41b1c525de7635674ac9c6ea" prod -->
<!-- <user name="devel" password="c590eb19109a5d23edd3807625ce51be71bdc2cbe4885a2ef39afb8cdc4d1724" authorities="Administrador"/> -->
<!-- <user name="todt" password="cabec61254e076599d96270405bf4b29950488648b4418a4bb42eeed90cabfed" authorities="Administrador"/> -->
<!-- <user name="jucelia" password="ad7c96fe111541cc53badd01caea2984eacee4d5b6d13d6acc0dd4161d45fbea" authorities="Administrador"/> -->
<!-- <user name="didonet" password="106b8aa8795412c589967efafad0f23cf88c8606f3c101ba822846f45d6ce6b3" authorities="Administrador"/> -->
<!-- <user name="eduardo" password="ce0d7ecb4a24f8e6313bcb5173d91a424f60957a80768f66a9dcfa7001c2e235" authorities="Administrador"/> -->
<!-- <user name="lesoliveira" password="53605bc3e23702dca389475bdbb1b73b0082bdf089b8b33091165a60d3a966e0" authorities="Administrador"/> -->
<!-- <user name="michelev" password="032060927efb6cecebae95e71bd55513da526c1222df40d14f9d116e8e1f49a7" authorities="Administrador"/> -->
<!-- <user name="leticia" password="78530cb5fddd61b37583c34d931c53773ad819a585aac421185c063c222e23ea" authorities="Administrador"/> -->
<!-- <user name="jessica" password="0a999168594f2a1dc8ae758f38af2e2627dd4d93c2a0d2c55ae2f4221b835f80" authorities="Administrador"/> -->
<!-- </user-service> -->
</authentication-provider>
</authentication-manager>
......
......@@ -283,6 +283,7 @@ label_br_ufpr_c3sl_sapos_models_scholar_registration_pagenumbers=Page Numbers
label_br_ufpr_c3sl_sapos_models_scholar_registration_plural=Registrations
label_br_ufpr_c3sl_sapos_models_scholar_registration_proficiencydate=Proficiency date
label_br_ufpr_c3sl_sapos_models_scholar_registration_proposaldate=Proposal Date
label_br_ufpr_c3sl_sapos_models_scholar_registration_desistancedate=Desistance Date
label_br_ufpr_c3sl_sapos_models_scholar_registration_registrationnumber=Registration Number
label_br_ufpr_c3sl_sapos_models_scholar_registration_regkind=Reg Kind
label_br_ufpr_c3sl_sapos_models_scholar_registration_regstatus=Reg Status
......
......@@ -220,7 +220,7 @@ label_br_ufpr_c3sl_sapos_models_scholar_committee=Banca
label_br_ufpr_c3sl_sapos_models_scholar_committee_date=Data
label_br_ufpr_c3sl_sapos_models_scholar_committee_id=Id
label_br_ufpr_c3sl_sapos_models_scholar_committee_kind=Tipo
label_br_ufpr_c3sl_sapos_models_scholar_committee_observations=Mais informaes
label_br_ufpr_c3sl_sapos_models_scholar_committee_observations=Mais informaes (curso REUNI)
label_br_ufpr_c3sl_sapos_models_scholar_committee_participants=Participantes
label_br_ufpr_c3sl_sapos_models_scholar_committee_plural=Bancas
label_br_ufpr_c3sl_sapos_models_scholar_committee_student=Discente
......@@ -271,7 +271,8 @@ label_br_ufpr_c3sl_sapos_models_scholar_registration_proficiencydate=Data exame
label_br_ufpr_c3sl_sapos_models_scholar_registration_language=Lngua
label_br_ufpr_c3sl_sapos_models_scholar_registration_regstatus=Status
label_br_ufpr_c3sl_sapos_models_scholar_registration_salary=Salrio
label_br_ufpr_c3sl_sapos_models_scholar_registration_startdate=Data de Incio
label_br_ufpr_c3sl_sapos_models_scholar_registration_startdate=Data de Incio
label_br_ufpr_c3sl_sapos_models_scholar_registration_desistancedate=Data de Desistncia
label_br_ufpr_c3sl_sapos_models_scholar_registration_startholding=Incio do Trancamento
label_br_ufpr_c3sl_sapos_models_scholar_registration_startinterruption=Incio do trancamento
label_br_ufpr_c3sl_sapos_models_scholar_registration_student=Discente
......
......@@ -10,6 +10,7 @@ global_menu_statement_acceptance=Acceptance statement
global_menu_statement_courses=Ministered Courses statement
global_menu_candidates_to_grant=Candidates to grant
global_menu_blank_proposal=Open Proposal
global_menu_entrants_data=Entrants Data
global_menu_find=Find by {0}
global_menu_statement=Statement
global_menu_history=History
......
......@@ -19,6 +19,7 @@ global_menu_statement_acceptance=Declara
global_menu_statement_courses=Declarao de ministradas
global_menu_candidates_to_grant=Candidatos a bolsa
global_menu_blank_proposal=Proposta em Aberto
global_menu_entrants_data=Dados Ingressantes
global_generic={0}
global_menu_load_meeting_minutes=Carregar atas colegiado
global_menu_search_meeting_minutes=Procura atas colegiado
......
......@@ -11,6 +11,13 @@
<put-attribute name="footer" value="/WEB-INF/views/footer.jspx" />
</definition>
<definition name="search" template="/WEB-INF/layouts/search.jspx">
<put-attribute name="header" value="/WEB-INF/views/header.jspx" />
<put-attribute name="menu" value="/WEB-INF/views/menu.jspx" />
<put-attribute name="footer" value="/WEB-INF/views/footer.jspx" />
</definition>
<definition name="public" template="/WEB-INF/layouts/default.jspx">
<put-attribute name="header" value="/WEB-INF/views/header.jspx" />
<put-attribute name="footer" value="/WEB-INF/views/footer.jspx" />
......
<html xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tiles="http://tiles.apache.org/tags-tiles" xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" >
<jsp:output doctype-root-element="HTML" doctype-system="about:legacy-compat" />
<jsp:directive.page contentType="text/html;charset=UTF-8" />
<jsp:directive.page pageEncoding="UTF-8" />
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=8" />
<util:load-scripts />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/searchSapos.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/Core.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/AbstractManager.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/Manager.jquery.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/Parameter.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/ParameterStore.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/searchSapos.theme.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/AbstractWidget.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/ResultWidget.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/AbstractFacetWidget.js"><!-- required for FF3 and Opera --></script>
<script type="text/javascript" src="/sapos/resources/scriptSearch/TextWidget.js"><!-- required for FF3 and Opera --></script>
<spring:message code="application_name" var="app_name"/>
<title><spring:message code="welcome_h3" arguments="${app_name}" /></title>
</head>
<body class="tundra spring">
<div id="wrapper">
<tiles:insertAttribute name="header" ignore="true" />
<tiles:insertAttribute name="menu" ignore="true" />
<div id="main">
<tiles:insertAttribute name="body"/>
<tiles:insertAttribute name="footer" ignore="true"/>
</div>
</div>
</body>
</html>
......@@ -7,6 +7,7 @@
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Committee_student" property="student" z="GvO7JdvlG2YpGZwJsmvpH14s7X8=" navigation = "true"/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Committee_kind" property="kind" z="y+wOjPZ6KCENRSI6xj1h8lpxFzg="/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_thesisTitle" property="registration.thesisTitle" z="GvO7JdvlG2YpGZwJsmvpH14s7X8=" navigation = "true"/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Committee_participants" property="participants" z="EceBPGWSPGScveThhwlzD/8oqfM=" navigation="true"/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Committee_date" property="date" z="pcGiMZqozmv+2wHdxA0oVbtk66U="/>
<table:column id="c_br_ufpr_c3sl_sapos_models_scholar_Committee_observations" property="observations" z="IgB7ojsAYLsc5FVA8qgyBljf3V0="/>
......
......@@ -4,14 +4,14 @@
<jsp:output omit-xml-declaration="yes"/>
<!-- modelAttribute="file" name="upload" size="chars" -->
<b>Carregar atas do colegiado</b>
<p></p>
<form action="uploads" method="post" enctype="multipart/form-data">
<input type="file" name="file" />
<p/>
<input type="submit" value="Submit" />
</form>
</div>
......@@ -18,7 +18,7 @@
</a>
</span>
<c:out value=" | "/>
<spring:url value="http://sapos.c3sl.ufpr.br:8080/search_sapos/searchSapos.html" var="search_sapos"/>
<spring:url value="/searchMeetingMinutes" var="search_sapos"/>
<span>
<a href="${search_sapos}">
<spring:message code="search_sapos"/>
......
......@@ -28,6 +28,7 @@
<menu:item id="i_registration_list" messageCode="global_menu_statement_acceptance" url="/registrations/acceptancestatement" z="user-managed"/>
<menu:item id="i_registration_list" messageCode="global_menu_candidates_to_grant" url="/registrations/candidatestogrant" z="user-managed"/>
<menu:item id="i_registration_list" messageCode="global_menu_blank_proposal" url="/registrations/openproposaldate" z="user-managed"/>
<menu:item id="i_registration_list" messageCode="global_menu_entrants_data" url="/registrations/entrantsdata" z="user-managed"/>
</menu:category>
<menu:category id="c_transcript" z="a8v3h7EFS5CVeUqTWiTRDpYXXJg=">
<menu:item id="i_transcript_new" messageCode="global_menu_new" url="/transcripts?form" z="jWr28guoRI7FAdrnFd1qpcAYEGQ="/>
......@@ -89,11 +90,12 @@
<menu:category id="c_configuration" z="ex6zSpCyqSksY2xxo+2yaACAxic=">
<menu:item id="i_configuration_new" messageCode="global_menu_new" url="/configurations?form" z="PpKhRYSLF3fMvOlr5J8dEALoaF8="/>
<menu:item id="i_configuration_list" messageCode="global_menu_list" url="/configurations" z="user-managed"/>
<menu:item id="i_configuration_list" messageCode="global_menu_load_meeting_minutes" url="/configurations/upload" z="user-managed"/>
</menu:category>
<!-- <menu:category id="c_services" z="usermanaged"> -->
<!-- <menu:item id="i_search_meeting_minutes" messageCode="global_menu_search_meeting_minutes" url="/searchMeetingMinutes" z="user-managed"/> -->
<!-- </menu:category> -->
<menu:category id="c_services" z="usermanaged">
<menu:item id="i_search_meeting_minutes" messageCode="global_menu_search_meeting_minutes" url="/searchMeetingMinutes" z="user-managed"/>
<menu:item id="i_configuration_list" messageCode="global_menu_load_meeting_minutes" url="/configurations/upload" z="user-managed"/>
<menu:item id="i_configuration_list" messageCode="change_password" url="/people/changepassword" z="user-managed"/>
</menu:category>
</menu:menu>
</div>
......@@ -20,6 +20,8 @@
<field:datetime dateTimePattern="${registration_proposaldate_date_format}" field="proposalDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_proposalDate" z="ntz0kiWZh2uXzItyDkNHnzuajpo="/>
<field:datetime dateTimePattern="${registration_defensedate_date_format}" field="defenseDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_defenseDate" z="+9XuXhEa9cQexiFSypa0QYTJoQs="/>
<field:datetime dateTimePattern="${registration_desistancedate_date_format}" field="desistanceDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_desistanceDate" z="+9XuXhEa9cQexiFSypa0QYTJoQs="/>
<field:datetime dateTimePattern="${registration_startinterruption_date_format}" field="startInterruption" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_startInterruption" z="qebHmJejHmWZCrzzpJZ06gI5NLc="/>
<field:datetime dateTimePattern="${registration_endinterruption_date_format}" field="endInterruption" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_endInterruption" z="+tN63DutXYv3FjSA8Cw+n/5e6FI="/>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
<jsp:output omit-xml-declaration="yes"/>
<b>Relatório de Ingressantes</b>
<p></p>
<form name="entrantsData" action="entrantsdatapdf" method="get">
<field:input field="sectionYear" id="c_br_ufpr_c3sl_sapos_models_scholar_SectionPos_sectionYear" required="true"
validationMessageCode="field_invalid_integer" z="user-managed" disableFormBinding="true"/>
<field:select field="regKind" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_regKind" items="${registrationkinds}"
path="registrationkinds" z="user-managed" disableFormBinding="true"/>
<input type="submit" value="Enviar" />
</form>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_sapos_models_people_Student" render="${not empty dependencies}" z="gW+juyJp3mRm7nWlqYbCfkbtYVo="/>
</div>
......@@ -20,6 +20,9 @@
<field:display date="true" dateTimePattern="${registration_startdate_date_format}" field="startDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_startDate" object="${registration}" z="F59qitc6LOZYb9WtHuXvxA91/Pw="/>
<field:display date="true" dateTimePattern="${registration_proposaldate_date_format}" field="proposalDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_proposalDate" object="${registration}" z="wc1wfVKQ6SYhkvelFlENlstJoJQ="/>
<field:display date="true" dateTimePattern="${registration_defensedate_date_format}" field="defenseDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_defenseDate" object="${registration}" z="DKhGFxymAtXZhUwawDSZCpajxwQ="/>
<field:display date="true" dateTimePattern="${registration_desistancedate_date_format}" field="desistanceDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_desistanceDate" object="${registration}" z="DKhGFxymAtXZhUwawDSZCpajxwQ="/>
<field:display date="true" dateTimePattern="${registration_startinterruption_date_format}" field="startInterruption" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_startInterruption" object="${registration}" z="mfQ80EqApKBAZSOoqg4PO6dPJVk="/>
<field:display date="true" dateTimePattern="${registration_endinterruption_date_format}" field="endInterruption" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_endInterruption" object="${registration}" z="1fi0Utvs3WPr21sGaQ7Wj8KrDEk="/>
<field:display date="true" dateTimePattern="${registration_admissiondate_date_format}" field="admissionDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_admissionDate" object="${registration}" z="5EyyieByXABgbcuhrdZuTQs0W/U="/>
......
......@@ -20,6 +20,9 @@
<field:datetime dateTimePattern="${registration_startdate_date_format}" field="startDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_startDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/>
<field:datetime dateTimePattern="${registration_proposaldate_date_format}" field="proposalDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_proposalDate" z="ntz0kiWZh2uXzItyDkNHnzuajpo="/>
<field:datetime dateTimePattern="${registration_defensedate_date_format}" field="defenseDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_defenseDate" z="+9XuXhEa9cQexiFSypa0QYTJoQs="/>
<field:datetime dateTimePattern="${registration_desistancedate_date_format}" field="desistanceDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_desistanceDate" z="+9XuXhEa9cQexiFSypa0QYTJoQs="/>
<field:datetime dateTimePattern="${registration_startinterruption_date_format}" field="startInterruption" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_startInterruption" z="qebHmJejHmWZCrzzpJZ06gI5NLc="/>
<field:datetime dateTimePattern="${registration_endinterruption_date_format}" field="endInterruption" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_endInterruption" z="+tN63DutXYv3FjSA8Cw+n/5e6FI="/>
......
......@@ -51,4 +51,9 @@
value="/WEB-INF/views/registrations/openproposaldate.jspx" />
</definition>
<definition extends="default" name="registrations/entrantsdata">
<put-attribute name="body"
value="/WEB-INF/views/registrations/entrantsdata.jspx" />
</definition>
</tiles-definitions>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<div xmlns:c="http://java.sun.com/jsp/jstl/core"
<div
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields"
xmlns:form="urn:jsptagdir:/WEB-INF/tags/form"
xmlns:jsp="http://java.sun.com/JSP/Page"
......@@ -23,25 +24,23 @@
<!-- <p /> -->
<!-- <p></p> -->
<form name="search" action="" method=""> <!-- action="searchminutesaction" method="get"> -->
<div id="wrap">
</div>
<p/>
<h2>Pesquisa atas</h2>
<ul id="search">
<input type="text" id="query" name="query"/>
</ul>
<!-- <hr/>
<p/>
<b>Resultado da pesquisa</b> -->
<div id="result">
<div id="docs"></div>
</div>
<p />
<h2>Pesquisa atas</h2>
<!-- <ul id="search"> -->
<input type="text" id="query" name="query" />
<!-- </ul> -->
<div id="result">
<div id="docs"></div>
</div>
<!-- <input type="hidden" name="lang" value="pt"/> -->
<!-- <input name="query" size="44"/> -->
<!-- <input type="submit" value="Procura atas colegiado"/> -->
</form>
<!-- </form> -->
</div>
</div>
\ No newline at end of file
......@@ -22,12 +22,9 @@
<put-attribute name="body" value="/WEB-INF/views/login.jspx"/>
</definition>
<definition extends="public" name="searchMeetingMinutes">
<put-attribute name="body" value="/WEB-INF/views/searchMeetingMinutes.jspx"/>
<definition extends="search" name="searchMeetingMinutes">
<put-attribute name="body" value="/WEB-INF/views/searchMeetingMinutes.jspx"/>
</definition>
<definition extends="public" name="searchminutesaction">
<put-attribute name="body" value="/WEB-INF/views/searchminutesaction.jsp"/>
</definition>
</tiles-definitions>
// $Id$
/**
* Baseclass for all facet widgets.
*
* @class AbstractFacetWidget
* @augments AjaxSolr.AbstractWidget
*/
AjaxSolr.AbstractFacetWidget = AjaxSolr.AbstractWidget.extend(
/** @lends AjaxSolr.AbstractFacetWidget.prototype */
{
/**
* The field to facet on.
*
* @field
* @public
* @type String
*/
field: null,
/**
* Set to <tt>false</tt> to force a single "fq" parameter for this widget.
*
* @field
* @public
* @type Boolean
*/
multivalue: true,
init: function () {
this.initStore();
},
/**
* Add facet parameters to the parameter store.
*/
initStore: function () {
/* http://wiki.apache.org/solr/SimpleFacetParameters */
var parameters = [
'facet.prefix',
'facet.sort',
'facet.limit',
'facet.offset',
'facet.mincount',
'facet.missing',
'facet.method',
'facet.enum.cache.minDf'
];
this.manager.store.addByValue('facet', true);
// Set facet.field, facet.date or facet.range to truthy values to add
// related per-field parameters to the parameter store.
if (this['facet.field'] !== undefined) {
this.manager.store.addByValue('facet.field', this.field);
}
else if (this['facet.date'] !== undefined) {
this.manager.store.addByValue('facet.date', this.field);
parameters = parameters.concat([
'facet.date.start',
'facet.date.end',
'facet.date.gap',
'facet.date.hardend',
'facet.date.other',
'facet.date.include'
]);
}
else if (this['facet.range'] !== undefined) {
this.manager.store.addByValue('facet.range', this.field);
parameters = parameters.concat([
'facet.range.start',
'facet.range.end',
'facet.range.gap',
'facet.range.hardend',
'facet.range.other',
'facet.range.include'
]);
}
for (var i = 0, l = parameters.length; i < l; i++) {
if (this[parameters[i]] !== undefined) {
this.manager.store.addByValue('f.' + this.field + '.' + parameters[i], this[parameters[i]]);
}
}
},
/**
* @returns {Boolean} Whether any filter queries have been set using this
* widget's facet field.
*/
isEmpty: function () {
return !this.manager.store.find('q', new RegExp('^-?' + this.field + ':'));
},
/**
* Sets the filter query.
*
* @returns {Boolean} Whether the selection changed.
*/
set: function (value) {
return this.changeSelection(function () {
var a = this.manager.store.removeByValue('q', new RegExp('^-?' + this.field + ':')),
b = this.manager.store.addByValue('q', this.fq(value));
return a || b;
});
},
/**
* Adds a filter query.
*
* @returns {Boolean} Whether a filter query was added.
*/
add: function (value) {
return this.changeSelection(function () {
return this.manager.store.addByValue('q', this.fq(value));
});
},
/**
* Removes a filter query.
*
* @returns {Boolean} Whether a filter query was removed.
*/
remove: function (value) {
return this.changeSelection(function () {