Merge pull request #3983 from IQSS/2829-Add-department

Added Department in category for Dataverse #2829
IQSS · Jul 10, 2017 · 9e39c6e · 9e39c6e
2 parents 77b6b02 + 74552c3
commit 9e39c6e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
@@ -24,6 +24,7 @@ If ``$id`` is omitted, a root dataverse is created. ``$id`` can either be a data
 
 Download the :download:`JSON example <../_static/api/dataverse-complete.json>` file and modified to create dataverses to suit your needs. The fields ``name``, ``alias``, and ``dataverseContacts`` are required. The controlled vocabulary for ``dataverseType`` is
 
+- ``DEPARTMENT``
 - ``JOURNALS``
 - ``LABORATORY``
 - ``ORGANIZATIONS_INSTITUTIONS``

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -607,6 +607,7 @@ dataverse.type.selectTab.teachingCourses=Teaching Course
 dataverse.type.selectTab.uncategorized=Uncategorized
 dataverse.type.selectTab.researchGroup=Research Group
 dataverse.type.selectTab.laboratory=Laboratory
+dataverse.type.selectTab.department=Department
 
 dataverse.description.title=A summary describing the purpose, nature, or scope of this dataverse.
 dataverse.email=Email

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearch;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -59,7 +60,7 @@
 public class Dataverse extends DvObjectContainer {
 
     public enum DataverseType {
-        RESEARCHERS, RESEARCH_PROJECTS, JOURNALS, ORGANIZATIONS_INSTITUTIONS, TEACHING_COURSES, UNCATEGORIZED, LABORATORY, RESEARCH_GROUP
+        RESEARCHERS, RESEARCH_PROJECTS, JOURNALS, ORGANIZATIONS_INSTITUTIONS, TEACHING_COURSES, UNCATEGORIZED, LABORATORY, RESEARCH_GROUP, DEPARTMENT
     };
 
     private static final long serialVersionUID = 1L;
@@ -104,25 +105,24 @@ public void setDataverseType(DataverseType dataverseType) {
     @Transient
     private final String uncategorizedString = "Uncategorized";
 
-    /**
-     * @todo Don't hard code these as English.
-     */
-    public String getFriendlyCategoryName(){
+        public String getFriendlyCategoryName(){
        switch (this.dataverseType) {
             case RESEARCHERS:
-                return "Researcher";
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.researchers");
             case RESEARCH_PROJECTS:
-                return "Research Project";
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.researchProjects");
             case JOURNALS:
-                return "Journal";            
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.journals");           
             case ORGANIZATIONS_INSTITUTIONS:
-                return "Organization or Institution";            
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.organizationsAndInsitutions");           
             case TEACHING_COURSES:
-                return "Teaching Course";
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.teachingCourses");
             case LABORATORY:
-               return "Laboratory";
+               return BundleUtil.getStringFromBundle("dataverse.type.selectTab.laboratory");
             case RESEARCH_GROUP:
-               return "Research Group";
+               return BundleUtil.getStringFromBundle("dataverse.type.selectTab.researchGroup");
+            case DEPARTMENT:
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.department");
             case UNCATEGORIZED:
                 return uncategorizedString;
             default:

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
@@ -116,12 +116,13 @@
                                     <div class="col-sm-9 form-col-container">
                                         <h:selectOneMenu id="dataverseCategory" tabindex="5" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
                                             <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
-                                            <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
-                                            <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />
-                                            <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
-                                            <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
+                                            <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
                                             <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
+                                            <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
                                             <f:selectItem id="dvOrgInst" itemLabel="#{bundle['dataverse.type.selectTab.organizationsAndInsitutions']}" itemValue="ORGANIZATIONS_INSTITUTIONS" />
+                                            <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
+                                            <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
+                                            <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />                                           
                                             <f:selectItem id="dvTeaching" itemLabel="#{bundle['dataverse.type.selectTab.teachingCourses']}" itemValue="TEACHING_COURSES" />
                                             <f:selectItem id="dvUncategorized" itemLabel="#{bundle['dataverse.type.selectTab.uncategorized']}" itemValue="UNCATEGORIZED" />
                                         </h:selectOneMenu>

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -82,11 +82,11 @@ public void testDataverseCategory() {
                 .statusCode(Status.CREATED.getStatusCode());
 
         String alias1 = UtilIT.getRandomDvAlias();
-        String category1 = Dataverse.DataverseType.LABORATORY.toString();
+        String category1 = Dataverse.DataverseType.DEPARTMENT.toString();
         Response createDataverseWithCategory = UtilIT.createDataverse(alias1, category1, apiToken);
         createDataverseWithCategory.prettyPrint();
         createDataverseWithCategory.then().assertThat()
-                .body("data.dataverseType", equalTo("LABORATORY"))
+                .body("data.dataverseType", equalTo("DEPARTMENT"))
                 .statusCode(Status.CREATED.getStatusCode());
 
         String alias2 = UtilIT.getRandomDvAlias();