svn commit: r778587 - in /ofbiz/trunk/applications/humanres: entitydef/entitymodel.xml servicedef/services.xml widget/forms/LookupForms.xml widget/forms/RecruitmentForms.xml

[mor-2]

Author: mor
Date: Tue May 26 07:15:43 2009
New Revision: 778587

URL: http://svn.apache.org/viewvc?rev=778587&view=rev
Log:
Fixed: Relation Enumeration of entity JobRequisition is not unique for that entity, reported by Hans on dev mailing list.
Also changed entity field names as per best practice and fixed wrong attribute names on services found by chance in the logs.

Modified:
    ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
    ofbiz/trunk/applications/humanres/servicedef/services.xml
    ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml

Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=778587&r1=778586&r2=778587&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Tue May 26 07:15:43 2009
@@ -846,19 +846,19 @@
         <field name="jobLocation" type="id"></field>
         <field name="skillTypeId" type="id"></field>
         <field name="noOfResources" type="numeric"></field>
-        <field name="jobPostingTypeId" type="id"></field>
+        <field name="jobPostingTypeEnumId" type="id"></field>
         <field name="jobRequisitionDate" type="date"></field>
-        <field name="examTypeId" type="id"></field>
+        <field name="examTypeEnumId" type="id"></field>
         <field name="requiredOnDate" type="date"></field>
         <prim-key field="jobRequisitionId"/>
         <relation type="one" fk-name="JOB_REQ_SKTYP" rel-entity-name="SkillType">
             <key-map field-name="skillTypeId"/>
         </relation>
-        <relation type="one" fk-name="JOB_REQ_ENUMEXM" rel-entity-name="Enumeration">
-            <key-map field-name="examTypeId" rel-field-name="enumId"/>
+        <relation type="one" fk-name="JOB_REQ_ENUMEXM" title="ExamType" rel-entity-name="Enumeration">
+            <key-map field-name="examTypeEnumId" rel-field-name="enumId"/>
         </relation>
-        <relation type="one" fk-name="JOB_REQ_ENUMJBP" rel-entity-name="Enumeration">
-            <key-map field-name="jobPostingTypeId" rel-field-name="enumId"/>
+        <relation type="one" fk-name="JOB_REQ_ENUMJBP" title="JobPostingType" rel-entity-name="Enumeration">
+            <key-map field-name="jobPostingTypeEnumId" rel-field-name="enumId"/>
         </relation>
     </entity>
     <entity entity-name="JobInterview"

Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=778587&r1=778586&r2=778587&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Tue May 26 07:15:43 2009
@@ -737,7 +737,7 @@
         <override name="noOfResources" optional="false"/>
         <override name="qualification" optional="false"/>
         <override name="durationMonths" optional="false"/>
-        <override name="location" optional="false"/>
+        <override name="jobLocation" optional="false"/>
     </service>
     
     <service name="updateJobRequisition" engine="simple" default-entity-name="JobRequisition"
@@ -748,7 +748,7 @@
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <override name="noOfResources" optional="false"/>
         <override name="durationMonths" optional="false"/>
-        <override name="location" optional="false"/>
+        <override name="jobLocation" optional="false"/>
     </service>
     
     <service name="deleteJobRequisition" engine="simple" default-entity-name="JobRequisition"
@@ -765,7 +765,7 @@
         <auto-attributes mode="INOUT" entity-name="EmploymentApp" include="pk" optional="true"/>
         <auto-attributes mode="IN" entity-name="EmploymentApp" include="nonpk" optional="true"/>
         <override name="applyingPartyId" optional="false"/>
-        <override name="approverPartyIdapproverPartyId" optional="false"/>
+        <override name="approverPartyId" optional="false"/>
         <override name="jobRequisitionId" optional="false"/>
     </service>
     

Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=778587&r1=778586&r2=778587&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Tue May 26 07:15:43 2009
@@ -300,7 +300,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="jobPostingTypeId">
+        <field name="jobPostingTypeEnumId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
                     <entity-constraint name="enumTypeId" operator="equals" value="JOB_POSTING"/>
@@ -321,7 +321,7 @@
         <field name="jobRequisitionId" widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${jobRequisitionId}" target="javascript:set_value('${jobRequisitionId}')"/>
         </field>
-        <field name="jobPostingTypeId"><display/></field>
+        <field name="jobPostingTypeEnumId"><display/></field>
         <field name="qualification"><display/></field>
         <field name="skillTypeId"><display/></field>
         <field name="location"><display/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=778587&r1=778586&r2=778587&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Tue May 26 07:15:43 2009
@@ -43,7 +43,7 @@
             </drop-down>
         </field>
         <field name="jobLocation"><text-find default-option="contains" ignore-case="true"/></field>
-        <field name="examTypeId">
+        <field name="examTypeEnumId">
              <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
                     <entity-constraint name="enumTypeId" operator="equals" value="EXAM_TYPE"/>
@@ -79,7 +79,7 @@
             <display-entity entity-name="SkillType" description="${description}"/>
         </field>
         <field name="jobPostingTypeId"><display/></field>
-        <field name="examTypeId"><display/></field>
+        <field name="examTypeEnumId"><display/></field>
         <field name="qualification"><display/></field>
         <field name="jobLocation"><display/></field>
         <field name="experienceYears"><display/></field>
@@ -130,7 +130,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="examTypeId">
+        <field name="examTypeEnumId">
              <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
                     <entity-constraint name="enumTypeId" operator="equals" value="EXAM_TYPE"/>