Author: kmorin Date: 2014-12-02 11:01:52 +0000 (Tue, 02 Dec 2014) New Revision: 712 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/712 Log: fixes #6228 Certaines lignes de gamme envoy?\195?\169es ?\195?\160 l'EDI ne sont plus li?\195?\169es ?\195?\160 un email Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-30 17:14:54 UTC (rev 711) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-02 11:01:52 UTC (rev 712) @@ -1251,7 +1251,8 @@ List<Email> emails = dao.forTopiaIdIn(emailIds).findAll(); for (Email email : emails) { - if (email.getDemandStatus() != DemandStatus.TRANSMISSION_TO_EDI) { + if (email.getDemandStatus() != DemandStatus.TRANSMISSION_TO_EDI + || email.getDemandStatus() != DemandStatus.TRANSMITTED_TO_EDI) { email.setDemandStatus(DemandStatus.QUALIFIED); } email.setMailFolder(newFolder); @@ -1376,6 +1377,7 @@ public void execute(Connection connection) throws SQLException { int importedCount = 0; + List<String> rangeRowTopiaIdsInEdiReturnToDelete = new ArrayList<String>(); // attention, le sql à pour cible postgresql, mssql, h2, il doit rester simple String query = String.format("SELECT %s, %s, %s FROM %s", @@ -1409,6 +1411,8 @@ continue; } + rangeRowTopiaIdsInEdiReturnToDelete.add(rangeRowTopiaId); + if (StringUtils.isNotBlank(error)) { //error String oldError = email.getEdiError(); @@ -1443,7 +1447,9 @@ // delete all rows stat = connection.createStatement(); - stat.execute("DELETE FROM " + EdiReturn.class.getSimpleName()); + stat.execute("DELETE FROM " + EdiReturn.class.getSimpleName() + + " WHERE " + EdiReturn.PROPERTY_RANGE_ROW_TOPIA_ID + + " IN ('" + StringUtils.join(rangeRowTopiaIdsInEdiReturnToDelete, "','") + "')"); // usefull log info (do not remove) if (importedCount > 0 && log.isInfoEnabled()) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-11-30 17:14:54 UTC (rev 711) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-12-02 11:01:52 UTC (rev 712) @@ -32,6 +32,7 @@ import java.util.Map; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.beans.BeanMonitor; @@ -130,6 +131,12 @@ email = serviceContext.getEmailService().saveEmail(email, attachments, replies, clientCode, currentUser, modifiedProperties); model.fromEntity(email); + MailFolder folder = model.getMailFolder(); + if (model.getArchiveDate() != null + || !folder.isFolderWritable() + || !model.getDemandStatus().isEditableStatus()) { + model.setEditable(false); + } getModel().setModify(false); monitor.clearModified();