You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by su...@apache.org on 2019/04/27 10:11:10 UTC
svn commit: r1858261 - in /ofbiz/ofbiz-framework/trunk/applications:
datamodel/data/seed/PartySeedData.xml
datamodel/entitydef/party-entitymodel.xml
party/minilang/party/PartyMapProcs.xml party/widget/partymgr/PartyForms.xml
Author: surajk
Date: Sat Apr 27 10:11:09 2019
New Revision: 1858261
URL: http://svn.apache.org/viewvc?rev=1858261&view=rev
Log:
Improved: Marital Status not managed properly in Person entity.
(OFBIZ-10921)
Thanks Paul, Jacques, Pierre and Nicolas for you suggestions and discussions.
Modified:
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyMapProcs.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml?rev=1858261&r1=1858260&r2=1858261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml Sat Apr 27 10:11:09 2019
@@ -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"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1858261&r1=1858260&r2=1858261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml Sat Apr 27 10:11:09 2019
@@ -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>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyMapProcs.xml?rev=1858261&r1=1858260&r2=1858261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyMapProcs.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyMapProcs.xml Sat Apr 27 10:11:09 2019
@@ -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>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1858261&r1=1858260&r2=1858261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Apr 27 10:11:09 2019
@@ -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">