CSPACE-1040: Added status, honorific fields to Person schema.

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
index a1e1e4c6f4ccf6ef6b31e2a951d99c2797113bf5..1134df6e106233d0feb774e30e64f7cc8a539ef0 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -73,6 +73,7 @@
         <row><widget>initials</widget></row>
         <row><widget>salutation</widget></row>
         <row><widget>title</widget></row>
+        <row><widget>honorifics</widget></row>
         <row><widget>nameAdditions</widget></row>
         <row><widget>birthDate</widget></row>
         <row><widget>deathDate</widget></row>
@@ -85,11 +86,12 @@
         <row><widget>schoolOrStyle</widget></row>
         <row><widget>bioNote</widget></row>
         <row><widget>nameNote</widget></row>
+        <row><widget>status</widget></row>
       </rows>
 
       <widget name="displayName" type="text">
         <labels>
-          <label mode="any">DisplayName</label>
+          <label mode="any">displayName</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -102,7 +104,7 @@
       
       <widget name="refName" type="text">
         <labels>
-          <label mode="any">RefName</label>
+          <label mode="any">refName</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -115,7 +117,7 @@
       
       <widget name="inAuthority" type="text">
         <labels>
-          <label mode="any">PersonAuthority</label>
+          <label mode="any">inAuthority (PersonAuthority)</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -128,7 +130,7 @@
 
       <widget name="foreName" type="text">
         <labels>
-          <label mode="any">Forename</label>
+          <label mode="any">foreName</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -141,7 +143,7 @@
       
       <widget name="middleName" type="text">
         <labels>
-          <label mode="any">Middle Name</label>
+          <label mode="any">middleName</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -154,7 +156,7 @@
       
       <widget name="surName" type="text">
         <labels>
-          <label mode="any">Surname</label>
+          <label mode="any">surName</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -167,7 +169,7 @@
       
       <widget name="initials" type="text">
         <labels>
-          <label mode="any">Initials</label>
+          <label mode="any">initials</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -180,7 +182,7 @@
       
       <widget name="salutation" type="text">
         <labels>
-          <label mode="any">Salutation</label>
+          <label mode="any">salutation</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -193,7 +195,7 @@
       
       <widget name="title" type="text">
         <labels>
-          <label mode="any">Title</label>
+          <label mode="any">title</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -203,6 +205,19 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
+
+      <widget name="honorifics" type="text">
+        <labels>
+          <label mode="any">honorifics</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="persons_common">honorifics</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
       
       <widget name="nameAdditions" type="text">
         <labels>
@@ -359,6 +374,19 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
+
+      <widget name="status" type="text">
+        <labels>
+          <label mode="any">status</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="persons_common">status</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
       
     </layout>
   </extension>

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
index 279189230318354eabd1dfeba3c4c50dca01fcd8..cc48cc207b680394d627e8203ee25c7b9ee6e413 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
@@ -20,30 +20,32 @@
 >
 <!-- See http://wiki.collectionspace.org/display/collectionspace/Person+Service+Home -->    
 
-               <!--  Person Information Group -->
-               <!--  inAuthority is the csid of the owning PersonAuthority -->
-               <xs:element name="inAuthority" type="xs:string" />
-               <xs:element name="refName" type="xs:string"/>
-               <xs:element name="displayName" type="xs:string"/>
-               <xs:element name="displayNameComputed" type="xs:boolean"/>
-               <xs:element name="foreName" type="xs:string"/>
-               <xs:element name="middleName" type="xs:string"/>
-               <xs:element name="surName" type="xs:string"/>
-               <xs:element name="initials" type="xs:string"/>
-               <xs:element name="salutation" type="xs:string"/>
-               <xs:element name="title" type="xs:string"/>
-               <xs:element name="nameAdditions" type="xs:string"/>
-               <xs:element name="birthDate" type="xs:string"/>
-               <xs:element name="deathDate" type="xs:string"/>
-               <xs:element name="birthPlace" type="xs:string"/>
-               <xs:element name="deathPlace" type="xs:string"/>
-               <xs:element name="group" type="xs:string"/>
-               <xs:element name="nationality" type="xs:string"/>
-               <xs:element name="gender" type="xs:string"/>
-               <xs:element name="occupation" type="xs:string"/>
-               <xs:element name="schoolOrStyle" type="xs:string"/>
-               <xs:element name="bioNote" type="xs:string"/>
-               <xs:element name="nameNote" type="xs:string"/>
+    <!--  Person Information Group -->
+    <!--  inAuthority is the csid of the owning PersonAuthority -->
+    <xs:element name="inAuthority" type="xs:string" />
+    <xs:element name="refName" type="xs:string"/>
+    <xs:element name="displayName" type="xs:string"/>
+    <xs:element name="displayNameComputed" type="xs:boolean"/>
+    <xs:element name="foreName" type="xs:string"/>
+    <xs:element name="middleName" type="xs:string"/>
+    <xs:element name="surName" type="xs:string"/>
+    <xs:element name="initials" type="xs:string"/>
+    <xs:element name="salutation" type="xs:string"/>
+    <xs:element name="title" type="xs:string"/>
+    <xs:element name="honorifics" type="xs:string"/>
+    <xs:element name="nameAdditions" type="xs:string"/>
+    <xs:element name="birthDate" type="xs:string"/>
+    <xs:element name="deathDate" type="xs:string"/>
+    <xs:element name="birthPlace" type="xs:string"/>
+    <xs:element name="deathPlace" type="xs:string"/>
+    <xs:element name="group" type="xs:string"/>
+    <xs:element name="nationality" type="xs:string"/>
+    <xs:element name="gender" type="xs:string"/>
+    <xs:element name="occupation" type="xs:string"/>
+    <xs:element name="schoolOrStyle" type="xs:string"/>
+    <xs:element name="bioNote" type="xs:string"/>
+    <xs:element name="nameNote" type="xs:string"/>
+    <xs:element name="status" type="xs:string"/>
 
 </xs:schema>
 

diff --git a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
index 0c8992fb4db504567894f3a01a6fd09404190233..26bc92fa22b079e192ca31014ba8effe96ad7aa5 100644 (file)
--- a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
+++ b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
@@ -20,6 +20,7 @@ public interface PersonJAXBSchema {
        final static String INITIALS = "initials";\r
        final static String SALUTATIONS = "salutations";\r
        final static String TITLE = "title";\r
+        final static String HONORIFICS = "honorifics";\r
        final static String NAME_ADDITIONS = "nameAdditions";\r
        final static String BIRTH_DATE = "birthDate";\r
        final static String DEATH_DATE = "deathDate";\r
@@ -32,5 +33,6 @@ public interface PersonJAXBSchema {
        final static String SCHOOL_OR_STYLE = "schoolOrStyle";\r
        final static String BIO_NOTE = "bioNote";\r
        final static String NAME_NOTE = "nameNote";\r
+        final static String STATUS = "status";\r
 }\r
 \r

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index a877d8ac92e635622a5437089382868e8f6a7621..c2c52ba06d71ab5e6db77022aa226969f1291e3e 100644 (file)
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -21,27 +21,29 @@
                 <!--  Person Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />
                 <xs:element name="refName" type="xs:string" />
-                                                               <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="displayNameComputed" type="xs:boolean"/>
-                                                               <xs:element name="foreName" type="xs:string"/>
-                                                               <xs:element name="middleName" type="xs:string"/>
-                                                               <xs:element name="surName" type="xs:string"/>
-                                                               <xs:element name="initials" type="xs:string"/>
-                                                               <xs:element name="salutation" type="xs:string"/>
-                                                               <xs:element name="title" type="xs:string"/>
-                                                               <xs:element name="nameAdditions" type="xs:string"/>
-                                                               <xs:element name="birthDate" type="xs:string"/>
-                                                               <xs:element name="deathDate" type="xs:string"/>
-                                                               <xs:element name="birthPlace" type="xs:string"/>
-                                                               <xs:element name="deathPlace" type="xs:string"/>
-                                                               <xs:element name="group" type="xs:string"/>
-                                                               <xs:element name="nationality" type="xs:string"/>
-                                                               <xs:element name="gender" type="xs:string"/>
-                                                               <xs:element name="occupation" type="xs:string"/>
-                                                               <xs:element name="schoolOrStyle" type="xs:string"/>
-                                                               <xs:element name="bioNote" type="xs:string"/>
-                                                               <xs:element name="nameNote" type="xs:string"/>
-                                               </xs:sequence>
+                <xs:element name="displayName" type="xs:string"/>
+                <xs:element name="displayNameComputed" type="xs:boolean"/>
+                <xs:element name="foreName" type="xs:string"/>
+                <xs:element name="middleName" type="xs:string"/>
+                <xs:element name="surName" type="xs:string"/>
+                <xs:element name="initials" type="xs:string"/>
+                <xs:element name="salutation" type="xs:string"/>
+                <xs:element name="title" type="xs:string"/>
+                <xs:element name="honorifics" type="xs:string"/>
+                <xs:element name="nameAdditions" type="xs:string"/>
+                <xs:element name="birthDate" type="xs:string"/>
+                <xs:element name="deathDate" type="xs:string"/>
+                <xs:element name="birthPlace" type="xs:string"/>
+                <xs:element name="deathPlace" type="xs:string"/>
+                <xs:element name="group" type="xs:string"/>
+                <xs:element name="nationality" type="xs:string"/>
+                <xs:element name="gender" type="xs:string"/>
+                <xs:element name="occupation" type="xs:string"/>
+                <xs:element name="schoolOrStyle" type="xs:string"/>
+                <xs:element name="bioNote" type="xs:string"/>
+                <xs:element name="nameNote" type="xs:string"/>
+                <xs:element name="status" type="xs:string"/>
+            </xs:sequence>
         </xs:complexType>
     </xs:element>
     
@@ -49,9 +51,9 @@
     <xs:element name="persons-common-list">
         <xs:complexType>
             <xs:sequence>
-                                                               <xs:element name="pageNum" type="xs:unsignedInt" />
-                                                               <xs:element name="pageSize" type="xs:unsignedInt" />
-                                                               <xs:element name="totalItems" type="xs:unsignedInt" />
+                <xs:element name="pageNum" type="xs:unsignedInt" />
+                <xs:element name="pageSize" type="xs:unsignedInt" />
+                <xs:element name="totalItems" type="xs:unsignedInt" />
                  <xs:element name="person_list_item" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:sequence>