svn commit: r811484 - in /ofbiz/trunk/applications/humanres: script/org/ofbiz/humanres/HumanResServices.xml servicedef/services.xml widget/Menus.xml widget/forms/RecruitmentForms.xml

Author: jleroux
Date: Fri Sep  4 16:47:22 2009
New Revision: 811484

URL: http://svn.apache.org/viewvc?rev=811484&view=rev
Log:
A patch from Abhinav Vaid " Improvements in Recruitment sub module in HR" (https://issues.apache.org/jira/browse/OFBIZ-2540) - OFBIZ-2540

Modified:
    ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
    ofbiz/trunk/applications/humanres/servicedef/services.xml
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml

Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=811484&r1=811483&r2=811484&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Fri Sep  4 16:47:22 2009
@@ -732,6 +732,10 @@
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id sequence-name="EmploymentApp" field="newEntity.applicationId"/>
         <field-to-result field="newEntity.applicationId" result-name="applicationId"/>
+        <if-empty field="newEntity.applicationDate">
+            <now-timestamp field="nowTimestamp"/>
+            <set from-field="nowTimestamp" field="newEntity.applicationDate"/>
+        </if-empty>
         <create-value value-field="newEntity"/>
     </simple-method>
     

Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=811484&r1=811483&r2=811484&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Fri Sep  4 16:47:22 2009
@@ -712,8 +712,10 @@
         <auto-attributes mode="IN" entity-name="JobRequisition" include="nonpk" optional="true"/>
         <override name="noOfResources" optional="false"/>
         <override name="qualification" optional="false"/>
-        <override name="durationMonths" optional="false"/>
         <override name="jobLocation" optional="false"/>
+        <override name="skillTypeId" optional="false"/>
+        <override name="experienceMonths" optional="false"/>
+        <override name="experienceYears" optional="false"/>
     </service>
     
     <service name="updateJobRequisition" engine="simple" default-entity-name="JobRequisition"
@@ -723,8 +725,10 @@
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <override name="noOfResources" optional="false"/>
-        <override name="durationMonths" optional="false"/>
         <override name="jobLocation" optional="false"/>
+        <override name="skillTypeId" optional="false"/>
+        <override name="experienceMonths" optional="false"/>
+        <override name="experienceYears" optional="false"/>
     </service>
     
     <service name="deleteJobRequisition" engine="simple" default-entity-name="JobRequisition"

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=811484&r1=811483&r2=811484&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Fri Sep  4 16:47:22 2009
@@ -258,7 +258,7 @@
     <menu name="InternalJobPostingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
         default-menu-item-name="InternalJobPosting" type="simple" menu-container-style="button-bar tab-bar"
         default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="InternalJobPosting" title="${uiLabelMap.HumanResInternalJobPosting}">
+        <menu-item name="InternalJobPosting" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonApplications}">
             <link target="FindInternalJobPosting"/>
         </menu-item>
         <menu-item name="JobInterview" title="${uiLabelMap.HumanResJobInterview}">

Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=811484&r1=811483&r2=811484&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Fri Sep  4 16:47:22 2009
@@ -33,7 +33,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"/>
@@ -79,50 +79,38 @@
         <field name="skillTypeId">
             <display-entity entity-name="SkillType" description="${description}"/>
         </field>
-        <field name="jobPostingTypeId"><display/></field>
+        <field name="jobPostingTypeEnumId"><display/></field>
         <field name="examTypeEnumId"><display/></field>
         <field name="qualification"><display/></field>
         <field name="jobLocation"><display/></field>
         <field name="experienceYears"><display/></field>
         <field name="experienceMonths"><display/></field>
+        <field name="applyLink" title="${uiLabelMap.CommonApply}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonApply}" target="EditInternalJobPosting">
+                <parameter param-name="jobRequisitionId"/>
+            </hyperlink>
+        </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext" use-when="hasAdminPermission">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteJobRequisition">
                 <parameter param-name="jobRequisitionId"/>
             </hyperlink>
         </field>
     </form>
-    <form name="EditJobRequisition" type="single" target="updateJobRequisition">
+    <form name="EditJobRequisition" type="single" target="updateJobRequisition" default-map-name="jobRequisition">
         <alt-target use-when="jobRequisition==null" target="createJobRequisition"/>
-        <auto-fields-service service-name="updateJobRequisition" map-name="jobRequisition"/>
-        <field use-when="jobRequisition!=null" name="jobRequisitionId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="jobRequisitionId" use-when="jobRequisition==null"><ignored/></field>
-        <field name="jobPostingTypeId">
-            <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"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="skillTypeId">
-            <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType">
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="jobLocation" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"></field>
-        <field name="age"></field>
-        <field name="noOfResources" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"></field>
+        <field use-when="jobRequisition!=null" name="jobRequisitionId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="jobDescription" title="${uiLabelMap.CommonDescription}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="jobLocation" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="age"><text/></field>
+        <field name="noOfResources" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="gender">
             <drop-down allow-empty="true">
                 <option key="M" description="${uiLabelMap.CommonMale}"/>
                 <option key="F" description="${uiLabelMap.CommonFemale}"/>
             </drop-down>
         </field>
-        <field name="durationMonths" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"></field>
-        <field name="experienceMonths"></field>
-        <field name="experienceYears"></field>
+        <field name="durationMonths"><text/></field>
         <field name="qualification" widget-style="required" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="PartyQualType" key-field-name="partyQualTypeId" description="${description}">
@@ -139,6 +127,17 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="skillCriteria" title="${uiLabelMap.HumanResSkills} ${uiLabelMap.CommonRequired}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="SkillType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="experienceMonths" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="experienceYears" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="jobPostingTypeEnumId"><hidden value="JOB_POSTING_INTR"/></field>
         <field name="submitButton" use-when="jobRequisition==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="submitButton" use-when="jobRequisition!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -146,7 +145,7 @@
         <auto-fields-entity entity-name="EmploymentApp" default-field-type="find"/>
         <field name="applicationId"><lookup target-form-name="LookupEmploymentApp"/></field>
         <field name="applyingPartyId" use-when="hasAdminPermission"><hidden/></field>
-        <field name="applyingPartyId" use-when=""><hidden value="${partyId}"/></field>
+        <field name="applyingPartyId" use-when="!hasAdminPermission"><hidden value="${partyId}"/></field>
         <field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
@@ -195,6 +194,11 @@
             </display-entity>
         </field>
         <field name="statusId" title="${uiLabelMap.HumanResIJPStatus}"><display/></field>
+        <field name="jobRequisitionId" widget-style="buttontext">
+            <hyperlink target="EditJobRequisition" description="${jobRequisitionId}">
+                <parameter param-name="jobRequisitionId"/>
+            </hyperlink>
+        </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext" use-when="hasAdminPermission">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteInternalJobPosting">
                 <parameter param-name="applicationId"/>
@@ -212,7 +216,7 @@
         <field name="applyingPartyId"><hidden value="${partyId}"/></field>
         <field name="approverPartyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="jobRequisitionId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupJobRequisition"/></field>
-        <field name="statusId" title="${uiLabelMap.HumanResIJPStatus}"><hidden value="IJP_CREATED"/></field>
+        <field name="statusId" title="${uiLabelMap.HumanResIJPStatus}"><hidden value="IJP_APPLIED"/></field>
         <field name="emplPositionId"><hidden/></field>
         <field name="employmentAppSourceTypeId"><hidden/></field>
         <field name="referredByPartyId"><hidden/></field>
@@ -304,7 +308,7 @@
             </drop-down>
         </field>
         <field name="jobInterviewTypeId">
-            <drop-down allow-empty="true">
+            <drop-down allow-empty="false">
                 <entity-options description="${jobInterviewTypeId}" entity-name="JobInterviewType">
                     <entity-order-by field-name="jobInterviewTypeId"/>
                 </entity-options>