branch feature/9098_user_trigraph_in_table created (now f151590)
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 at f151590 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente This branch includes the following new commits: new abe072a refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration new 9fcfbfd refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin new f151590 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente The 3 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 f15159062dab15dcd07f09af80c7634d38ec4740 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 9fcfbfdf46879f37410582efb9f03ec1d4f3b882 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 abe072ae31fd893ddc7d84a265af5f1e461f4937 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration -- 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 abe072ae31fd893ddc7d84a265af5f1e461f4937 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 35274 -> 35357 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 646af6c..69c857b 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 9fcfbfdf46879f37410582efb9f03ec1d4f3b882 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 a08dc36..dc0f0fc 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 @@ -1094,54 +1094,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 29e98f6..d0e91f7 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -781,7 +781,8 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.printActionEqualTakeAction = $scope.selectedMailFolder.printActionEqualTakeAction || false; $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken = $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken || false; $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly = $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly || 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 @@ -898,6 +899,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; } @@ -907,10 +911,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 f15159062dab15dcd07f09af80c7634d38ec4740 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 6804697..25e0e72 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 @@ -522,6 +522,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 982b57d..6c54e6d 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; @@ -232,7 +233,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: @@ -257,6 +262,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>.
participants (1)
-
codelutin.com scm