From 8436ca3a25c20f2183dd322c0e25484dc31acc6b Mon Sep 17 00:00:00 2001
From: Suraj Khurana <surajk@apache.org>
Date: Sat, 27 Apr 2019 10:11:09 +0000
Subject: [PATCH] Improved: Marital Status not managed properly in Person
 entity. (OFBIZ-10921) Thanks Paul, Jacques, Pierre and Nicolas for you
 suggestions and discussions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858261 13f79535-47bb-0310-9956-ffa450edef68
---
 applications/datamodel/data/seed/PartySeedData.xml    |  4 ++++
 .../datamodel/entitydef/party-entitymodel.xml         |  6 +++++-
 applications/party/minilang/party/PartyMapProcs.xml   |  2 +-
 applications/party/widget/partymgr/PartyForms.xml     | 11 +++++------
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/applications/datamodel/data/seed/PartySeedData.xml b/applications/datamodel/data/seed/PartySeedData.xml
index 874d70f366a..a2344a1c4d9 100644
--- a/applications/datamodel/data/seed/PartySeedData.xml
+++ b/applications/datamodel/data/seed/PartySeedData.xml
@@ -135,6 +135,10 @@ under the License.
     <Enumeration description="Student" enumCode="STUDENT" enumId="EMPS_STUDENT" sequenceId="06" enumTypeId="EMPLOY_STTS"/>
     <Enumeration description="Unemployed" enumCode="UNEMP" enumId="EMPS_UNEMP" sequenceId="07" enumTypeId="EMPLOY_STTS"/>
 
+    <EnumerationType enumTypeId="MARITAL_STATUS" description="Marital Status"/>
+    <Enumeration description="Single" enumId="SINGLE" sequenceId="01" enumTypeId="MARITAL_STATUS" enumName="Single"/>
+    <Enumeration description="Married" enumId="MARRIED" sequenceId="02" enumTypeId="MARITAL_STATUS" enumName="Married"/>
+
     <EnumerationType description="Residence Status" enumTypeId="PTY_RESID_STTS" hasTable="N"/>
     <Enumeration description="Own Home" enumCode="OWN" enumId="PRESS_OWN" sequenceId="01" enumTypeId="PTY_RESID_STTS"/>
     <Enumeration description="Private Tenant" enumCode="PVT_TENANT" enumId="PRESS_PVT_TENANT" sequenceId="02" enumTypeId="PTY_RESID_STTS"/>
diff --git a/applications/datamodel/entitydef/party-entitymodel.xml b/applications/datamodel/entitydef/party-entitymodel.xml
index 23cfc20af33..2982450d50a 100644
--- a/applications/datamodel/entitydef/party-entitymodel.xml
+++ b/applications/datamodel/entitydef/party-entitymodel.xml
@@ -2794,7 +2794,8 @@ under the License.
       <field name="height" type="floating-point"></field>
       <field name="weight" type="floating-point"></field>
       <field name="mothersMaidenName" type="long-varchar" encrypt="true"></field>
-      <field name="maritalStatus" type="indicator"></field>
+      <field name="oldMaritalStatus" type="indicator" col-name="MARITAL_STATUS"><description>Deprecated since branch release: use martialStatusEnumId</description></field>
+      <field name="maritalStatusEnumId" type="id"/>
       <field name="socialSecurityNumber" type="long-varchar" encrypt="true"></field>
       <field name="passportNumber" type="long-varchar" encrypt="true"></field>
       <field name="passportExpireDate" type="date"></field>
@@ -2817,6 +2818,9 @@ under the License.
       <relation type="one" fk-name="PERSON_RESS_ENUM" title="ResidenceStatus" rel-entity-name="Enumeration">
         <key-map field-name="residenceStatusEnumId" rel-field-name="enumId"/>
       </relation>
+      <relation type="one" fk-name="PERSON_MARITAL" title="MaritalStatus" rel-entity-name="Enumeration">
+        <key-map field-name="maritalStatusEnumId" rel-field-name="enumId"/>
+      </relation>
       <index name="FIRST_NAME_IDX">
         <index-field name="firstName"/>
       </index>
diff --git a/applications/party/minilang/party/PartyMapProcs.xml b/applications/party/minilang/party/PartyMapProcs.xml
index aefbdb20412..6ddb8355dd5 100644
--- a/applications/party/minilang/party/PartyMapProcs.xml
+++ b/applications/party/minilang/party/PartyMapProcs.xml
@@ -39,7 +39,7 @@ under the License.
     <process field="height"><convert type="Double"><fail-property resource="PartyUiLabels" property="PartyHeightNotValidNumber"/></convert></process>
     <process field="weight"><convert type="Double"><fail-property resource="PartyUiLabels" property="PartyWeightNotValidNumber"/></convert></process>
     <process field="mothersMaidenName"><copy/></process>
-    <process field="maritalStatus"><copy/></process>
+    <process field="maritalStatusEnumId"><copy/></process>
     <process field="socialSecurityNumber"><copy/></process>
     <process field="passportNumber"><copy/></process>
     <process field="passportExpireDate"><convert type="Date"><fail-property resource="PartyUiLabels" property="PartyPassportExpireDateNotValidDate"/></convert></process>
diff --git a/applications/party/widget/partymgr/PartyForms.xml b/applications/party/widget/partymgr/PartyForms.xml
index f6bc3529f12..746bab4249d 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -202,13 +202,12 @@ under the License.
                 <option key="F" description="${uiLabelMap.CommonFemale}"/>
             </drop-down>
         </field>
-        <field name="maritalStatus">
+        <field name="maritalStatusEnumId">
             <drop-down allow-empty="true">
-                <option key="S" description="${uiLabelMap.PartyMaritalStatusSingle}"/>
-                <option key="M" description="${uiLabelMap.PartyMaritalStatusMarried}"/>
-                <option key="P" description="${uiLabelMap.PartyMaritalStatusSeparated}"/>
-                <option key="D" description="${uiLabelMap.PartyMaritalStatusDivorced}"/>
-                <option key="W" description="${uiLabelMap.PartyMaritalStatusWidowed}"/>
+                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description} [${enumCode}]">
+                    <entity-constraint name="enumTypeId" value="MARITAL_STATUS"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="employmentStatusEnumId">