December 2015 - Coselmar-commits - mailman.cloud.codelutin.com

branch feature/R7776-cloudTags-in-homepage created (now 70270ab)
by codelutin.com scm 14 Dec '15

14 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/R7776-cloudTags-in-homepage in repository coselmar. See http://git.codelutin.com/coselmar.git at 70270ab refs-10 #7776 Prepare la recherche des mots les plus pertinents sur les projets This branch includes the following new commits: new 70270ab refs-10 #7776 Prepare la recherche des mots les plus pertinents sur les projets The 1 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 70270ab3832eaa95241c4c7b95f764f1af8a8f02 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 14 17:56:16 2015 +0100 refs-10 #7776 Prepare la recherche des mots les plus pertinents sur les projets -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7648-export-recherche-projets updated (c754357 -> ea841ee)
by codelutin.com scm 11 Dec '15

11 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7648-export-recherche-projets in repository coselmar. See http://git.codelutin.com/coselmar.git discards c754357 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream discards 70d91ea #7774 utilisation de l'export en InputStream de nuiton-csv adds 5555369 refs-10 #7778 Prepare la recherche avancée sur les documents adds 4eca421 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service adds fe40b40 refs-30 #7778 Revue de la couche DAO pour la recherche de documents adds cc162cf refs-90 #7778 Revue avancée de documents adds baed38f refs-90 #7778 Ajout d'un filtre de recherche sur la date de dépot d'un document new 1ffae28 #7774 utilisation de l'export en InputStream de nuiton-csv new ea841ee 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream 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 (c754357) \ N -- N -- N refs/heads/feature/7648-export-recherche-projets (ea841ee) 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 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 ea841eeee5e8992a462156fc05ff429803e49919 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 10 10:20:10 2015 +0100 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream commit 1ffae28f2b6334194f059ccf63069e9c12f819b5 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 12:04:54 2015 +0100 #7774 utilisation de l'export en InputStream de nuiton-csv Summary of changes: .../coselmar/beans/DocumentSearchExample.java | 69 +++++++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 30 +--- .../fr/ifremer/coselmar/beans/SearchExample.java | 65 +++++++++ .../fr/ifremer/coselmar/persistence/DaoUtils.java | 34 +++++ .../coselmar/persistence/SearchRequestBean.java | 14 +- .../persistence/entity/DocumentTopiaDao.java | 137 +++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 2 +- ...UserSearchBean.java => DocumentSearchBean.java} | 35 ++++- .../coselmar/converter/BeanEntityConverter.java | 60 ++++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../indexation/QuestionsIndexationService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 48 ++++-- .../coselmar/services/v1/UsersWebService.java | 2 +- .../coselmar/services/QuestionsWebServiceTest.java | 14 +- .../indexation/QuestionsIndexationServiceTest.java | 54 +++---- coselmar-ui/src/main/webapp/i18n/en.js | 3 + coselmar-ui/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/coselmar-controllers.js | 36 +++-- .../src/main/webapp/js/coselmar-services.js | 9 +- .../src/main/webapp/views/documents/documents.html | 17 +-- .../main/webapp/views/documents/editDocument.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 162 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 2 +- 24 files changed, 690 insertions(+), 116 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserSearchBean.java => DocumentSearchBean.java} (55%) create mode 100644 coselmar-ui/src/main/webapp/views/documents/toolsPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (0bbe39e -> baed38f)
by codelutin.com scm 11 Dec '15

11 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 0bbe39e fixes #7648 finish projects export new 5555369 refs-10 #7778 Prepare la recherche avancée sur les documents new 4eca421 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service new fe40b40 refs-30 #7778 Revue de la couche DAO pour la recherche de documents new cc162cf refs-90 #7778 Revue avancée de documents new baed38f refs-90 #7778 Ajout d'un filtre de recherche sur la date de dépot d'un document The 5 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 baed38f0b722af0a54163c6c9d452e4875f9e04c Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 11 11:12:08 2015 +0100 refs-90 #7778 Ajout d'un filtre de recherche sur la date de dépot d'un document commit cc162cf7afc3aa2cc10727be2fa9cbddf59b106f Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 10 18:28:17 2015 +0100 refs-90 #7778 Revue avancée de documents commit fe40b40b0246dbd1d96678d25243b790443c985c Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 10 12:26:14 2015 +0100 refs-30 #7778 Revue de la couche DAO pour la recherche de documents commit 4eca42112887da49b1834363f93827aa7238b48d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 17:56:41 2015 +0100 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service commit 55553699ca5bdbf1aa41bb00f32a3a2950830651 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 13:05:51 2015 +0100 refs-10 #7778 Prepare la recherche avancée sur les documents Summary of changes: .../coselmar/beans/DocumentSearchExample.java | 69 +++++++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 30 +--- .../fr/ifremer/coselmar/beans/SearchExample.java | 65 +++++++++ .../fr/ifremer/coselmar/persistence/DaoUtils.java | 34 +++++ .../coselmar/persistence/SearchRequestBean.java | 14 +- .../persistence/entity/DocumentTopiaDao.java | 137 +++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 2 +- ...UserSearchBean.java => DocumentSearchBean.java} | 35 ++++- .../coselmar/converter/BeanEntityConverter.java | 60 ++++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../indexation/QuestionsIndexationService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 48 ++++-- .../coselmar/services/v1/UsersWebService.java | 2 +- .../coselmar/services/QuestionsWebServiceTest.java | 14 +- .../indexation/QuestionsIndexationServiceTest.java | 54 +++---- coselmar-ui/src/main/webapp/i18n/en.js | 3 + coselmar-ui/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/coselmar-controllers.js | 36 +++-- .../src/main/webapp/js/coselmar-services.js | 9 +- .../src/main/webapp/views/documents/documents.html | 17 +-- .../main/webapp/views/documents/editDocument.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 162 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 2 +- 24 files changed, 690 insertions(+), 116 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserSearchBean.java => DocumentSearchBean.java} (55%) create mode 100644 coselmar-ui/src/main/webapp/views/documents/toolsPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

01/05: refs-10 #7778 Prepare la recherche avancée sur les documents
by codelutin.com scm 11 Dec '15

11 Dec '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 55553699ca5bdbf1aa41bb00f32a3a2950830651 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 13:05:51 2015 +0100 refs-10 #7778 Prepare la recherche avancée sur les documents --- .../src/main/webapp/js/coselmar-controllers.js | 13 +++-- .../src/main/webapp/views/documents/documents.html | 17 +----- .../src/main/webapp/views/documents/toolsPart.html | 65 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 21 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index b690efe..2426648 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -156,15 +156,17 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara function($scope, $route, $routeParams, $location, notify, documentService, errorService){ //manage keywords if given - $scope.searchKeywords = []; + $scope.search = { searchKeywords : []}; + $scope.example = { active : "true", role : 'ALL'}; + var keywords = $routeParams.keywords; if (Array.isArray(keywords)) { - $scope.searchKeywords = keywords; + $scope.search.searchKeywords = keywords; } else if (keywords) { - $scope.searchKeywords.push(keywords); + $scope.search.searchKeywords.push(keywords); } - documentService.getDocuments($scope.searchKeywords, function(documents) { + documentService.getDocuments($scope.search.searchKeywords, function(documents) { $scope.documents = documents; }, errorService.defaultFailOnCall); @@ -185,7 +187,7 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara }; $scope.searchDocuments = function(){ - $location.search('keywords', $scope.searchKeywords); + $location.search('keywords', $scope.search.searchKeywords); }; }]); @@ -574,7 +576,6 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', }; $scope.searchUsers = function(){ - console.log("launch search"); $location.search('keywords', $scope.search.searchKeyword); $location.search('showDisable', $scope.search.showDisable); }; diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index a42e6ed..5578226 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -29,22 +29,9 @@ </h1> </div> + <div> - <div> - <div class="form-group" ng-if="context.currentUser.role == 'EXPERT' || context.currentUser.role == 'SUPERVISOR'"> - <a href="#/documents/new" class="form-inline navbar-left btn btn-primary">{{ 'document.button.add' | translate}}</a> - </div> - <form class="form-inline pull-right search-zone" role="documentOptions" ng-submit="searchDocuments()"> - <div class="form-group"> - <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> - <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> - </div> - <div class="form-group"> - <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> - </div> - </form> - </div> - <br/> + <div ng-include="src='views/documents/toolsPart.html'"></div> <table class="table"> <thead> <tr> diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html new file mode 100644 index 0000000..aba3898 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -0,0 +1,65 @@ + + +<div> +  + <div class="form-group"> + <div class="form-group" ng-if="context.currentUser.role == 'EXPERT' || context.currentUser.role == 'SUPERVISOR'"> + <a href="#/documents/new" class="form-inline navbar-left btn btn-primary">{{ 'document.button.add' | translate}}</a> + </div> + +  + + <form class="form-inline pull-right search-zone" role="documentOptions" ng-submit="searchDocuments()" ng-show="!advanced"> + <div class="form-group"> + <span class="fa fa-info-circle" tooltip-placement="bottom" + tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> + <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="search.searchKeywords" ng-list /> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-primary fa fa-search"></button> + </div> + <div class="form-group" ng-show="!advanced"> + <a ng-click="advanced=true" class="btn btn-action"> + <span class="fa fa-expand" aria-hidden="true"></span> + {{'common.button.advanceSearch' | translate }} + </a> + </div> + </form> + + </div> +</div> + +<div class="text-right clear"> +</div> + + +<div ng-show="advanced" class="search-zone marginVertical20"> + <div class="form-group text-right"> + <a ng-click="advanced=false" class="btn btn-action"><span class="fa fa-compress" aria-hidden="true"></span> {{ 'common.button.simpleSearch' | translate }}</a> + </div> + <form class="form-horizontal" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchDocuments()"> + + </form> +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7644-recherche-avancée-documents deleted (was 0ec2d8b)
by codelutin.com scm 11 Dec '15

