branch feature/9098_user_trigraph_in_table updated (f151590 -> 5d6d9e3)
This is an automated email from the git hooks/post-receive script. New change to branch feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards f151590 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente discards 9fcfbfd refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin discards abe072a refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration adds 612fdef fixes #9097 ajout de la colonne imprimé le adds 404df93 [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development adds 6535bec [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4183bc2 [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions adds 282973c [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions adds 7febca8 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' adds efb4aad [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4adc0cb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eb8efb3 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale adds 96e2192 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers adds 315f884 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin adds dac305a refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente adds bd07a3e fixes #9101 Ouvrir les pièces-jointes que en modification adds 2d536bc refs #9094 affichage d'un message de warning et ouverture en edition adds 667f866 refs #9094 ajout de la conf mustTakeToEditDemand dans les dossiers adds a026aa0 refs #9094 gestion de la conf mustTakeToEditDemand dans la partie admin adds 6b1dcef refs #9094 prise en compte de la conf mustTakeToEditDemand dans la partie cliente adds dd3a3cd fixes #9094 Demandes toujours ouvertes en modification adds a6d3711 refs #9094 fix npe adds 52d9074 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers adds 4c24877 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin adds 21cd5b7 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente adds 3ced46d fixes #9109 Simplifier le message pour quitter la demande adds bab2e84 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers adds 89074c5 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin adds fe0ebb0 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente adds 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. adds ac713b3 fixes #9105 NPE si le dossier est vide new 7bbc801 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration new 8b1fffe refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin new 3b330c4 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente new 5d6d9e3 renommage des scripts de migration This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f151590) \ N -- N -- N refs/heads/feature/9098_user_trigraph_in_table (5d6d9e3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 5d6d9e313b3e4d757c94f60f465ed01f170ae2a1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 28 11:37:23 2017 +0200 renommage des scripts de migration commit 3b330c49776b828c32d58d30528e4d80b9a469f8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente commit 8b1fffe06386d09af0f1e9dfeaeb147ab1ed2a92 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:15 2017 +0100 refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin commit 7bbc801cb727a201671eb9195cc9fdd5bdf18240 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/beans/QuantitiesByRange.java | 19 +++++- .../persistence/entities/EmailFilter.java | 13 ++++ .../persistence/entities/EmailTopiaDao.java | 57 ++++++++++++++-- .../faxtomail/persistence/entities/MailField.java | 6 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35357 -> 35759 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 33 ++++------ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 ++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++ .../h2/V2_4_170316_2__add_mustTakeToEditDemand.sql | 4 ++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 4 ++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 ++ ...328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 .../V2_2_3_170315__add_last_printing_date.sql | 14 ++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 ++ .../V2_4_170316_2__add_mustTakeToEditDemand.sql | 6 ++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 ++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++ ...328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../ui/swing/actions/ShowDemandeAction.java | 70 ++++++++++++-------- .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 23 ++++++- .../attachment/AttachmentEditorUIModel.java | 13 ++++ .../ui/swing/content/attachment/AttachmentItem.css | 11 +++- .../swing/content/attachment/AttachmentItem.jaxx | 10 ++- .../content/attachment/AttachmentModelAware.java | 2 + .../swing/content/attachment/ButtonAttachment.java | 5 ++ .../content/demande/DemandeListUIHandler.java | 4 ++ .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++------ .../ui/swing/content/demande/DemandeUIModel.java | 26 +++++++- .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++--- .../actions/OpenGroupedDemandAction.java | 72 +++++++++++++-------- .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++-- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 8 +++ faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/SearchAction.java | 6 ++ .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 68 +++++++++++++++++++ .../src/main/webapp/js/configuration.js | 16 +++++ pom.xml | 2 +- 46 files changed, 535 insertions(+), 132 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315__add_last_printing_date.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_2__add_mustTakeToEditDemand.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql rename faxtomail-service/src/main/resources/db/migration/h2/{V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} (100%) create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315__add_last_printing_date.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_2__add_mustTakeToEditDemand.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql rename faxtomail-service/src/main/resources/db/migration/sqlserver/{V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} (100%) -- 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 feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 7bbc801cb727a201671eb9195cc9fdd5bdf18240 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35628 -> 35759 bytes ...70315_1__add_displayOnlyUserTrigraphInTables.sql | 4 ++++ ...70315_1__add_displayOnlyUserTrigraphInTables.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 ef2f72d..07e6ab9 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_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql new file mode 100644 index 0000000..d49458d --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql @@ -0,0 +1,4 @@ +-- add displayOnlyUserTrigraphInTables + +alter table mailfolder add displayOnlyUserTrigraphInTables boolean; +update mailfolder set displayOnlyUserTrigraphInTables = 'f' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql new file mode 100644 index 0000000..68d818c --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql @@ -0,0 +1,6 @@ +-- add displayOnlyUserTrigraphInTables + +alter table mailfolder add displayOnlyUserTrigraphInTables bit; +GO +update mailfolder set displayOnlyUserTrigraphInTables = 1 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 feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 8b1fffe06386d09af0f1e9dfeaeb147ab1ed2a92 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:15 2017 +0100 refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 101 ++++++++++++--------- .../src/main/webapp/js/configuration.js | 10 +- 2 files changed, 64 insertions(+), 47 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 fe3f5b2..bb07e73 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 @@ -1162,54 +1162,71 @@ </div> <div id="collapse8" class="panel-collapse collapse"> <div class="panel-body"> + <div class="form-group"> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" + ng-value="false" ng-change="initFolderColumns()" /> + Hériter des colonnes déclarées sur les dossiers parent : + </label> - <label ng-if="selectedMailFolder.$parent"> - <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" - ng-value="false" ng-change="initFolderColumns()" /> - Hériter des colonnes déclarées sur les dossiers parent : - </label> + <div class="control-group" ng-show="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> + <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="parentFolderTableColumns" + simple-query="getObjectsData" multiple sortable disabled> + </div> + </div> - <div class="control-group" ng-show="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> - <div class="controls"> - <input type="hidden" ui-select2-sortable ng-model="parentFolderTableColumns" - simple-query="getObjectsData" multiple sortable disabled> + <div ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="mailField in parentFolderTableColumns">{{tableMailFields[mailField.id]}}</th> + </tr> + </thead> + </table> </div> - </div> - <div ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> - <table id='table-snapshot' class="table table-bordered"> - <caption>Aperçu</caption> - <thead> - <tr> - <th ng-repeat="mailField in parentFolderTableColumns">{{tableMailFields[mailField.id]}}</th> - </tr> - </thead> - </table> - </div> - - <label> - <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" - ng-change="initFolderColumns()" ng-if="selectedMailFolder.$parent" /> - Définir les colonnes à afficher pour ce dossier : - </label> - - <div class="control-group" ng-show="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> - <div class="controls"> - <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" - simple-query="getObjectsData" multiple sortable> - <p class="help-block">(l'ordre peut être changé en faisant un glisser/déposer sur les champs)</p> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" + ng-change="initFolderColumns()" ng-if="selectedMailFolder.$parent" /> + Définir les colonnes à afficher pour ce dossier : + </label> + + <div class="control-group" ng-show="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> + <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" + simple-query="getObjectsData" multiple sortable> + <p class="help-block">(l'ordre peut être changé en faisant un glisser/déposer sur les champs)</p> + </div> </div> - </div> - <div ng-if="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> - <table id='table-snapshot' class="table table-bordered"> - <caption>Aperçu</caption> - <thead> - <tr> - <th ng-repeat="mailField in folderTableColumns">{{tableMailFields[mailField.id]}}</th> - </tr> - </thead> - </table> + <div ng-if="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="mailField in folderTableColumns">{{tableMailFields[mailField.id]}}</th> + </tr> + </thead> + </table> + </div> + </div> + <div class="form-group"> + <label class="control-label">N'afficher que les trigrammes dans les colonnes utilisateurs ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.displayOnlyUserTrigraphInTables" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.displayOnlyUserTrigraphInTables" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.displayOnlyUserTrigraphInTables" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.displayOnlyUserTrigraphInTables ? 'Oui' : 'Non'}}) + </label> </div> </div> </div> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 28d8507..c9b9309 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -785,7 +785,8 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $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; + $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer || false; + $scope.selectedMailFolder.displayOnlyUserTrigraphInTables = $scope.selectedMailFolder.displayOnlyUserTrigraphInTables || false; } // initialisation des valeurs du parent @@ -914,6 +915,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; } + if (angular.isUndefined($scope.parentScopeValues.displayOnlyUserTrigraphInTables)) { + $scope.parentScopeValues.displayOnlyUserTrigraphInTables = folder.displayOnlyUserTrigraphInTables; + } if ((!$scope.parentScopeValues.waitingStates || $scope.parentScopeValues.waitingStates.length == 0) && folder.waitingStates) { $scope.parentScopeValues.waitingStates = folder.waitingStates; } @@ -923,10 +927,6 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if ((!$scope.parentScopeValues.ranges || $scope.parentScopeValues.ranges.length == 0) && folder.ranges) { $scope.parentScopeValues.ranges = folder.ranges; } - console.log($scope.parentScopeValues.invalidFormDisabledActions) - if ($scope.parentScopeValues.invalidFormDisabledActions) - console.log($scope.parentScopeValues.invalidFormDisabledActions.length == 0) - console.log(folder.invalidFormDisabledActions) if ((!$scope.parentScopeValues.invalidFormDisabledActions || $scope.parentScopeValues.invalidFormDisabledActions.length == 0) && folder.invalidFormDisabledActions) { $scope.parentScopeValues.invalidFormDisabledActions = folder.invalidFormDisabledActions; } -- 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 feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 3b330c49776b828c32d58d30528e4d80b9a469f8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente --- .../franciaflex/faxtomail/services/DecoratorService.java | 1 + .../faxtomail/services/DecoratorServiceImpl.java | 1 + .../ui/swing/content/demande/DemandeListUIHandler.java | 5 +++++ .../ui/swing/content/demande/DemandeListUIModel.java | 16 ++++++++++++++++ .../ui/swing/content/search/SearchToGroupUIHandler.java | 5 +++++ .../ui/swing/content/search/SearchUIHandler.java | 5 +++++ .../swing/util/AbstractFaxToMailDemandListHandler.java | 9 ++++++++- 7 files changed, 41 insertions(+), 1 deletion(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java index 64b63c3..337bc50 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java @@ -32,6 +32,7 @@ import org.nuiton.decorator.Decorator; public interface DecoratorService extends FaxToMailService { String SEPARATOR = "#"; String DATE = "date"; + String SHORT = "short"; <O> Decorator<O> getDecorator(O object); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java index a29f8a0..b7cc8aa 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java @@ -141,6 +141,7 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec }); registerMultiJXPathDecorator(Reply.class, "${sentDate}$s#${subject}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(FaxToMailUser.class, "${lastName}$s#${firstName}$s#${trigraph}$s", SEPARATOR, " "); + registerMultiJXPathDecorator(FaxToMailUser.class, SHORT, "${trigraph}$s", SEPARATOR, " "); registerMultiJXPathDecorator(Client.class, "${code}$s#${name}$s#${brand}$s", SEPARATOR, " - "); } }; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 9e66904..ce69130 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -526,6 +526,11 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem return super.populateColumnModel(table, sortable); } + @Override + protected boolean isDisplayOnlyUserTrigraphInTables() { + return getModel().isDisplayOnlyUserTrigraphInTables(); + } + protected void loadFolderDemands(Map<MailFolder, FolderTreeNode> nodesByFolder) { DemandeListUIModel model = getModel(); MailFolder folder = model.getSelectedFolder(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index 3a58f60..2fdac33 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -94,6 +94,8 @@ public class DemandeListUIModel extends AbstractSerializableBean { protected int savNb; + protected Boolean displayOnlyUserTrigraphInTables; + public List<MailFolder> getFolders() { return folders; } @@ -187,6 +189,16 @@ public class DemandeListUIModel extends AbstractSerializableBean { public void setSelectedFolder(MailFolder selectedFolder) { Object oldValue = getSelectedFolder(); this.selectedFolder = selectedFolder; + + if (selectedFolder != null) { + MailFolder folderWithDisplayOnlyUserTrigraphInTables = selectedFolder; + while (folderWithDisplayOnlyUserTrigraphInTables.getParent() != null + && folderWithDisplayOnlyUserTrigraphInTables.getDisplayOnlyUserTrigraphInTables() == null) { + folderWithDisplayOnlyUserTrigraphInTables = folderWithDisplayOnlyUserTrigraphInTables.getParent(); + } + displayOnlyUserTrigraphInTables = folderWithDisplayOnlyUserTrigraphInTables.getDisplayOnlyUserTrigraphInTables(); + } + firePropertyChange(PROPERTY_SELECTED_FOLDER, oldValue, selectedFolder); } @@ -299,4 +311,8 @@ public class DemandeListUIModel extends AbstractSerializableBean { this.enableChangeResultPerPage = enableChangeResultPerPage; firePropertyChange(PROPERTY_ENABLE_CHANGE_RESULT_PER_PAGE, oldValue, enableChangeResultPerPage); } + + public boolean isDisplayOnlyUserTrigraphInTables() { + return Boolean.TRUE.equals(displayOnlyUserTrigraphInTables); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java index 19edf99..cc3a56d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java @@ -332,6 +332,11 @@ public class SearchToGroupUIHandler extends AbstractFaxToMailDemandListHandler<S return tableColumns; } + @Override + protected boolean isDisplayOnlyUserTrigraphInTables() { + return false; + } + protected boolean isDemandSelectable(DemandeUIModel demand) { DemandeUIModel currentDemand = getContext().getCurrentEmail(); return !currentDemand.equals(demand) && !currentDemand.getGroupedDemandes().contains(demand); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index cd72c65..9ecbaf3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -303,6 +303,11 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI } @Override + protected boolean isDisplayOnlyUserTrigraphInTables() { + return false; + } + + @Override protected JComponent getComponentToFocus() { return getUI().getModifiedByComboBox(); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java index 763c0b1..d7b20dd 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java @@ -33,6 +33,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; +import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentCellEditor; @@ -233,7 +234,11 @@ public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMail case TAKEN_BY: case LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER: case LAST_PRINTING_USER: - tableCellRenderer = newTableCellRender(FaxToMailUser.class); + String name = null; + if (isDisplayOnlyUserTrigraphInTables()) { + name = DecoratorService.SHORT; + } + tableCellRenderer = newTableCellRender(FaxToMailUser.class, name); break; default: @@ -258,6 +263,8 @@ public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMail return StringUtils.join(columns, "-"); } + protected abstract boolean isDisplayOnlyUserTrigraphInTables(); + protected MouseListener getDataTableMouseListener() { return new MouseAdapter() { public void mouseClicked(MouseEvent evt) { -- 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 feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 5d6d9e313b3e4d757c94f60f465ed01f170ae2a1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 28 11:37:23 2017 +0200 renommage des scripts de migration --- ...nTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 ...nTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql similarity index 100% rename from faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql rename to faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql similarity index 100% rename from faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql rename to faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm