diff --git a/trunk/SiprpWebFichasClinicas/.classpath b/trunk/SiprpWebFichasClinicas/.classpath index 2c240218..5308463b 100644 --- a/trunk/SiprpWebFichasClinicas/.classpath +++ b/trunk/SiprpWebFichasClinicas/.classpath @@ -53,7 +53,6 @@ - diff --git a/trunk/SiprpWebFichasClinicas/.settings/org.eclipse.jdt.core.prefs b/trunk/SiprpWebFichasClinicas/.settings/org.eclipse.jdt.core.prefs index 69c31cd4..62492222 100644 --- a/trunk/SiprpWebFichasClinicas/.settings/org.eclipse.jdt.core.prefs +++ b/trunk/SiprpWebFichasClinicas/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/applicationContext.xml b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/applicationContext.xml index a114635a..fefed149 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/applicationContext.xml +++ b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/applicationContext.xml @@ -28,6 +28,16 @@ jdbc:postgresql:// + + smtp.siprp.pt + 587 + false + servico@siprp.pt + GR33%df5 + fichas.online@siprp.pt + fichas.online@siprp.pt + + diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/log4j-over-slf4j-1.7.5.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/log4j-over-slf4j-1.7.5.jar deleted file mode 100644 index 3f303968..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/log4j-over-slf4j-1.7.5.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar deleted file mode 100644 index 8f004d39..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-api-1.7.7.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-api-1.7.7.jar new file mode 100644 index 00000000..b28e220b Binary files /dev/null and b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-api-1.7.7.jar differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-simple-1.7.7.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-simple-1.7.7.jar new file mode 100644 index 00000000..2387c438 Binary files /dev/null and b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/slf4j-simple-1.7.7.jar differ diff --git a/trunk/SiprpWebFichasClinicas/src/pt/evolute/MailSenderSpringBean.java b/trunk/SiprpWebFichasClinicas/src/pt/evolute/MailSenderSpringBean.java new file mode 100644 index 00000000..e72f4032 --- /dev/null +++ b/trunk/SiprpWebFichasClinicas/src/pt/evolute/MailSenderSpringBean.java @@ -0,0 +1,138 @@ +package pt.evolute; + + + +import com.evolute.utils.mail.SendMail; + +public class MailSenderSpringBean { + + private SendMail mail; + + private String host; + private Integer port; + private boolean secure; + private String username; + private String password; + private String defaultFROM; + private String defaultTO; + + public MailSenderSpringBean() + { + ; + } + + + public String getHost() + { + return host; + } + + public void setHost(String host) + { + this.host = host; + } + + public Integer getPort() + { + return port; + } + + public void setPort(Integer port) + { + this.port = port; + } + + public Boolean getSecure() + { + return secure; + } + + public void setSecure(Boolean secure) + { + this.secure = secure; + } + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getDefaultFROM() + { + return defaultFROM; + } + + public void setDefaultFROM(String defaultFROM) + { + this.defaultFROM = defaultFROM; + } + + public String getDefaultTO() + { + return defaultTO; + } + + public void setDefaultTO(String defaultTO) + { + this.defaultTO = defaultTO; + } + + private void mailConfig() + { + mail = new SendMail(); + mail.setSMTP_HOST(host); + mail.setSMTP_PORT(port); + mail.setUseSMTPS(secure); + mail.setSMTP_USER(username); + mail.setSMTP_PASS(password); + } + + + public synchronized void sendEmail(String from, String to, String body, String subject, boolean html) throws Exception + { + if(mail == null) + { + mailConfig(); + } + + if(from == null) + { + mail.setEmailFrom(defaultFROM); + } + else + { + mail.setEmailFrom(from); + } + + if(to == null) + { + mail.setEmailTo(defaultTO); + } + else + { + mail.setEmailTo(to); + } + + mail.setIsHTML(html); + mail.setMsgText(body); + mail.setSubject(subject); + mail.sendMail( ); + } + + +} diff --git a/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/InitDefaultLogger.java b/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/InitDefaultLogger.java index 5c8e9504..b3a1a385 100644 --- a/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/InitDefaultLogger.java +++ b/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/InitDefaultLogger.java @@ -1,6 +1,5 @@ package pt.evolute.logger; -import java.util.Date; import java.util.logging.Level; import com.evolute.utils.error.ErrorLogger; @@ -11,14 +10,11 @@ public class InitDefaultLogger { // ErrorLogger.initializeLogger(StdoutLogger.LOGGER); ErrorLogger.initializeLogger( new TomcatEvoLogger( Level.INFO ), true, false ); - - ErrorLogger.log("LOGGING BEGIN :: "+(new Date()).toString()); } public void clean() { - ErrorLogger.log("LOGGING STOP :: "+(new Date()).toString()); ErrorLogger.stopLogger(); } } diff --git a/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/TomcatEvoLogger.java b/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/TomcatEvoLogger.java index feb11fca..64df5d8a 100644 --- a/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/TomcatEvoLogger.java +++ b/trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/TomcatEvoLogger.java @@ -9,7 +9,7 @@ public final class TomcatEvoLogger implements Logger private Level minLevel; - private java.util.logging.Logger logger = java.util.logging.Logger.getLogger( "EvoLogger" ); + private java.util.logging.Logger logger = java.util.logging.Logger.getLogger( "EvoLogger_SIPRP" ); public TomcatEvoLogger( Level minLevel ) { diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/FichasClinicasLogic.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/FichasClinicasLogic.java index ae91932b..2e189c54 100644 --- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/FichasClinicasLogic.java +++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/FichasClinicasLogic.java @@ -13,6 +13,7 @@ import java.util.logging.Level; import org.springframework.beans.factory.annotation.Autowired; +import pt.evolute.MailSenderSpringBean; import shst.medicina.fichasclinicas.beans.EvoMessageBean; import shst.medicina.fichasclinicas.beans.EvoMessageTypeBean; import shst.medicina.fichasclinicas.beans.EvoResponseBean; @@ -93,6 +94,9 @@ public class FichasClinicasLogic @Autowired(required = true) FichasClinicasDataProvider fichasProvider; + @Autowired(required = true) + MailSenderSpringBean mailsender; + private static final String[] EMPRESAS_D_to_B = new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL}; private static final String[] ESTABELECIMENTOS_D_to_B = new String[]{EstabelecimentosData.ID,EstabelecimentosData.NOME}; private static final String[] TRABALHADORES_D_to_B = new String[]{TrabalhadoresData.ID,TrabalhadoresData.NOME}; @@ -1794,6 +1798,7 @@ public class FichasClinicasLogic fichaBD.save(); + mailsender.sendEmail(null, null, "O utilizador "+user.getName()+" criou uma nova ficha de aptidão para o trabalhador "+fichaBean.getFicha().getTrabalhador_nome()+"!", "Nova Ficha de Aptidão", false); EvoResponseBean getrsp = getFichaAptidao(user, fichaBD.getId(), null, null); @@ -1805,6 +1810,8 @@ public class FichasClinicasLogic msg.setMessageData("Ficha de Aptidão criada com sucesso!"); result.addMessage(msg); result.setData(getrsp.getData().getFichaData()); + + } else {