11 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7644-recherche-avancée-documents in repository coselmar. See http://git.codelutin.com/coselmar.git was 0ec2d8b refs-90 #7778 Revue avancée de documents This change permanently discards the following revisions: discards 0ec2d8b refs-90 #7778 Revue avancée de documents discards 9424a8a refs-30 #7778 Revue de la couche DAO pour la recherche de documents discards a6df97b refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service discards 06dc1e7 refs-10 #7778 Prepare la recherche avancée sur les documents -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7644-recherche-avancée-documents updated (9424a8a -> 0ec2d8b)
by codelutin.com scm 10 Dec '15

10 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7644-recherche-avancée-documents in repository coselmar. See http://git.codelutin.com/coselmar.git from 9424a8a refs-30 #7778 Revue de la couche DAO pour la recherche de documents new 0ec2d8b refs-90 #7778 Revue avancée de documents The 1 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 0ec2d8b36d187cc228c7b3dfe16b49d17535865a Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 10 18:28:17 2015 +0100 refs-90 #7778 Revue avancée de documents Summary of changes: .../coselmar/beans/DocumentSearchExample.java | 69 ++++++++++++++++++++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 30 +--------- .../fr/ifremer/coselmar/beans/SearchExample.java | 65 ++++++++++++++++++++ .../persistence/entity/DocumentTopiaDao.java | 30 ++++++++-- .../persistence/entity/QuestionTopiaDao.java | 2 +- .../coselmar/converter/BeanEntityConverter.java | 60 +++++++++++++++++++ .../indexation/QuestionsIndexationService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 20 +++++-- .../coselmar/services/QuestionsWebServiceTest.java | 14 ++--- .../indexation/QuestionsIndexationServiceTest.java | 54 ++++++++--------- .../src/main/webapp/js/coselmar-controllers.js | 10 ++-- .../src/main/webapp/js/coselmar-services.js | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 8 +-- .../src/main/webapp/views/questions/questions.html | 2 +- 14 files changed, 284 insertions(+), 84 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7644-recherche-avancée-documents created (now 9424a8a)
by codelutin.com scm 10 Dec '15

