branch develop updated (3ced46d -> 4d97dec)
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 3ced46d fixes #9109 Simplifier le message pour quitter la demande new bab2e84 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers new 89074c5 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin new fe0ebb0 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente new 4d97dec fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. The 4 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 4d97decb1569ef50cbdfb4d727ce08d101cce1b3 Merge: 3ced46d fe0ebb0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:46:32 2017 +0100 fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. commit fe0ebb0b71e8e82b902e242ecf2018cde2b7358e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:38:37 2017 +0100 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente commit 89074c51f75c50e12ffe9e907ebe6ef1ba6f15b9 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:38:06 2017 +0100 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin commit bab2e8406503971362d49ed13710712525dfba29 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:37:39 2017 +0100 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers Summary of changes: .../faxtomail/beans/QuantitiesByRange.java | 19 ++++++++++- .../persistence/entities/EmailTopiaDao.java | 37 +++++++++++++++++--- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35540 -> 35628 bytes .../services/service/EmailServiceImpl.java | 12 +++++-- ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 +++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++++ .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ .../WEB-INF/content/admin/configuration-input.jsp | 37 ++++++++++++++------ .../src/main/webapp/js/configuration.js | 4 +++ 10 files changed, 133 insertions(+), 26 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql -- 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 bab2e8406503971362d49ed13710712525dfba29 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:37:39 2017 +0100 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35540 -> 35628 bytes ...317_1__add_computeQuantitiesSubtotalsByState.sql | 4 ++++ ...317_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 8b5e84b..ef2f72d 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql new file mode 100644 index 0000000..ed450b1 --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql @@ -0,0 +1,4 @@ +-- add computeQuantitiesSubtotalsByState + +alter table mailfolder add computeQuantitiesSubtotalsByState boolean; +update mailfolder set computeQuantitiesSubtotalsByState = 'f' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql new file mode 100644 index 0000000..0ff6d3b --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql @@ -0,0 +1,6 @@ +-- add computeQuantitiesSubtotalsByState + +alter table mailfolder add computeQuantitiesSubtotalsByState bit; +GO +update mailfolder set computeQuantitiesSubtotalsByState = 0 where parent is null; +GO \ No newline at end of file -- 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 89074c51f75c50e12ffe9e907ebe6ef1ba6f15b9 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:38:06 2017 +0100 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 37 ++++++++++++++++------ .../src/main/webapp/js/configuration.js | 4 +++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp index f8ea653..fe3f5b2 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp @@ -533,36 +533,36 @@ </div> <div class="form-group"> - <label class="control-label">Permettre l'ouverture des versions non-modifiées des pièces-jointes ?</label><br /> + <label class="control-label">Forcer à prendre l'élément pour l'éditer ?</label><br /> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="true"> oui + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="true"> oui </label> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="false"> non + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="false"> non </label> <label class="radio-inline" ng-if="selectedMailFolder.$parent"> <input type="radio" - ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="undefined"> hériter du dossier parent - ({{parentScopeValues.canViewOriginalAttachments ? 'Oui' : 'Non'}}) + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.mustTakeToEditDemand ? 'Oui' : 'Non'}}) </label> </div> <div class="form-group"> - <label class="control-label">Forcer à prendre l'élément pour l'éditer ?</label><br /> + <label class="control-label">Permettre l'ouverture des versions non modifiées des pièces-jointes ?</label><br /> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="true"> oui + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="true"> oui </label> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="false"> non + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="false"> non </label> <label class="radio-inline" ng-if="selectedMailFolder.$parent"> <input type="radio" - ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="undefined"> hériter du dossier parent - ({{parentScopeValues.mustTakeToEditDemand ? 'Oui' : 'Non'}}) + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.canViewOriginalAttachments ? 'Oui' : 'Non'}}) </label> </div> @@ -583,6 +583,23 @@ </label> </div> + <div class="form-group"> + <label class="control-label">Afficher les les sous-totaux par état dans la fenêtre de calcul des quantités par gamme ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.computeQuantitiesSubtotalsByState ? 'Oui' : 'Non'}}) + </label> + </div> + <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelNbElementToDisplay" ng-value="false" /> Hériter du nombre d'éléments à afficher à l'utilisateur :</label> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 8e05e58..28d8507 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -784,6 +784,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.canViewOriginalAttachments = $scope.selectedMailFolder.canViewOriginalAttachments || false; $scope.selectedMailFolder.mustTakeToEditDemand = $scope.selectedMailFolder.mustTakeToEditDemand || false; $scope.selectedMailFolder.displayHelpOnMessages = $scope.selectedMailFolder.displayHelpOnMessages || false; + $scope.selectedMailFolder.computeQuantitiesSubtotalsByState = $scope.selectedMailFolder.computeQuantitiesSubtotalsByState || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; } @@ -886,6 +887,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.displayHelpOnMessages)) { $scope.parentScopeValues.displayHelpOnMessages = folder.displayHelpOnMessages; } + if (angular.isUndefined($scope.parentScopeValues.computeQuantitiesSubtotalsByState)) { + $scope.parentScopeValues.computeQuantitiesSubtotalsByState = folder.computeQuantitiesSubtotalsByState; + } if (angular.isUndefined($scope.parentScopeValues.ediTransfer)) { $scope.parentScopeValues.ediTransfer = folder.ediTransfer; } -- 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 fe0ebb0b71e8e82b902e242ecf2018cde2b7358e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:38:37 2017 +0100 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente --- .../faxtomail/beans/QuantitiesByRange.java | 19 ++++++++++- .../persistence/entities/EmailTopiaDao.java | 37 ++++++++++++++++++--- .../services/service/EmailServiceImpl.java | 12 +++++-- .../actions/ComputeQuantitiesByRangeAction.java | 38 +++++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ 5 files changed, 92 insertions(+), 16 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java index f6533b7..e1bca53 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java @@ -38,10 +38,19 @@ public class QuantitiesByRange implements Serializable { private final ImmutableMap<Range, Quantities> quantitiesByRange; + private final Quantities inProgressDemandsQuantities; + + private final Quantities otherDemandsQuantities; + private final Quantities totalQuantities; - public QuantitiesByRange(Map<Range, Quantities> quantitiesByRange, Quantities totalQuantities) { + public QuantitiesByRange(Map<Range, Quantities> quantitiesByRange, + Quantities inProgressDemandsQuantities, + Quantities otherDemandsQuantities, + Quantities totalQuantities) { this.quantitiesByRange = ImmutableMap.copyOf(quantitiesByRange); + this.inProgressDemandsQuantities = inProgressDemandsQuantities; + this.otherDemandsQuantities = otherDemandsQuantities; this.totalQuantities = totalQuantities; } @@ -49,6 +58,14 @@ public class QuantitiesByRange implements Serializable { return quantitiesByRange; } + public Quantities getInProgressDemandsQuantities() { + return inProgressDemandsQuantities; + } + + public Quantities getOtherDemandsQuantities() { + return otherDemandsQuantities; + } + public Quantities getTotalQuantities() { return totalQuantities; } 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 02ac8ce..74f63bc 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 @@ -1006,7 +1006,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { return result; } - public QuantitiesByRange computeQuantitiesByRange(List<MailFolder> folders) { + public QuantitiesByRange computeQuantitiesByRange(List<MailFolder> folders, boolean computeQuantitiesSubtotalsByState) { String allRangesQuery = "SELECT DISTINCT range" + " FROM " + Email.class.getName() + " AS email " + @@ -1026,7 +1026,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { // do to bug https://hibernate.atlassian.net/browse/HHH-1615 that can be reproduced // on sql server - String query = "SELECT range." + Range.PROPERTY_TOPIA_ID + "," + + String quantitiesByRangeQuery = "SELECT range." + Range.PROPERTY_TOPIA_ID + "," + " SUM(rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") AS prodQ," + " SUM(rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + ") AS savQ," + " SUM(rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") AS quotQ" + @@ -1049,7 +1049,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { Long savTotalQuantity = 0L; Long quotationTotalQuantity = 0L; - List<Object[]> queryResuts = findAll(query, args); + List<Object[]> queryResuts = findAll(quantitiesByRangeQuery, args); for (Object[] queryResut : queryResuts) { Range range = rangesById.get(String.valueOf(queryResut[0])); @@ -1074,7 +1074,36 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { Quantities totalQuantities = new Quantities(productTotalQuantity, savTotalQuantity, quotationTotalQuantity); - return new QuantitiesByRange(quantitiesByRange, totalQuantities); + Quantities inProgressDemandsQuantities = null; + Quantities otherDemandsQuantities = null; + + if (computeQuantitiesSubtotalsByState) { + String inProgressQuantitiesQuery = "SELECT SUM(rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") AS prodQ," + + " SUM(rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + ") AS savQ," + + " SUM(rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") AS quotQ" + + " FROM " + Email.class.getName() + " AS email " + + " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + + " AND email." + Email.PROPERTY_TAKEN_BY + " IS NOT NULL" + + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL"; + + args = new HashMap<>(); + args.put("folders", folders); + + Object[] queryResut = findUnique(inProgressQuantitiesQuery, args); + Long productInProgressQuantity = (Long) queryResut[0]; + Long savInProgressQuantity = (Long) queryResut[1]; + Long quotationInProgressQuantity = (Long) queryResut[2]; + + inProgressDemandsQuantities = new Quantities(productInProgressQuantity, + savInProgressQuantity, + quotationInProgressQuantity); + otherDemandsQuantities = new Quantities(productTotalQuantity - productInProgressQuantity, + savTotalQuantity - savInProgressQuantity, + quotationTotalQuantity - quotationInProgressQuantity); + } + + return new QuantitiesByRange(quantitiesByRange, inProgressDemandsQuantities, otherDemandsQuantities, totalQuantities); } /* diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 5b66473..735f8d0 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -790,10 +790,18 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe @Override public QuantitiesByRange computeQuantitiesByRange(MailFolder rootFolder) { - // get results by topia id + + MailFolder folderWithComputeQuantitiesByState = rootFolder; + while (folderWithComputeQuantitiesByState.getParent() != null + && folderWithComputeQuantitiesByState.getComputeQuantitiesSubtotalsByState() == null) { + folderWithComputeQuantitiesByState = folderWithComputeQuantitiesByState.getParent(); + } + boolean computeQuantitiesSubtotalsByState = + Boolean.TRUE.equals(folderWithComputeQuantitiesByState.getComputeQuantitiesSubtotalsByState()); + List<MailFolder> folders = getChildrenRecursively(rootFolder); EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - return emailDao.computeQuantitiesByRange(folders); + return emailDao.computeQuantitiesByRange(folders, computeQuantitiesSubtotalsByState); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java index a081491..b2cc0aa 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java @@ -91,19 +91,39 @@ public class ComputeQuantitiesByRangeAction extends AbstractFaxToMailAction<Quan rangeRows.add(row); } - Quantities totalQuantities = quantitiesByRange.getTotalQuantities(); - RangeRowModel row = new RangeRowModel(); - Range total = new RangeImpl(); - total.setLabel(t("faxtomail.rangeRows.quantities.totals.label")); - row.setRange(total); - row.setProductQuantity(totalQuantities.getProductQuantity().intValue()); - row.setSavQuantity(totalQuantities.getSavQuantity().intValue()); - row.setQuotationQuantity(totalQuantities.getQuotationQuantity().intValue()); - rangeRows.add(row); + Quantities inProgressDemandsQuantities = quantitiesByRange.getInProgressDemandsQuantities(); + if (inProgressDemandsQuantities != null) { + RangeRowModel inProgressRow = createRangeRowModelForQuantities(inProgressDemandsQuantities, + t("faxtomail.rangeRows.quantities.inProgress.label")); + rangeRows.add(inProgressRow); + } + + Quantities otherDemandsQuantities = quantitiesByRange.getOtherDemandsQuantities(); + if (otherDemandsQuantities != null) { + RangeRowModel otherDemandsRow = createRangeRowModelForQuantities(otherDemandsQuantities, + t("faxtomail.rangeRows.quantities.otherDemands.label")); + rangeRows.add(otherDemandsRow); + } + + + RangeRowModel totalRow = createRangeRowModelForQuantities(quantitiesByRange.getTotalQuantities(), + t("faxtomail.rangeRows.quantities.totals.label")); + rangeRows.add(totalRow); getModel().setRangeRows(rangeRows); } + protected RangeRowModel createRangeRowModelForQuantities(Quantities quantities, String label) { + RangeRowModel row = new RangeRowModel(); + Range range = new RangeImpl(); + range.setLabel(label); + row.setRange(range); + row.setProductQuantity(quantities.getProductQuantity().intValue()); + row.setSavQuantity(quantities.getSavQuantity().intValue()); + row.setQuotationQuantity(quantities.getQuotationQuantity().intValue()); + return row; + } + @Override public void postSuccessAction() { super.postSuccessAction(); diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 847581e..3c2086e 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -275,6 +275,8 @@ faxtomail.pdfEditor.readPdf.error=Erreur lors de la lecture du PDF faxtomail.print.success.message=%s fichiers ont été imprimés faxtomail.quantitiesByRange.button.text=OK faxtomail.quantitiesByRange.title=Quantités par gamme +faxtomail.rangeRows.quantities.inProgress.label=En cours +faxtomail.rangeRows.quantities.otherDemands.label=Autres faxtomail.rangeRows.quantities.totals.label=Totaux faxtomail.rangeRows.table.header.commandNumber=N° commande / devis faxtomail.rangeRows.table.header.commandNumber.tip=N° commande / devis -- 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 4d97decb1569ef50cbdfb4d727ce08d101cce1b3 Merge: 3ced46d fe0ebb0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:46:32 2017 +0100 fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. .../faxtomail/beans/QuantitiesByRange.java | 19 ++++++++++- .../persistence/entities/EmailTopiaDao.java | 37 +++++++++++++++++--- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35540 -> 35628 bytes .../services/service/EmailServiceImpl.java | 12 +++++-- ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 +++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++++ .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ .../WEB-INF/content/admin/configuration-input.jsp | 37 ++++++++++++++------ .../src/main/webapp/js/configuration.js | 4 +++ 10 files changed, 133 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm