branch develop updated (aa6b40d6 -> 2f66de20)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from aa6b40d6 fix calculatrice new 9a678d88 Remove archived from computeQuantities new 2f66de20 Fix runtime The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2f66de20352c2df6b7b6cd069e2b510e437fe78b Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:20:22 2018 +0200 Fix runtime commit 9a678d887993b1b74465824bf84f94ddce22246b Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:19:39 2018 +0200 Remove archived from computeQuantities Summary of changes: faxtomail-persistence/pom.xml | 4 ++-- .../franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java | 8 ++++++-- .../franciaflex/faxtomail/services/service/EmailServiceTest.java | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9a678d887993b1b74465824bf84f94ddce22246b Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:19:39 2018 +0200 Remove archived from computeQuantities --- .../franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java | 8 ++++++-- .../franciaflex/faxtomail/services/service/EmailServiceTest.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 11cf37a6..a9a5eb18 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -1211,7 +1211,8 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + - " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL"; + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'"; Map<String, Object> args = new HashMap<>(); args.put("folders", folders); @@ -1234,6 +1235,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'" + " GROUP BY range"; args = new HashMap<>(); @@ -1282,7 +1284,8 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + - " AND email." + Email.PROPERTY_WAITING_STATE + " IS NOT NULL"; + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NOT NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'" ; args = new HashMap<>(); args.put("folders", folders); @@ -1306,6 +1309,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + // " AND email." + Email.PROPERTY_TAKEN_BY + " IS NOT NULL" + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NOT NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'" + " GROUP BY range"; args = new HashMap<>(); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 071ddc25..c6d77781 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -230,8 +230,8 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // recupere la premiere lignes Entry<Range, Quantities> entry = quantitiesByRange.getInProgressQuantitiesByRange().entrySet().iterator().next(); Assert.assertEquals("Bas de gamme", entry.getKey().getLabel()); - Assert.assertEquals(500, entry.getValue().getProductQuantity().longValue()); - Assert.assertEquals(600, entry.getValue().getSavQuantity().longValue()); + Assert.assertEquals(250, entry.getValue().getProductQuantity().longValue()); + Assert.assertEquals(300, entry.getValue().getSavQuantity().longValue()); // NPE : Assert.assertEquals(600, entry.getValue()[2].longValue()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2f66de20352c2df6b7b6cd069e2b510e437fe78b Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:20:22 2018 +0200 Fix runtime --- faxtomail-persistence/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index 4a82e533..02248500 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -53,10 +53,10 @@ <artifactId>hibernate-c3p0</artifactId> </dependency> - <!--dependency> + <dependency> <groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId> - </dependency--> + </dependency> <dependency> <groupId>com.microsoft.sqlserver</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm