Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1517 → Rev 1518

/branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CoursesService.java
17,6 → 17,7
import pt.estgp.estgweb.domain.views.CourseView;
import pt.estgp.estgweb.filters.chains.ResourceAccessControlEnum;
import pt.estgp.estgweb.services.courses.xsd.Curso;
import pt.estgp.estgweb.services.courses.xsd.SemestreImpl;
import pt.estgp.estgweb.services.courses.xsd.UnidadeType;
import pt.estgp.estgweb.services.data.IRepositoryFile;
import pt.estgp.estgweb.services.data.RepositoryService;
1058,9 → 1059,24
{
logger.info("Generating JSON for " + courseStudiesPlanPersistente.getCourse().getName() + " version: " + courseStudiesPlanPersistente.getVersion());
Curso cursoPlano = loadCursoPlanoFromXml(courseStudiesPlanPersistente.getXml());
String json = getGensonPlanoEstudos().serialize(cursoPlano);
//SETTING JSON in COURSE STUDIES PLAN
courseStudiesPlanPersistente.setJson(json);
if(cursoPlano != null)
{
for(Curso.Semestre s : cursoPlano.getSemestre())
{
SemestreImpl.setDescriptionsDefaults(s);
}
//send to XML again
JAXBContext jc = JAXBContext.newInstance(Curso.class);
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
StringWriter xml = new StringWriter();
marshaller.marshal(cursoPlano,xml);
courseStudiesPlanPersistente.setXml(xml.toString());
String json = getGensonPlanoEstudos().serialize(cursoPlano);
//SETTING JSON in COURSE STUDIES PLAN
courseStudiesPlanPersistente.setJson(json);
}
 
}
catch(Throwable e)
{
/branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/SemestreImpl.java
24,52 → 24,94
return this.perfil;
}
 
private String getSemestreDescAux()
private static String getSemestreDescAux(String id)
{
if(getId().equals("S1"))
if(id.equals("S1"))
return "Semestre 1";
else if(getId().equals("S2"))
else if(id.equals("S2"))
return "Semestre 2";
else if(getId().equals("S3"))
else if(id.equals("S3"))
return "Semestre 3";
else if(getId().equals("S4"))
else if(id.equals("S4"))
return "Semestre 4";
else if(getId().equals("S5"))
else if(id.equals("S5"))
return "Semestre 5";
else if(getId().equals("S6"))
else if(id.equals("S6"))
return "Semestre 6";
else if(getId().equals("T1"))
else if(id.equals("T1"))
return "Trimestre 1";
else if(getId().equals("T2"))
else if(id.equals("T2"))
return "Trimestre 2";
else if(getId().equals("T3"))
else if(id.equals("T3"))
return "Trimestre 3";
else if(getId().equals("T4"))
else if(id.equals("T4"))
return "Trimestre 4";
else if(getId().equals("T5"))
else if(id.equals("T5"))
return "Trimestre 5";
else if(getId().equals("T6"))
else if(id.equals("T6"))
return "Trimestre 6";
else if(getId().equals("T7"))
else if(id.equals("T7"))
return "Trimestre 7";
else if(getId().equals("T8"))
else if(id.equals("T8"))
return "Trimestre 8";
 
return getSemestreDesc();
return "";
}
 
private static String getSemestreDescAuxEn(String id)
{
if(id.equals("S1"))
return "Semester 1";
else if(id.equals("S2"))
return "Semester 2";
else if(id.equals("S3"))
return "Semester 3";
else if(id.equals("S4"))
return "Semester 4";
else if(id.equals("S5"))
return "Semester 5";
else if(id.equals("S6"))
return "Semester 6";
else if(id.equals("T1"))
return "Quarter 1";
else if(id.equals("T2"))
return "Quarter 2";
else if(id.equals("T3"))
return "Quarter 3";
else if(id.equals("T4"))
return "Quarter 4";
else if(id.equals("T5"))
return "Quarter 5";
else if(id.equals("T6"))
return "Quarter 6";
else if(id.equals("T7"))
return "Quarter 7";
else if(id.equals("T8"))
return "Quarter 8";
 
return "";
}
 
 
 
 
public void setId(String semestre)
{
 
super.setId(semestre);
if(!semestre.equals("OP"))
setDescriptionsDefaults(this);
}
 
public static void setDescriptionsDefaults(Curso.Semestre semestre)
{
if(!semestre.getId().equals("OP"))
{
setSemestreDesc(getSemestreDescAux());
setSemestreDescEn("");
setSemestreDescEs("");
setSemestreDescFr("");
semestre.setSemestreDesc(getSemestreDescAux(semestre.getId()));
semestre.setSemestreDescEn(getSemestreDescAuxEn(semestre.getId()));
semestre.setSemestreDescEs(getSemestreDescAux(semestre.getId()));
semestre.setSemestreDescFr(getSemestreDescAux(semestre.getId()));
}
}
 
 
}
/branches/v3/impl/src/web/user/courses/studiesPlansAdministrationEdit.jsp
414,7 → 414,7
 
<nested:size id="tamanhoPerfil" property="perfil"/>
<nested:iterate id="perfil" indexId="perfilIndexId" property="perfil" type="pt.estgp.estgweb.services.courses.xsd.Curso.Semestre.Perfil">
<div class="panel panel-default">
<div class="panel panel-info">
<div class="panel-heading">
<div class="form-group">
<%