Merge from master

Author: kazoompa

mica-core/src/main/java/org/obiba/mica/study/service/StudyService.java

@@ -1,6 +1,5 @@
 package org.obiba.mica.study.service;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -259,7 +258,14 @@ private String getNextId(LocalizedString suggested) {
   }
 
   @Nullable
-  private Study unpublish(StudyState studyState) {
+  public Study unpublish(String id) {
+    StudyState studyState = studyStateRepository.findOne(id);
+    return studyState == null ? null : unpublish(studyState);
+  }
+
+  @CacheEvict(value = { "studies-draft", "studies-published" }, key = "#id")
+  @Nullable
+  public Study unpublish(StudyState studyState) {
     log.info("Unpublish state since there are no Git repo for study: {}", studyState.getId());
     studyState.resetRevisionsAhead();
     studyState.setPublishedTag(null);

mica-rest/src/main/java/org/obiba/mica/study/rest/DraftStudyResource.java

@@ -1,7 +1,5 @@
 package org.obiba.mica.study.rest;
 
-import java.io.IOException;
-
 import javax.inject.Inject;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -12,10 +10,10 @@
 
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.obiba.mica.file.rest.FileResource;
 import org.obiba.mica.core.security.Roles;
-import org.obiba.mica.study.service.StudyService;
+import org.obiba.mica.file.rest.FileResource;
 import org.obiba.mica.study.domain.Study;
+import org.obiba.mica.study.service.StudyService;
 import org.obiba.mica.web.model.Dtos;
 import org.obiba.mica.web.model.Mica;
 import org.springframework.context.ApplicationContext;
@@ -67,16 +65,26 @@ public Response update(@SuppressWarnings("TypeMayBeWeakened") Mica.StudyDto stud
 
   @PUT
   @Path("/_publish")
+  @RequiresRoles(Roles.MICA_ADMIN)
   @Timed
   public Response publish() {
     studyService.publish(id);
     return Response.noContent().build();
   }
 
+  @DELETE
+  @Path("/_publish")
+  @RequiresRoles(Roles.MICA_ADMIN)
+  public Response unPublish() {
+    studyService.unpublish(id);
+    return Response.noContent().build();
+  }
+
   /**
    * DELETE  /ws/studies/:id -> delete the "id" study.
    */
   @DELETE
+  @RequiresRoles(Roles.MICA_ADMIN)
   @Timed
   public Response delete() {
     studyService.delete(id);

mica-search/src/main/resources/study-facets.yml

@@ -22,7 +22,11 @@
 
 id:
 start:
+  properties:
+    type: "stats"
 end:
+  properties:
+    type: "stats"
 access:
 
 methods:
@@ -46,6 +50,9 @@ populations:
     ageMin:
       properties:
         type: "stats"
+    ageMax:
+      properties:
+        type: "stats"
     gender:
 
   recruitment:

mica-webapp/src/main/conf/mica-aggregations.yml

@@ -4,8 +4,6 @@ network:
 study:
 - id: methods-designs
   title: {en: Study design}
-- id: populations-recruitment-dataSources
-  title: {en: Recruitment datasource}
 - id: populations-selectionCriteria-countriesIso
   title: {en: Country of residence}
 - id: populations-selectionCriteria-ageMin
@@ -22,12 +20,14 @@ study:
   title: {en: Target number of participants with samples}
 - id: methods-recruitments
   title: {en: Recruitment target}
+- id: populations-recruitment-dataSources
+  title: {en: Sources of recruitment}
 - id: populations-recruitment-generalPopulationSources
   title: {en: General population sources}
 - id: populations-dataCollectionEvents-dataSources
   title: {en: Data sources}
 - id: access
-  title: {en: Access}
+  title: {en: Access permitted}
 - id: populations-dataCollectionEvents-bioSamples
   title: {en: Biosamples}
 - id: start

mica-webapp/src/main/conf/mica-studies.yml

@@ -26,12 +26,12 @@ vocabularies:
         title: {en: Members of specific association}
       - name: other
         title: {en: Other specific population}
-  - name: selectionCriteriaGender
+  - name: populations-selectionCriteria-gender
     terms:
       - name: men
-        title: {en: Men}
+        title: {en: Men only}
       - name: women
-        title: {en: Women}
+        title: {en: Women only}
   - name: selectionCriteriaCriteria
     terms:
       - name: gravidity

mica-webapp/src/main/webapp/app/study/study-controller.js

@@ -293,7 +293,7 @@ mica.study
           return opts ? opts[0] : [];
         }
 
-        $scope.selectionCriteriaGenders = extractVocabulary('selectionCriteriaGender').map(function (obj) {
+        $scope.selectionCriteriaGenders = extractVocabulary('populations-selectionCriteria-gender').map(function (obj) {
           return {id: obj.name, label: obj.label};
         });
         $scope.availableSelectionCriteria = extractVocabulary('selectionCriteriaCriteria');

mica-webapp/src/main/webapp/app/study/views/population/population-view.html

@@ -19,7 +19,7 @@ <h5 translate>study.selection-criteria.label</h5>
 
   <dl class="dl-horizontal">
     <dt translate ng-show="population.selectionCriteria.gender">study.selection-criteria.gender.label</dt>
-    <dd ng-show="population.selectionCriteria.gender" ng-bind="getLabel('selectionCriteriaGender', population.selectionCriteria.gender)">
+    <dd ng-show="population.selectionCriteria.gender" ng-bind="getLabel('populations-selectionCriteria-gender', population.selectionCriteria.gender)">
     </dd>
 
     <dt translate ng-show="population.selectionCriteria.ageMin || population.selectionCriteria.ageMax">