10 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7644-recherche-avancée-documents in repository coselmar. See http://git.codelutin.com/coselmar.git at 9424a8a refs-30 #7778 Revue de la couche DAO pour la recherche de documents This branch includes the following new commits: new 06dc1e7 refs-10 #7778 Prepare la recherche avancée sur les documents new a6df97b refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service new 9424a8a refs-30 #7778 Revue de la couche DAO pour la recherche de documents 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 9424a8a5d35a41a6f947fd4c8b03042ecd7cf7ef Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 10 12:26:14 2015 +0100 refs-30 #7778 Revue de la couche DAO pour la recherche de documents commit a6df97b2448a0b14bcef22f58cca2daa652f0bcd Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 17:56:41 2015 +0100 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service commit 06dc1e766f160f90d2a8cac798c76b2ebe3da1b0 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 13:05:51 2015 +0100 refs-10 #7778 Prepare la recherche avancée sur les documents -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

02/03: refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service
by codelutin.com scm 10 Dec '15

10 Dec '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7644-recherche-avancée-documents in repository coselmar. See http://git.codelutin.com/coselmar.git commit a6df97b2448a0b14bcef22f58cca2daa652f0bcd Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 17:56:41 2015 +0100 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service --- .../ifremer/coselmar/beans/DocumentSearchBean.java | 76 ++++++++++++++++++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 19 +++--- .../coselmar/services/v1/UsersWebService.java | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 9 ++- .../src/main/webapp/js/coselmar-services.js | 9 ++- .../main/webapp/views/documents/editDocument.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 68 +++++++++++++++++++ 9 files changed, 175 insertions(+), 16 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchBean.java new file mode 100644 index 0000000..107aea3 --- /dev/null +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchBean.java @@ -0,0 +1,76 @@ +package fr.ifremer.coselmar.beans; + +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * @author ymartel <martel(a)codelutin.com> + */ +public class DocumentSearchBean extends DocumentBean { + + private static final long serialVersionUID = -2665085000774964576L; + + protected Integer limit; + protected Integer page; + protected List<String> fullTextSearch; + + + public DocumentSearchBean(String id, String name, String ownerName, String ownerId, String privacy, + Date depositDate, Collection<String> keywords, + String type, String summary, String language, Date publicationDate, + String authors, String license, String copyright, + boolean withFile, String mimeType, String externalUrl, + String comment, String fileName) { + super(id, name, ownerName, ownerId, privacy, depositDate, keywords, type, summary, language, publicationDate, authors, license, copyright, withFile, mimeType, externalUrl, comment, fileName); + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public List<String> getFullTextSearch() { + return fullTextSearch; + } + + public void setFullTextSearch(List<String> fullTextSearch) { + this.fullTextSearch = fullTextSearch; + } + +} diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java index 5715dd0..58b4b23 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java @@ -29,6 +29,7 @@ import java.util.Set; import com.google.common.collect.Sets; import fr.ifremer.coselmar.beans.DocumentBean; +import fr.ifremer.coselmar.beans.DocumentSearchBean; import fr.ifremer.coselmar.beans.QuestionBean; import fr.ifremer.coselmar.beans.QuestionSearchBean; import fr.ifremer.coselmar.beans.UserBean; @@ -52,7 +53,8 @@ public class CoselmarRestApplicationListener implements WebMotionServerListener UserBean.class, QuestionBean.class, UserSearchBean.class, - QuestionSearchBean.class + QuestionSearchBean.class, + DocumentSearchBean.class ); @Override diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java index 6c058a9..482ae7c 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java @@ -41,11 +41,15 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import fr.ifremer.coselmar.beans.DocumentBean; +import fr.ifremer.coselmar.beans.DocumentSearchBean; import fr.ifremer.coselmar.beans.QuestionBean; +import fr.ifremer.coselmar.beans.QuestionSearchBean; import fr.ifremer.coselmar.beans.UserBean; +import fr.ifremer.coselmar.beans.UserSearchBean; import fr.ifremer.coselmar.beans.UserWebToken; import fr.ifremer.coselmar.converter.BeanEntityConverter; import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; +import fr.ifremer.coselmar.persistence.SearchRequestBean; import fr.ifremer.coselmar.persistence.entity.CoselmarUser; import fr.ifremer.coselmar.persistence.entity.CoselmarUserGroup; import fr.ifremer.coselmar.persistence.entity.CoselmarUserRole; @@ -142,22 +146,19 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { return documentBean; } - public List<DocumentBean> getDocuments(List<String> searchKeywords) throws InvalidCredentialException { + public List<DocumentBean> getDocuments(DocumentSearchBean searchBean) throws InvalidCredentialException { // Check authentication String authorization = getContext().getHeader("Authorization"); - UserWebToken userWebToken = checkAuthentication(authorization); - - // Retrieve current user - String fullCurrentUserId = getFullUserIdFromShort(userWebToken.getUserId()); - CoselmarUser currentUser = getCoselmarUserDao().forTopiaIdEquals(fullCurrentUserId).findAnyOrNull(); + CoselmarUser currentUser = checkUserAuthentication(authorization); - String currentUserRole = userWebToken.getRole().toUpperCase(); + CoselmarUserRole currentUserRole = currentUser.getRole(); List<Document> documentList; // Admin and Supervisor can see all documents (public, private and restricted) - if (Lists.newArrayList(CoselmarUserRole.ADMIN.name(), CoselmarUserRole.SUPERVISOR.name()).contains(currentUserRole)) { + if (Lists.newArrayList(CoselmarUserRole.ADMIN, CoselmarUserRole.SUPERVISOR).contains(currentUserRole)) { + List<String> searchKeywords = searchBean.getFullTextSearch(); if (searchKeywords != null && !searchKeywords.isEmpty()) { DocumentsIndexationService documentsIndexationService = getServicesContext().newService(DocumentsIndexationService.class); @@ -180,7 +181,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { } else { //Other can only see public, his own private and restricted for which he is allowed - documentList = getDocumentDao().findAllFilterByUser(currentUser, searchKeywords); + documentList = getDocumentDao().findAllFilterByUser(currentUser, searchBean.getFullTextSearch()); } List<DocumentBean> result = new ArrayList<>(documentList.size()); diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java index d3fb0d6..63746ea 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java @@ -160,7 +160,7 @@ public class UsersWebService extends CoselmarWebServiceSupport { String authorization = getContext().getHeader("Authorization"); CoselmarUser currentUser = checkUserAuthentication(authorization); - // Who is allowed here ? Admin and user himself + // Who is allowed here ? Admin, Supervisor, Expert if (currentUser.getRole() != CoselmarUserRole.ADMIN && currentUser.getRole() != CoselmarUserRole.SUPERVISOR && currentUser.getRole() != CoselmarUserRole.EXPERT) { diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 2426648..cd2e0ad 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -157,7 +157,7 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara //manage keywords if given $scope.search = { searchKeywords : []}; - $scope.example = { active : "true", role : 'ALL'}; + $scope.example = { keywords: []}; var keywords = $routeParams.keywords; if (Array.isArray(keywords)) { @@ -189,6 +189,13 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara $scope.searchDocuments = function(){ $location.search('keywords', $scope.search.searchKeywords); }; + + $scope.advancedSearchDocuments = function() { + + documentService.getAdvancedUsers($scope.example, function(documents){ + $scope.documents = documents; + }); + }; }]); // Controller for new document View diff --git a/coselmar-ui/src/main/webapp/js/coselmar-services.js b/coselmar-ui/src/main/webapp/js/coselmar-services.js index 0dc895b..b145c11 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-services.js @@ -115,8 +115,7 @@ function Document(resource, config){ this.getDocuments = function(searchKeywords, successFunction, failFunction){ // Load all documents - - var docResource = resource(baseURL, {searchKeywords : searchKeywords}); + var docResource = resource(baseURL, {'searchBean' : {'fullTextSearch' : searchKeywords}}); docResource.query(successFunction, failFunction); }; @@ -136,4 +135,10 @@ function Document(resource, config){ }; + this.getAdvancedDocuments = function(searchExample, successFunction){ + // Load documents with search example + var docResource = resource(baseURL, {'searchBean' : searchExample}); + userResource.query(successFunction); + }; + }; \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 4b73fa5..b6588ec 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -118,7 +118,7 @@ </ui-select-match> <ui-select-choices - repeat="user in users track by user.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" + repeat="user in (users | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}) track by user.id" refresh="refreshUsers($select.search)" refresh-delay="500"> {{user.firstName}} {{user.name}} ({{user.organization}}) diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 7e29535..7209af4 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -127,7 +127,7 @@ </ui-select-match> <ui-select-choices - repeat="user in users track by user.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" + repeat="user in (users | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}) track by user.id" refresh="refreshUsers($select.search)" refresh-delay="500"> {{user.firstName}} {{user.name}} ({{user.organization}}) diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html index aba3898..410533b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -61,5 +61,73 @@ </div> <form class="form-horizontal" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchDocuments()"> + <div class="form-group row"> + + <label class="col-md-1 control-label">{{ 'document.metadata.name' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="Titre" ng-model="example.title" /> + </div> + + <label class="col-md-1 control-label">{{ 'document.metadata.authors' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="Nom et/ou Prénom" ng-model="example.authors" /> + </div> + + <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }}</label> + <div class="col-md-2"> + <select class="form-control" name="type" ng-model="example.type" required> + <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> + <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> + <option value="THESIS">{{ 'document.metadata.type.thesis' | translate }}</option> + <option value="REPORT">{{ 'document.metadata.type.report' | translate }}</option> + <option value="SCIENTIFIC_REPORT">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="SCIENTIFIC_WORK">{{ 'document.metadata.type.scientificWork' | translate }}</option> + <option value="CHAPTER_WORK">{{ 'document.metadata.type.chapterWork' | translate }}</option> + <option value="CONTRACT_REPORT">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="EXPERTISE">{{ 'document.metadata.type.expertise' | translate }}</option> + <option value="POSTER">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="CONFERENCE_ARTICLE">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + <option value="CONFERENCE_SUMMARY">{{ 'document.metadata.type.conferenceSummary' | translate }}</option> + <option value="DATA">{{ 'document.metadata.type.data' | translate }}</option> + <option value="OTHER">{{ 'document.metadata.type.other' | translate }}</option> + </select> + </div> + + <label class="col-md-1 control-label">{{ 'document.metadata.privacy' | translate }}</label> + <div class="col-md-2"> + <select class="form-control" name="privacy" + ng-model="example.privacy"> + <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> + <option value="PUBLIC">{{ 'common.privacy.public' | translate }}</option> + <option value="RESTRICTED">{{ 'common.privacy.restricted' | translate }}</option> + </select> + </div> + + </div> + + <div class="form-group row"> + + <label class="col-md-1 control-label">{{ 'document.metadata.depositor' | translate }}</label> + <div class="col-md-2"> + <input type="search" class="form-control" placeholder="Prénom Nom" ng-model="example.depositor" ng-list /> + + </div> + + <label class="col-md-1 control-label">{{ 'document.metadata.keywords' | translate }}</label> + <div class="col-md-2"> + <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="example.keywords" ng-list /> + </div> + + <label class="col-md-1 control-label">{{ 'document.metadata.licence' | translate }}</label> + <div class="col-md-2"> + <input type="text" class="form-control" name="licence" + placeholder="Licence" ng-model="example.licence"/> + </div> + + <div class="col-md-3 text-right"> + <button type="submit" class="btn btn-primary fa fa-search" ng-click="advancedSearchDocuments()"><span class="paddingLeft10">Search</span></button> + </div> + + </div> </form> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7648-export-recherche-projets updated (70d91ea -> c754357)
by codelutin.com scm 10 Dec '15

10 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7648-export-recherche-projets in repository coselmar. See http://git.codelutin.com/coselmar.git from 70d91ea #7774 utilisation de l'export en InputStream de nuiton-csv new c754357 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream The 1 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 c754357b793845a0539e647e4ae55d0191c70ff8 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 10 10:20:10 2015 +0100 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream Summary of changes: .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7648-export-recherche-projets created (now 70d91ea)
by codelutin.com scm 09 Dec '15

09 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7648-export-recherche-projets in repository coselmar. See http://git.codelutin.com/coselmar.git at 70d91ea #7774 utilisation de l'export en InputStream de nuiton-csv This branch includes the following new commits: new 70d91ea #7774 utilisation de l'export en InputStream de nuiton-csv The 1 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 70d91eacdc82d7d4c9a169dd1abf675854dabb91 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 9 12:04:54 2015 +0100 #7774 utilisation de l'export en InputStream de nuiton-csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1