+ + + H=C3=A9riter des colonnes d=C3=A9clar=C3=A9es su= r les dossiers parent : + =20 - - - H=C3=A9riter des colonnes d=C3=A9clar=C3=A9es sur = les dossiers parent : - +

+ +

=20 -

- +

+ + + + + + + +

Aper=C3=A7u
{{tableMailFields[mailField.id]}}

=20 -

- - - - - - - -

Aper=C3=A7u
{{tableMailFields[mailField.id]}}

- =20 - - - D=C3=A9finir les colonnes =C3=A0 afficher pour ce = dossier : - - =20 -

=20 -

- -

(l'ordre peut =C3=AAtre = chang=C3=A9 en faisant un glisser/d=C3=A9poser sur les champs)

+ + + D=C3=A9finir les colonnes =C3=A0 afficher pour c= e dossier : + + +

+ +

(l'ordre peut =C3=AAtr= e chang=C3=A9 en faisant un glisser/d=C3=A9poser sur les champs)

=20 -

- - - - - - - -

Aper=C3=A7u
{{tableMailFields[mailField.id]}}

+ + + + + + + +

Aper=C3=A7u
{{tableMailFields[mailField.id]}}

+ N'afficher que les = trigrammes dans les colonnes utilisateurs ?
+ + oui + + + non + + + h=C3=A9riter du dossier parent + ({{parentScopeValues.displayOnlyUserTrigraph= InTables ? 'Oui' : 'Non'}}) +

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('ConfigurationTreeControll= er', ['$scope', '$windo $scope.selectedMailFolder.printActionEqualTakeAction =3D $scope.se= lectedMailFolder.printActionEqualTakeAction || false; $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken =3D $= scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken || false; $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly =3D $sco= pe.selectedMailFolder.lockedDemandsOpenableInReadOnly || false; - $scope.selectedMailFolder.ediTransfer =3D $scope.selectedMailFolde= r.ediTransfer|| false; + $scope.selectedMailFolder.ediTransfer =3D $scope.selectedMailFolde= r.ediTransfer || false; + $scope.selectedMailFolder.displayOnlyUserTrigraphInTables =3D $sco= pe.selectedMailFolder.displayOnlyUserTrigraphInTables || false; } =20 // initialisation des valeurs du parent @@ -898,6 +899,9 @@ ConfigurationModule.controller('ConfigurationTreeControll= er', ['$scope', '$windo if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentSc= opeValues.folderTableColumns.length =3D=3D 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns =3D folder.folderTable= Columns; } + if (angular.isUndefined($scope.parentScopeValues.displayOnlyUserTrig= raphInTables)) { + $scope.parentScopeValues.displayOnlyUserTrigraphInTables =3D folde= r.displayOnlyUserTrigraphInTables; + } if ((!$scope.parentScopeValues.waitingStates || $scope.parentScopeVa= lues.waitingStates.length =3D=3D 0) && folder.waitingStates) { $scope.parentScopeValues.waitingStates =3D folder.waitingStates; } @@ -907,10 +911,6 @@ ConfigurationModule.controller('ConfigurationTreeControl= ler', ['$scope', '$windo if ((!$scope.parentScopeValues.ranges || $scope.parentScopeValues.ra= nges.length =3D=3D 0) && folder.ranges) { $scope.parentScopeValues.ranges =3D folder.ranges; } - console.log($scope.parentScopeValues.invalidFormDisabledActions) - if ($scope.parentScopeValues.invalidFormDisabledActions) - console.log($scope.parentScopeValues.invalidFormDisabledActions.leng= th =3D=3D 0) - console.log(folder.invalidFormDisabledActions) if ((!$scope.parentScopeValues.invalidFormDisabledActions || $scope.= parentScopeValues.invalidFormDisabledActions.length =3D=3D 0) && folder.inval= idFormDisabledActions) { $scope.parentScopeValues.invalidFormDisabledActions =3D folder.inv= alidFormDisabledActions; } --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============1575888548736123797==-- From scm@users.codelutin.com Wed Mar 15 11:18:48 2017 From: "codelutin.com scm" To: faxtomail-commits@list.forge.codelutin.com Subject: [Faxtomail-commits] branch feature/9098_user_trigraph_in_table created (now f151590) Date: Wed, 15 Mar 2017 11:18:47 +0100 Message-ID: <20170315101847.2779.17824@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2008045542170823898==" --===============2008045542170823898== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New change to branch feature/9098_user_trigraph_in_table in repository faxtom= ail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at f151590 refs #9098 prise en compte de la conf displayOnlyUserTr= igraphInTables dans la partie cliente This branch includes the following new commits: new abe072a refs #9098 ajout de la configuration displayOnlyUserTri= graphInTables + migration new 9fcfbfd refs #9098 gestion de la conf displayOnlyUserTrigraphIn= Tables dans la partie admin new f151590 refs #9098 prise en compte de la conf displayOnlyUserTr= igraphInTables 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 Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dan= s la partie cliente commit 9fcfbfdf46879f37410582efb9f03ec1d4f3b882 Author: Kevin Morin Date: Wed Mar 15 11:11:15 2017 +0100 refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la par= tie admin commit abe072ae31fd893ddc7d84a265af5f1e461f4937 Author: Kevin Morin Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + mi= gration --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============2008045542170823898==-- From scm@users.codelutin.com Wed Mar 15 11:18:48 2017 From: "codelutin.com scm" To: faxtomail-commits@list.forge.codelutin.com Subject: [Faxtomail-commits] 01/03: refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration Date: Wed, 15 Mar 2017 11:18:48 +0100 Message-ID: <20170315101848.350405C03FB@goh.codelutin.com> In-Reply-To: <20170315101847.2779.17824@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3944399253311417442==" --===============3944399253311417442== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch feature/9098_user_trigraph_in_table in repository faxtom= ail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit abe072ae31fd893ddc7d84a265af5f1e461f4937 Author: Kevin Morin Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + mi= gration --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35274 -> 35357 byt= es ...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-p= ersistence/src/main/xmi/faxtomail.zargo index 646af6c..69c857b 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxto= mail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_1703= 15_1__add_displayOnlyUserTrigraphInTables.sql b/faxtomail-service/src/main/re= sources/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__a= dd_displayOnlyUserTrigraphInTables.sql @@ -0,0 +1,4 @@ +-- add displayOnlyUserTrigraphInTables + +alter table mailfolder add displayOnlyUserTrigraphInTables boolean; +update mailfolder set displayOnlyUserTrigraphInTables =3D 'f' where parent i= s 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_displayOnlyUserTri= graphInTables.sql new file mode 100644 index 0000000..68d818c --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_1703= 15_1__add_displayOnlyUserTrigraphInTables.sql @@ -0,0 +1,6 @@ +-- add displayOnlyUserTrigraphInTables + +alter table mailfolder add displayOnlyUserTrigraphInTables bit; +GO +update mailfolder set displayOnlyUserTrigraphInTables =3D 1 where parent is = null; +GO \ No newline at end of file --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============3944399253311417442==-- From scm@users.codelutin.com Wed Mar 15 11:18:48 2017 From: "codelutin.com scm" To: faxtomail-commits@list.forge.codelutin.com Subject: [Faxtomail-commits] 03/03: refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente Date: Wed, 15 Mar 2017 11:18:50 +0100 Message-ID: <20170315101848.C19085D802B@goh.codelutin.com> In-Reply-To: <20170315101847.2779.17824@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1798153097730292966==" --===============1798153097730292966== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch feature/9098_user_trigraph_in_table in repository faxtom= ail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f15159062dab15dcd07f09af80c7634d38ec4740 Author: Kevin Morin Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dan= s 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/servic= es/DecoratorService.java b/faxtomail-service/src/main/java/com/franciaflex/fa= xtomail/services/DecoratorService.java index 64b63c3..337bc50 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/Deco= ratorService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/Deco= ratorService.java @@ -32,6 +32,7 @@ import org.nuiton.decorator.Decorator; public interface DecoratorService extends FaxToMailService { String SEPARATOR =3D "#"; String DATE =3D "date"; + String SHORT =3D "short"; =20 Decorator getDecorator(O object); =20 diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/servic= es/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciafle= x/faxtomail/services/DecoratorServiceImpl.java index a29f8a0..b7cc8aa 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/Deco= ratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/Deco= ratorServiceImpl.java @@ -141,6 +141,7 @@ public class DecoratorServiceImpl extends FaxToMailServic= eSupport implements Dec }); registerMultiJXPathDecorator(Reply.class, "${sentDate}$s#${s= ubject}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(FaxToMailUser.class, "${lastNam= e}$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/sw= ing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/j= ava/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.j= ava index 6804697..25e0e72 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con= tent/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con= tent/demande/DemandeListUIHandler.java @@ -522,6 +522,11 @@ public class DemandeListUIHandler extends AbstractFaxToM= ailDemandListHandler nodesBy= Folder) { DemandeListUIModel model =3D getModel(); MailFolder folder =3D model.getSelectedFolder(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw= ing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/jav= a/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/con= tent/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con= tent/demande/DemandeListUIModel.java @@ -94,6 +94,8 @@ public class DemandeListUIModel extends AbstractSerializabl= eBean { =20 protected int savNb; =20 + protected Boolean displayOnlyUserTrigraphInTables; + public List getFolders() { return folders; } @@ -187,6 +189,16 @@ public class DemandeListUIModel extends AbstractSerializ= ableBean { public void setSelectedFolder(MailFolder selectedFolder) { Object oldValue =3D getSelectedFolder(); this.selectedFolder =3D selectedFolder; + + if (selectedFolder !=3D null) { + MailFolder folderWithDisplayOnlyUserTrigraphInTables =3D selecte= dFolder; + while (folderWithDisplayOnlyUserTrigraphInTables.getParent() != =3D null + && folderWithDisplayOnlyUserTrigraphInTables.getDisplayOn= lyUserTrigraphInTables() =3D=3D null) { + folderWithDisplayOnlyUserTrigraphInTables =3D folderWithDisp= layOnlyUserTrigraphInTables.getParent(); + } + displayOnlyUserTrigraphInTables =3D folderWithDisplayOnlyUserTri= graphInTables.getDisplayOnlyUserTrigraphInTables(); + } + firePropertyChange(PROPERTY_SELECTED_FOLDER, oldValue, selectedFolde= r); } =20 @@ -299,4 +311,8 @@ public class DemandeListUIModel extends AbstractSerializa= bleBean { this.enableChangeResultPerPage =3D 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/sw= ing/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/con= tent/search/SearchToGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con= tent/search/SearchToGroupUIHandler.java @@ -332,6 +332,11 @@ public class SearchToGroupUIHandler extends AbstractFaxT= oMailDemandListHandler~~. --===============1798153097730292966==--~~