Commit 56221afd authored by didonet's avatar didonet

Added support to a second language test on Registration.

parent df121f6b
...@@ -65,6 +65,14 @@ public class Registration { ...@@ -65,6 +65,14 @@ public class Registration {
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-") @DateTimeFormat(style = "S-")
private Date proficiencyDate; private Date proficiencyDate;
@Enumerated(EnumType.STRING)
private LanguageKind secondLanguage;
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date secondProficiencyDate;
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-") @DateTimeFormat(style = "S-")
......
...@@ -66,6 +66,15 @@ privileged aspect Registration_Roo_JavaBean { ...@@ -66,6 +66,15 @@ privileged aspect Registration_Roo_JavaBean {
public void Registration.setLanguage(LanguageKind language) { public void Registration.setLanguage(LanguageKind language) {
this.language = language; this.language = language;
} }
public LanguageKind Registration.getSecondLanguage() {
return this.secondLanguage;
}
public void Registration.setSecondLanguage(LanguageKind secondLanguage) {
this.secondLanguage = secondLanguage;
}
public Date Registration.getProficiencyDate() { public Date Registration.getProficiencyDate() {
return this.proficiencyDate; return this.proficiencyDate;
...@@ -74,6 +83,14 @@ privileged aspect Registration_Roo_JavaBean { ...@@ -74,6 +83,14 @@ privileged aspect Registration_Roo_JavaBean {
public void Registration.setProficiencyDate(Date proficiencyDate) { public void Registration.setProficiencyDate(Date proficiencyDate) {
this.proficiencyDate = proficiencyDate; this.proficiencyDate = proficiencyDate;
} }
public Date Registration.getSecondProficiencyDate() {
return this.secondProficiencyDate;
}
public void Registration.setSecondProficiencyDate(Date secondProficiencyDate) {
this.secondProficiencyDate = secondProficiencyDate;
}
public Date Registration.getDeferralDate() { public Date Registration.getDeferralDate() {
return this.deferralDate; return this.deferralDate;
......
...@@ -357,7 +357,6 @@ public class Transcript { ...@@ -357,7 +357,6 @@ public class Transcript {
if (checkTeachingPractice) { if (checkTeachingPractice) {
for (int i = 0; i < teachingCourses.length; i++){ for (int i = 0; i < teachingCourses.length; i++){
System.out.println(r.transcriptSection.getCode() + " asdf "+teachingCourses[i].trim());
if (teachingCourses[i].trim().equals( r.transcriptSection.getCode() ) ){ if (teachingCourses[i].trim().equals( r.transcriptSection.getCode() ) ){
hasTeachingPractice = true; hasTeachingPractice = true;
break; break;
...@@ -411,7 +410,9 @@ public class Transcript { ...@@ -411,7 +410,9 @@ public class Transcript {
document.add(Chunk.NEWLINE); document.add(Chunk.NEWLINE);
} }
getLanguage(reg.getProficiencyDate(), reg.getLanguage(), document); getLanguage(reg.getProficiencyDate(), reg.getLanguage(), document);
getLanguage(reg.getSecondProficiencyDate(), reg.getSecondLanguage(), document);
if (reg.getDefenseDate() != null) { if (reg.getDefenseDate() != null) {
phr = new Phrase("Dissertação aprovada em: ", ReportUtil.getTitleTextFont()); phr = new Phrase("Dissertação aprovada em: ", ReportUtil.getTitleTextFont());
......
...@@ -316,10 +316,12 @@ label_br_ufpr_c3sl_sapos_models_scholar_registration_jobkind=Job Kind ...@@ -316,10 +316,12 @@ label_br_ufpr_c3sl_sapos_models_scholar_registration_jobkind=Job Kind
label_br_ufpr_c3sl_sapos_models_scholar_registration_joborganization=Job Organization label_br_ufpr_c3sl_sapos_models_scholar_registration_joborganization=Job Organization
label_br_ufpr_c3sl_sapos_models_scholar_registration_keywords=Key Words label_br_ufpr_c3sl_sapos_models_scholar_registration_keywords=Key Words
label_br_ufpr_c3sl_sapos_models_scholar_registration_language=Proficiency language label_br_ufpr_c3sl_sapos_models_scholar_registration_language=Proficiency language
label_br_ufpr_c3sl_sapos_models_scholar_registration_secondlanguage=Second Proficiency language
label_br_ufpr_c3sl_sapos_models_scholar_registration_librarypubdate=Library Pub Date label_br_ufpr_c3sl_sapos_models_scholar_registration_librarypubdate=Library Pub Date
label_br_ufpr_c3sl_sapos_models_scholar_registration_pagenumbers=Page Numbers 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_plural=Registrations
label_br_ufpr_c3sl_sapos_models_scholar_registration_proficiencydate=Proficiency date label_br_ufpr_c3sl_sapos_models_scholar_registration_proficiencydate=Proficiency date
label_br_ufpr_c3sl_sapos_models_scholar_registration_secondproficiencydate=Second Proficiency date
label_br_ufpr_c3sl_sapos_models_scholar_registration_proposaldate=Proposal Date label_br_ufpr_c3sl_sapos_models_scholar_registration_proposaldate=Proposal Date
label_br_ufpr_c3sl_sapos_models_scholar_registration_deferraldate=Last deferral date label_br_ufpr_c3sl_sapos_models_scholar_registration_deferraldate=Last deferral date
label_br_ufpr_c3sl_sapos_models_scholar_registration_desistancedate=Desistance Date label_br_ufpr_c3sl_sapos_models_scholar_registration_desistancedate=Desistance Date
......
...@@ -305,7 +305,9 @@ label_br_ufpr_c3sl_sapos_models_scholar_registration_deferraldate= ...@@ -305,7 +305,9 @@ label_br_ufpr_c3sl_sapos_models_scholar_registration_deferraldate=
label_br_ufpr_c3sl_sapos_models_scholar_registration_registrationnumber=Matrcula label_br_ufpr_c3sl_sapos_models_scholar_registration_registrationnumber=Matrcula
label_br_ufpr_c3sl_sapos_models_scholar_registration_regkind=Tipo label_br_ufpr_c3sl_sapos_models_scholar_registration_regkind=Tipo
label_br_ufpr_c3sl_sapos_models_scholar_registration_proficiencydate=Data exame de proficincia label_br_ufpr_c3sl_sapos_models_scholar_registration_proficiencydate=Data exame de proficincia
label_br_ufpr_c3sl_sapos_models_scholar_registration_secondproficiencydate=Data da segunda proficincia
label_br_ufpr_c3sl_sapos_models_scholar_registration_language=Lngua label_br_ufpr_c3sl_sapos_models_scholar_registration_language=Lngua
label_br_ufpr_c3sl_sapos_models_scholar_registration_secondlanguage=Segunda lngua
label_br_ufpr_c3sl_sapos_models_scholar_registration_regstatus=Status 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_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
......
...@@ -11,8 +11,14 @@ ...@@ -11,8 +11,14 @@
<field:checkbox field="isWritingThesis" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_isWritingThesis" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/> <field:checkbox field="isWritingThesis" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_isWritingThesis" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/>
<field:input field="transferCredit" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_transferCredit" validationMessageCode="field_invalid_integer" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/> <field:input field="transferCredit" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_transferCredit" validationMessageCode="field_invalid_integer" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/>
<p/>
<hr/>
<b>Proficiência</b>
<p/>
<field:select field="language" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_language" items="${languagekinds}" path="languagekinds" z="user-managed"/> <field:select field="language" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_language" items="${languagekinds}" path="languagekinds" z="user-managed"/>
<field:datetime dateTimePattern="${registration_startdate_date_format}" field="proficiencyDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_proficiencyDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/> <field:datetime dateTimePattern="${registration_startdate_date_format}" field="proficiencyDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_proficiencyDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/>
<field:select field="secondLanguage" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_secondLanguage" items="${languagekinds}" path="languagekinds" z="user-managed"/>
<field:datetime dateTimePattern="${registration_startdate_date_format}" field="secondProficiencyDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_secondProficiencyDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/>
<p/> <p/>
<hr/> <hr/>
<b>Datas</b> <b>Datas</b>
......
...@@ -13,22 +13,24 @@ ...@@ -13,22 +13,24 @@
<field:display field="transferCredit" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_transferCredit" object="${registration}" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/> <field:display field="transferCredit" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_transferCredit" object="${registration}" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/>
<field:display field="language" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_language" object="${registration}" z="user-managed"/> <field:display field="language" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_language" object="${registration}" z="user-managed"/>
<field:display date="true" dateTimePattern="${registration_startdate_date_format}" field="proficiencyDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_proficiencyDate" object="${registration}" z="user-managed"/> <field:display date="true" dateTimePattern="${registration_startdate_date_format}" field="proficiencyDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_proficiencyDate" object="${registration}" z="user-managed"/>
<field:display field="secondLanguage" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_secondLanguage" object="${registration}" z="user-managed"/>
<field:display date="true" dateTimePattern="${registration_startdate_date_format}" field="secondProficiencyDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_secondProficiencyDate" object="${registration}" z="user-managed"/>
<br/> <br/>
<hr/> <hr/>
<p/> <p/>
<b>Datas</b> <b>Datas</b>
<p/> <p/>
<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_startdate_date_format}" field="startDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_startDate" object="${registration}" z="F59qitc6LOZYb9WtHuXvxA91/Pw="/><br/>
<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_proposaldate_date_format}" field="proposalDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_proposalDate" object="${registration}" z="wc1wfVKQ6SYhkvelFlENlstJoJQ="/><br/>
<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_defensedate_date_format}" field="defenseDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_defenseDate" object="${registration}" z="DKhGFxymAtXZhUwawDSZCpajxwQ="/><br/>
<field:display date="true" dateTimePattern="${registration_deferraldate_date_format}" field="deferralDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_deferralDate" object="${registration}" z="DKhGFxymAtXZhUwawDSZCpajxwQ="/> <field:display date="true" dateTimePattern="${registration_deferraldate_date_format}" field="deferralDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_deferralDate" object="${registration}" z="DKhGFxymAtXZhUwawDSZCpajxwQ="/><br/>
<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_desistancedate_date_format}" field="desistanceDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_desistanceDate" object="${registration}" z="DKhGFxymAtXZhUwawDSZCpajxwQ="/><br/>
<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_startinterruption_date_format}" field="startInterruption" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_startInterruption" object="${registration}" z="mfQ80EqApKBAZSOoqg4PO6dPJVk="/><br/>
<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_endinterruption_date_format}" field="endInterruption" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_endInterruption" object="${registration}" z="1fi0Utvs3WPr21sGaQ7Wj8KrDEk="/><br/>
<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="/> <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="/><br/>
<field:display date="true" dateTimePattern="${registration_libraryPubDate_date_format}" field="libraryPubDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_libraryPubDate" object="${registration}" z="5EyyieByXABgbcuhrdZuTQs0W/U="/> <field:display date="true" dateTimePattern="${registration_libraryPubDate_date_format}" field="libraryPubDate" id="s_br_ufpr_c3sl_sapos_models_scholar_Registration_libraryPubDate" object="${registration}" z="5EyyieByXABgbcuhrdZuTQs0W/U="/>
......
...@@ -10,8 +10,14 @@ ...@@ -10,8 +10,14 @@
<field:select field="regStatus" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_regStatus" items="${registrationstatuses}" path="registrationstatuses" z="P9eI83EY6Adc/hMCVIP3kIeWY2k="/> <field:select field="regStatus" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_regStatus" items="${registrationstatuses}" path="registrationstatuses" z="P9eI83EY6Adc/hMCVIP3kIeWY2k="/>
<field:checkbox field="isWritingThesis" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_isWritingThesis" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/> <field:checkbox field="isWritingThesis" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_isWritingThesis" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/>
<field:input field="transferCredit" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_transferCredit" validationMessageCode="field_invalid_integer" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/> <field:input field="transferCredit" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_transferCredit" validationMessageCode="field_invalid_integer" z="QM6rdx8vJ3AGL4L+YTs0+JqvyS0="/>
<p/>
<hr/>
<b>Proficiência</b>
<p/>
<field:select field="language" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_language" items="${languagekinds}" path="languagekinds" z="user-managed"/> <field:select field="language" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_language" items="${languagekinds}" path="languagekinds" z="user-managed"/>
<field:datetime dateTimePattern="${registration_startdate_date_format}" field="proficiencyDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_proficiencyDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/> <field:datetime dateTimePattern="${registration_startdate_date_format}" field="proficiencyDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_proficiencyDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/>
<field:select field="secondLanguage" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_secondLanguage" items="${languagekinds}" path="languagekinds" z="user-managed"/>
<field:datetime dateTimePattern="${registration_startdate_date_format}" field="secondProficiencyDate" id="c_br_ufpr_c3sl_sapos_models_scholar_Registration_secondProficiencyDate" z="YpGgwbyaevarNbfaz5kJNfzlcw8="/>
<p/> <p/>
<hr/> <hr/>
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
#database.password=postgres #database.password=postgres
#database.url=jdbc\:postgresql\://localhost\:5432/sapos database.url=jdbc\:postgresql\://localhost\:5432/sapos
#database.url=jdbc\:postgresql\://devel.c3sl.ufpr.br\:5432/sapos #database.url=jdbc\:postgresql\://devel.c3sl.ufpr.br\:5432/sapos
#database.username=sapos
#database.password=devsapos
#
database.url=jdbc\:postgresql\://sapos.c3sl.ufpr.br\:5432/sapos
database.username=sapos database.username=sapos
database.password=posprodfrog database.password=devsapos
#
#database.url=jdbc\:postgresql\://sapos.c3sl.ufpr.br\:5432/sapos
#database.username=sapos
#database.password=posprodfrog
database.driverClassName=org.postgresql.Driver database.driverClassName=org.postgresql.Driver
......
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