branch feature/7849-recherche-avancée-documents created (now a7103d8)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7849-recherche-avancée-documents in repository coselmar. See http://git.codelutin.com/coselmar.git at a7103d8 refs-30 #7849 Revue de la recherche avancée de documents et ajout du critere 'date de publication' This branch includes the following new commits: new a7103d8 refs-30 #7849 Revue de la recherche avancée de documents et ajout du critere 'date de publication' 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 a7103d824aa59797ef90033f4d5d18d4270a9d4d Author: Yannick Martel <martel@©odelutin.com> Date: Mon Dec 21 11:51:31 2015 +0100 refs-30 #7849 Revue de la recherche avancée de documents et ajout du critere 'date de publication' -- 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/7849-recherche-avancée-documents in repository coselmar. See http://git.codelutin.com/coselmar.git commit a7103d824aa59797ef90033f4d5d18d4270a9d4d Author: Yannick Martel <martel@©odelutin.com> Date: Mon Dec 21 11:51:31 2015 +0100 refs-30 #7849 Revue de la recherche avancée de documents et ajout du critere 'date de publication' --- .../ifremer/coselmar/beans/DocumentSearchBean.java | 20 ++++++ .../coselmar/services/v1/DocumentsWebService.java | 10 +++ coselmar-ui/src/main/webapp/i18n/en.js | 2 + coselmar-ui/src/main/webapp/i18n/fr.js | 2 + .../src/main/webapp/js/coselmar-controllers.js | 8 +++ .../src/main/webapp/views/documents/toolsPart.html | 79 ++++++++++++++-------- 6 files changed, 94 insertions(+), 27 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 index 1b1b7e4..27daa5d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchBean.java @@ -43,6 +43,10 @@ public class DocumentSearchBean extends DocumentBean { protected Date depositBeforeDate; + protected Date publicationAfterDate; + + protected Date publicationBeforeDate; + public DocumentSearchBean(String id, String name, String ownerName, String ownerId, String privacy, Date depositDate, Collection<String> keywords, @@ -92,4 +96,20 @@ public class DocumentSearchBean extends DocumentBean { public void setDepositBeforeDate(Date depositBeforeDate) { this.depositBeforeDate = depositBeforeDate; } + + public Date getPublicationAfterDate() { + return publicationAfterDate; + } + + public void setPublicationAfterDate(Date publicationAfterDate) { + this.publicationAfterDate = publicationAfterDate; + } + + public Date getPublicationBeforeDate() { + return publicationBeforeDate; + } + + public void setPublicationBeforeDate(Date publicationBeforeDate) { + this.publicationBeforeDate = publicationBeforeDate; + } } 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 8848067..93a3b3a 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 @@ -180,6 +180,16 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { Date depositBeforeDate = DateUtil.getEndOfDay((searchBean.getDepositBeforeDate())); searchExample.setDepositBeforeDate(depositBeforeDate); } + + if (searchBean.getPublicationAfterDate() != null) { + Date publicationAfterDate = DateUtil.getEndOfDay(DateUtil.getYesterday(searchBean.getPublicationAfterDate())); + searchExample.setPublicationAfterDate(publicationAfterDate); + } + + if (searchBean.getPublicationBeforeDate() != null) { + Date publicationBeforeDate = DateUtil.getEndOfDay((searchBean.getPublicationBeforeDate())); + searchExample.setPublicationBeforeDate(publicationBeforeDate); + } } diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 1c8811a..9e850b5 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -102,6 +102,8 @@ var translateEN = { "document.metadata.depositBefore" : "Deposit before", "document.metadata.depositAfter" : "Deposit after", +"document.metadata.publishBefore" : "Publish before", +"document.metadata.publishAfter" : "Publish after", "document.message.requiredName" : "Document name is required.", "document.message.requiredType" : "Document type is required.", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 412f946..4d3d849 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -102,6 +102,8 @@ var translateFR = { "document.metadata.depositBefore" : "Déposé avant le", "document.metadata.depositAfter" : "Déposé après le", +"document.metadata.publishBefore" : "Publié avant le", +"document.metadata.publishAfter" : "Publié après le", "document.message.requiredName" : "Le nom du document est requis.", "document.message.requiredType" : "Le type du document est requis.", diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 29bdb3c..201e13e 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -211,6 +211,14 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara $scope.example.depositBeforeDate = $scope.example.depositBeforeDate.getTime(); } + if (angular.isDate($scope.example.publicationAfterDate)) { + $scope.example.publicationAfterDate = $scope.example.publicationAfterDate.getTime(); + } + + if (angular.isDate($scope.example.publicationBeforeDate)) { + $scope.example.publicationBeforeDate = $scope.example.publicationBeforeDate.getTime(); + } + documentService.getAdvancedDocuments($scope.example, function(documents){ $scope.documents = documents; }); diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html index b65ef3e..e92418d 100644 --- a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -63,18 +63,36 @@ <div class="form-group row"> + <label class="col-md-2 control-label">{{ 'document.metadata.keywords' | translate }}</label> + <div class="col-md-10"> + <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="example.keywords" ng-list /> + </div> + </div> + + <div class="form-group row"> + <label class="col-md-1 control-label">{{ 'document.metadata.name' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-3"> <input class="form-control" type="search" class="form-control" placeholder="Titre" ng-model="example.name" /> </div> <label class="col-md-1 control-label">{{ 'document.metadata.authors' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-3"> <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.depositor' | translate }}</label> + <div class="col-md-3"> + <input type="search" class="form-control" placeholder="Prénom Nom" ng-model="example.ownerName" /> + + </div> + + </div> + + <div class="form-group row"> + <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-3"> <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> @@ -94,7 +112,7 @@ </div> <label class="col-md-1 control-label">{{ 'document.metadata.privacy' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-3"> <select class="form-control" name="privacy" ng-model="example.privacy"> <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> @@ -103,27 +121,6 @@ </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.ownerName" /> - - </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="license" - placeholder="Licence" ng-model="example.license"/> - </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> @@ -133,7 +130,7 @@ <div class="form-group row"> <label class="col-md-2 control-label">{{ 'document.metadata.depositAfter' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="depositAfterDate" placeholder="dd/MM/yyyy" @@ -145,7 +142,7 @@ </div> <label class="col-md-2 control-label">{{ 'document.metadata.depositBefore' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="depositBeforeDate" placeholder="dd/MM/yyyy" @@ -156,6 +153,34 @@ </div> </div> + </div> + + <div class="form-group row"> + + <label class="col-md-2 control-label">{{ 'document.metadata.publishAfter' | translate }}</label> + <div class="col-md-4"> + <div class="input-group"> + <input type="text" class="form-control" name="publicationAfterDate" + placeholder="dd/MM/yyyy" + ng-model="example.publicationAfterDate" + datepicker-popup="dd/MM/yyyy" is-open="publicationAfterDateOpened" + ng-click="publicationAfterDateOpened = true"/> + <span class="input-group-addon"><span class="fa fa-calendar" aria-hidden="true" ng-click="publicationAfterDateOpened = true"></span></span> + </div> + </div> + + <label class="col-md-2 control-label">{{ 'document.metadata.publishBefore' | translate }}</label> + <div class="col-md-4"> + <div class="input-group"> + <input type="text" class="form-control" name="publicationBeforeDate" + placeholder="dd/MM/yyyy" + ng-model="example.publicationBeforeDate" + datepicker-popup="dd/MM/yyyy" is-open="publicationBeforeDateOpened" + ng-click="publicationBeforeDateOpened = true"/> + <span class="input-group-addon"><span class="fa fa-calendar" aria-hidden="true" ng-click="publicationBeforeDateOpened = true"></span></span> + </div> + + </div> </div> </form> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm