/branches/v3/impl/src/java/pt/estgp/estgweb/utils/Globals.java |
---|
11,7 → 11,7 |
public class Globals { |
public static final String SYSTEM_PUBLIC_URL = ConfigProperties.getProperty("system.public.url"); |
public static final String SYSTEM_PUBLIC_URL_SERVLETPATH = ConfigProperties.getProperty("system.public.url"); |
public static final String SYSTEM_INTRANET_URL = ConfigProperties.getProperty("system.intranet.url"); |
public static final boolean TEST_ENVIRONEMENT = ConfigProperties.getBooleanProperty("test.control.var");; |
218,7 → 218,9 |
public static final String SITE_URL = ConfigProperties.getProperty("site.url"); |
public static final String SERVICE_URL = ConfigProperties.getProperty("service.url"); |
public static final String INTRANET_MESSAGES_PREFIX = "intranet."; |
public static final List<String> ANNOUNCEMENTS_VALIDATOR_ROLES = ConfigProperties.getListValues("announcements.validator.role"); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java |
---|
1,7 → 1,6 |
package pt.estgp.estgweb.services.courses; |
import jomm.dao.impl.AbstractDao; |
import jomm.utils.StreamsUtils; |
import org.apache.log4j.Logger; |
import org.json.JSONArray; |
390,11 → 389,20 |
public static void main(String[] args) throws IOException, JSONException { |
AbstractDao.getCurrentSession().beginTransaction(); |
/*AbstractDao.getCurrentSession().beginTransaction(); |
ReportCourseDocument reportCourseDocument = new CourseReportServices().createNewCourseReportDocument("44","201617"); |
System.out.println(reportCourseDocument.toJson()); |
AbstractDao.getCurrentSession().getTransaction().commit(); |
AbstractDao.getCurrentSession().getTransaction().commit();*/ |
//System.setProperty("javax.net.ssl.trustStore", "/JORGE/COPIAS/.keystore"); |
//System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); |
URL url = new URL("http://pae.ipportalegre.pt/wsjson/api/app/ws-course-pedagogic-results-list?code=44&year=201617&period=S1"); |
System.out.println(StreamsUtils.readString(url.openStream())); |
} |
/* |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitProgram.java |
---|
449,7 → 449,7 |
String path = Globals.TMP_DIR + File.separator + cu.getCode() + "-" + cu.getNormalizedName() + ".pdf"; |
FileOutputStream out = new FileOutputStream(path); |
Map<String,Object> params = new HashMap<String,Object>(); |
params.put("site", Globals.SITE_URL); |
params.put("site", Globals.SERVICE_URL); |
if(cu.isValidProgram()) |
params.put("validadoCC", "true"); |
else |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitEvaluation.java |
---|
253,7 → 253,7 |
FileOutputStream out = new FileOutputStream(path); |
Map<String,Object> params = new HashMap<String,Object>(); |
params.put("site", Globals.SITE_URL); |
params.put("site", Globals.SERVICE_URL); |
org.w3c.dom.Document dd = Dom4jUtil.toW3c(responseDoc); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportSumariesJson.java |
---|
403,7 → 403,7 |
String path = Globals.TMP_DIR + File.separator + c.getCode() + "-" + c.getNormalizedName() + "-sumarios.pdf"; |
FileOutputStream out = new FileOutputStream(path); |
Map<String,Object> params = new HashMap<String,Object>(); |
params.put("site", Globals.SITE_URL); |
params.put("site", Globals.SERVICE_URL); |
PdfUtils.createPdfFromXml(new DOMSource(dd), "pt/estgp/estgweb/services/courseunits/courseunitsummaries.fo.xsl", out, params); |
out.flush(); |
out.close(); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/reportprocessors/DocenteReportGenerator.java |
---|
163,7 → 163,7 |
FileOutputStream out = new FileOutputStream(path); |
Map<String,Object> params = new HashMap<String,Object>(); |
params.put("site", Globals.SITE_URL); |
params.put("site", Globals.SERVICE_URL); |
params.put("updateDate", DatesWebUtils.getStringFromDate(new Date())); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/reportprocessors/CursoPublicReportGenerator.java |
---|
109,7 → 109,7 |
FileOutputStream out = new FileOutputStream(path); |
Map<String,Object> params = new HashMap<String,Object>(); |
params.put("site", Globals.SITE_URL); |
params.put("site", Globals.SERVICE_URL); |
params.put("updateDate", DatesWebUtils.getStringFromDate(new Date())); |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/assessments/GeneratePdfService.java |
---|
50,7 → 50,7 |
//abre o documento |
doc.open(); |
//imagem do cabe�alho |
Image img = Image.getInstance(Globals.SITE_URL+"/imgs/logoestg.gif"); |
Image img = Image.getInstance(Globals.SERVICE_URL+"/imgs/logoestg.gif"); |
img.setAlignment(Element.ALIGN_LEFT); |
doc.add(img); |
134,7 → 134,7 |
doc.add(questionP); |
if(question.getImage()!=null) |
{ |
Image image = Image.getInstance(Globals.SITE_URL+"/imageStream/"+question.getImage().getId()); |
Image image = Image.getInstance(Globals.SERVICE_URL+"/imageStream/"+question.getImage().getId()); |
image.setAlignment(Element.ALIGN_LEFT); |
doc.add(image); |
} |
146,9 → 146,9 |
{ |
Image imagePa=null; |
if(question.getType().equals(Globals.ASSESSMENT_QUESTION_TYPE_RADIO)) |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/radiobox.png"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/radiobox.png"); |
else |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/checkbox.png"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/checkbox.png"); |
imagePa.setAlignment(Element.PARAGRAPH); |
Paragraph pAP = new Paragraph(); |
pAP.add(new Chunk(imagePa, -1.00f, -2.00f)); |
188,7 → 188,7 |
table.addCell(item1); |
for(AssessmentQuestionPossibleAnswer pA : item.getPossibleAnswers()) |
{ |
Image imagePa= Image.getInstance(Globals.SITE_URL+"/imgs/radiobox.png"); |
Image imagePa= Image.getInstance(Globals.SERVICE_URL+"/imgs/radiobox.png"); |
PdfPCell imageCell = new PdfPCell(imagePa); |
imageCell.setBorder(0); |
table.addCell(imageCell); |
253,7 → 253,7 |
//abre o documento |
doc.open(); |
//imagem do cabe�alho |
Image img = Image.getInstance(Globals.SITE_URL+"/imgs/logoestg.gif"); |
Image img = Image.getInstance(Globals.SERVICE_URL+"/imgs/logoestg.gif"); |
img.setAlignment(Element.ALIGN_LEFT); |
doc.add(img); |
345,7 → 345,7 |
doc.add(questionP); |
if(question.getImage()!=null) |
{ |
Image image = Image.getInstance(Globals.SITE_URL+"/imageStream/"+question.getImage().getId()); |
Image image = Image.getInstance(Globals.SERVICE_URL+"/imageStream/"+question.getImage().getId()); |
image.setAlignment(Element.ALIGN_LEFT); |
doc.add(image); |
} |
441,7 → 441,7 |
{ |
if(answer.getPossibleAnswer() == pA) |
{ |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/radioboxselected.png"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/radioboxselected.png"); |
isRadioAnswered = true; |
if(assessmentResponse.isEvaluated()) |
{ //verifica se est� correcta |
458,7 → 458,7 |
} |
} |
if(!isRadioAnswered) |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/radiobox.png"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/radiobox.png"); |
} |
else |
468,7 → 468,7 |
{ |
if(answer.getPossibleAnswer() == pA) |
{ |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/checkboxselected.jpg"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/checkboxselected.jpg"); |
isCheckAnswered = true; |
if(assessmentResponse.isEvaluated()) |
{ //verifica se est� correcta |
485,7 → 485,7 |
} |
} |
if(!isCheckAnswered) |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/checkbox.png"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/checkbox.png"); |
} |
imagePa.setAlignment(Element.PARAGRAPH); |
540,7 → 540,7 |
{ |
if(answer.getPossibleAnswer() == pA) |
{ |
imagePa = Image.getInstance(Globals.SITE_URL+"/imgs/radioboxselected.png"); |
imagePa = Image.getInstance(Globals.SERVICE_URL+"/imgs/radioboxselected.png"); |
isRadioAnswered = true; |
if(assessmentResponse.isEvaluated()) |
{ //verifica se esta correcta |
558,7 → 558,7 |
} |
if(!isRadioAnswered) |
imagePa= Image.getInstance(Globals.SITE_URL+"/imgs/radiobox.png"); |
imagePa= Image.getInstance(Globals.SERVICE_URL+"/imgs/radiobox.png"); |
PdfPCell imageCell = new PdfPCell(imagePa); |
imageCell.setBorder(0); |
639,7 → 639,7 |
//abre o documento |
doc.open(); |
//imagem do cabecalho |
Image img = Image.getInstance(Globals.SITE_URL+"/imgs/logoestg.gif"); |
Image img = Image.getInstance(Globals.SERVICE_URL+"/imgs/logoestg.gif"); |
img.setAlignment(Element.ALIGN_LEFT); |
doc.add(img); |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/Globals.java |
---|
1,7 → 1,5 |
package pt.estgp.estgweb.web; |
import pt.estgp.estgweb.utils.ConfigProperties; |
/** |
* @author Fabio |
* @date 31/Mar/2008 |
11,8 → 9,8 |
public class Globals |
{ |
public static final String SITE_URL = ConfigProperties.getProperty("site.url"); |
public static final String BACO_SESSION_COOKIE = "JSESSIONID"; |
private static final String PORTAL_MENU_START_LINK_START = "/proxy/"; |
private static final String PORTAL_MENU_START_LINK_END = "/estgp/public/portal"; |