You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/05/20 12:31:34 UTC
svn commit: r658193 - in /ofbiz/trunk/applications: humanres/config/
humanres/data/ humanres/entitydef/ humanres/script/org/ofbiz/humanres/
humanres/servicedef/ humanres/src/org/ofbiz/humanres/
humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanre...
Author: ashish
Date: Tue May 20 03:31:33 2008
New Revision: 658193
URL: http://svn.apache.org/viewvc?rev=658193&view=rev
Log:
Applied patch from JIRA issue :- https://issues.apache.org/jira/browse/OFBIZ-1659
The following points are covered in this patch
1) Added Resume support for the party.
2) Improved the usability of the Qualification details for party.
Thanks Parimal Gain for your patch.
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/servicedef/services.xml
ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResServices.java
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/Menus.xml
ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Tue May 20 03:31:33 2008
@@ -354,6 +354,9 @@
<property key="HumanResAddEmplPositionResponsibility">
<value xml:lang="en">Add Position Responsibility</value>
</property>
+ <property key="HumanResAddPartyQual">
+ <value xml:lang="en">Add Party Qualification</value>
+ </property>
<property key="HumanResAddPayGrade">
<value xml:lang="en">Add Pay Grade</value>
</property>
@@ -428,9 +431,7 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¹à¸à¹à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value>
</property>
<property key="HumanResEditPartyBenefit">
- <value xml:lang="en">Edit Party Benefit</value>
- <value xml:lang="it">Aggiorna Benefit Soggetto</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸à¸£à¸°à¹à¸¢à¸à¸à¹</value>
+ <value xml:lang="en">Party Benefits</value>
</property>
<property key="HumanResEditPartyQual">
<value xml:lang="en">Edit party Qualification</value>
@@ -443,9 +444,7 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸£à¸°à¸§à¸±à¸à¸´à¸¢à¹à¸</value>
</property>
<property key="HumanResEditPartyReview">
- <value xml:lang="en">Edit Party Review</value>
- <value xml:lang="it">Aggiorna Rassegna Soggetto</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸§à¸à¸ªà¸à¸</value>
+ <value xml:lang="en">Party Reviews</value>
</property>
<property key="HumanResEditPartySkill">
<value xml:lang="en">Edit party Skill</value>
@@ -453,14 +452,10 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸±à¸à¸©à¸°</value>
</property>
<property key="HumanResEditPayHistory">
- <value xml:lang="en">Edit Pay History</value>
- <value xml:lang="it">Aggiorna Storia Paghe</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸à¹à¸²à¸¢à¸à¹à¸à¸¡à¸¹à¸¥</value>
+ <value xml:lang="en">Pay Histories</value>
</property>
<property key="HumanResEditPayrollPreference">
- <value xml:lang="en">Edit Payroll Preference</value>
- <value xml:lang="it">Aggiorna Preferenze Paghe</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¹à¸à¹à¸ªà¸´à¸à¸à¸´à¸à¸´à¹à¸¨à¸©à¹à¸à¸´à¸à¹à¸à¸·à¸à¸</value>
+ <value xml:lang="en">Payroll Preferences</value>
</property>
<property key="HumanResEditPerfReviewItems">
<value xml:lang="en">Edit PerfReview Items</value>
@@ -472,6 +467,9 @@
<value xml:lang="it">Aggiorna Passi Salario</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸±à¹à¸à¹à¸à¸´à¸à¹à¸à¸·à¸à¸</value>
</property>
+ <property key="HumanResEditUnemploymentClaim">
+ <value xml:lang="en">Unemployment Claims</value>
+ </property>
<property key="HumanResEmployee">
<value xml:lang="en">Employee</value>
</property>
@@ -534,6 +532,12 @@
<property key="HumanResFindEmploymentApp">
<value xml:lang="en">Find Employment Application</value>
</property>
+ <property key="HumanResFindPartyQual">
+ <value xml:lang="en">Find Party Qualification</value>
+ </property>
+ <property key="HumanResFindPartyResume">
+ <value xml:lang="en">Find Party Resume</value>
+ </property>
<property key="HumanResFindPersonTraining">
<value xml:lang="en">Find Person Training</value>
</property>
@@ -777,6 +781,12 @@
<value xml:lang="it">Codice Soggetto A</value>
<value xml:lang="th">à¸à¸¶à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
</property>
+ <property key="HumanResPartyQualification">
+ <value xml:lang="en">Qualification</value>
+ </property>
+ <property key="HumanResPartyResume">
+ <value xml:lang="en">Resume</value>
+ </property>
<property key="HumanResPartyReview">
<value xml:lang="en">Party Review</value>
<value xml:lang="it">Rassegna Soggetto</value>
@@ -830,6 +840,9 @@
<value xml:lang="it">Tipo Responsabilità </value>
<value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸«à¸à¹à¸²à¸à¸µà¹à¸à¸µà¹à¸à¹à¸à¸à¸£à¸±à¸à¸à¸´à¸à¸à¸à¸</value>
</property>
+ <property key="HumanResResumeId">
+ <value xml:lang="en">Resume Id</value>
+ </property>
<property key="HumanResSalaryStepSeqId">
<value xml:lang="en">Salary Step Sequence Id</value>
<value xml:lang="it">Sequenza Passo Salario</value>
@@ -912,11 +925,6 @@
<property key="HumanResTraining">
<value xml:lang="en">Training</value>
</property>
- <property key="HumanResUnemploymentClaim">
- <value xml:lang="en">Unemployment Claim</value>
- <value xml:lang="it">Reclamo Disoccupazione</value>
- <value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¸¹à¹à¸§à¹à¸²à¸à¸à¸²à¸à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸</value>
- </property>
<property key="HumanResViewPermissionError">
<value xml:lang="en">View Permission Error</value>
<value xml:lang="it">Errore Permesso di Visualizzazione</value>
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue May 20 03:31:33 2008
@@ -59,4 +59,7 @@
<TrainingClassType trainingClassTypeId="ONJOB_TRAINING" description="On Job Training"/>
<TrainingClassType trainingClassTypeId="ADVAN_TRAINING" description="Advance Training"/>
<TrainingClassType trainingClassTypeId="IMPRO_TRAINING" description="Improvement Training"/>
+
+ <PartyQualType description="Degree" hasTable="N" parentTypeId="" partyQualTypeId="DEGREE"/>
+ <PartyQualType description="Certification" hasTable="N" parentTypeId="" partyQualTypeId="CERTIFICATION"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Tue May 20 03:31:33 2008
@@ -43,27 +43,23 @@
<!-- ========================================================= -->
<entity entity-name="PartyQual" package-name="org.ofbiz.humanres.ability" title="Party Qualification Entity">
- <field name="partyQualId" type="id-ne"></field>
<field name="partyId" type="id-ne"></field>
<field name="partyQualTypeId" type="id-ne"></field>
- <field name="institutionPartyId" type="id-ne"></field>
+ <field name="qualificationDesc" type="id-long"></field>
<field name="title" type="id-long"><description>Title of degree or job</description></field>
<field name="statusId" type="id"><description>Status e.g. completed, part-time etc.</description></field>
- <field name="institutionInternalId" type="id"><description>Institution internal ID e.g. student ID</description></field>
- <field name="infoString" type="id-vlong"><description>Additional info e.g. degree major or responsibilities at job</description></field>
<field name="verifStatusId" type="id"><description>Verification done for this entry if any</description></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
- <prim-key field="partyQualId"/>
+ <prim-key field="partyId"/>
+ <prim-key field="partyQualTypeId"/>
+ <prim-key field="fromDate"/>
<relation type="one" fk-name="PARTY_QUAL_PRTY" rel-entity-name="Party">
<key-map field-name="partyId"/>
</relation>
<relation type="one" fk-name="PARTY_QUAL_PQTYP" rel-entity-name="PartyQualType">
<key-map field-name="partyQualTypeId"/>
</relation>
- <relation type="one" title="Institution" fk-name="PARTY_QUAL_INST" rel-entity-name="Party">
- <key-map field-name="institutionPartyId" rel-field-name="partyId"/>
- </relation>
<relation type="one" fk-name="PARTY_QUAL_STATUS" rel-entity-name="StatusItem">
<key-map field-name="statusId"/>
</relation>
@@ -89,12 +85,16 @@
title="Resume Entity">
<field name="resumeId" type="id-ne"></field>
<field name="partyId" type="id-ne"></field>
+ <field name="contentId" type="id"></field>
<field name="resumeDate" type="date-time"></field>
<field name="resumeText" type="long-varchar"></field>
<prim-key field="resumeId"/>
<relation type="one" fk-name="PARTY_RSME_PRTY" rel-entity-name="Party">
<key-map field-name="partyId"/>
</relation>
+ <relation type="one-nofk" fk-name="PARTY_RSME_CNT" rel-entity-name="Content">
+ <key-map field-name="contentId"/>
+ </relation>
</entity>
<entity entity-name="PartySkill"
package-name="org.ofbiz.humanres.ability"
@@ -521,6 +521,7 @@
<field name="roleTypeIdFrom" type="id"></field>
<field name="roleTypeIdTo" type="id"></field>
<field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
<prim-key field="unemploymentClaimId"/>
<relation type="one-nofk" fk-name="UNMPL_CLM_EMPLMNT" rel-entity-name="Employment">
<key-map field-name="roleTypeIdFrom"/>
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=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue May 20 03:31:33 2008
@@ -216,8 +216,10 @@
</simple-method>
<simple-method method-name="deletePartyBenefit" short-description="Delete Party Benefit">
+ <now-timestamp-to-env env-name="nowTimeStamp"/>
<entity-one entity-name="PartyBenefit" value-name="lookedUpValue"/>
- <remove-value value-name="lookedUpValue"/>
+ <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
+ <store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createPayGrade" short-description="Create a Pay Grade">
@@ -257,8 +259,10 @@
</simple-method>
<simple-method method-name="deletePayHistory" short-description="Delete Pay History">
+ <now-timestamp-to-env env-name="nowTimeStamp"/>
<entity-one entity-name="PayHistory" value-name="lookedUpValue"/>
- <remove-value value-name="lookedUpValue"/>
+ <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
+ <store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createPayrollPreference" short-description="Create a Payroll Preference">
@@ -335,8 +339,10 @@
</simple-method>
<simple-method method-name="deleteUnemploymentClaim" short-description="Delete Unemployment Claim">
+ <now-timestamp-to-env env-name="nowTimeStamp"/>
<entity-one entity-name="UnemploymentClaim" value-name="lookedUpValue"/>
- <remove-value value-name="lookedUpValue"/>
+ <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
+ <store-value value-name="lookedUpValue"/>
</simple-method>
<!-- Employee Position Group -->
Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Tue May 20 03:31:33 2008
@@ -31,7 +31,6 @@
<auto-attributes mode="IN" include="nonpk" optional="true"/>
<override name="partyId" optional="false"/>
<override name="partyQualTypeId" optional="false"/>
- <override name="institutionPartyId" optional="false"/>
<override name="fromDate" optional="false"/>
</service>
Modified: ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResServices.java?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResServices.java (original)
+++ ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResServices.java Tue May 20 03:31:33 2008
@@ -60,48 +60,27 @@
if (result.size() > 0)
return result;
- String partyQualId = (String) context.get("partyQualId");
String partyQualTypeId = (String) context.get("partyQualTypeId");
- String institutionPartyId = (String) context.get("institutionPartyId");
String statusId = (String) context.get("statusId");
String verifStatusId = (String) context.get("verifStatusId");
+ Timestamp fromDate = (Timestamp) context.get("fromDate");
String errMsg = null;
- // partyQualId might be empty, so check it and get next seq partyQualId if empty
- if (partyQualId == null || partyQualId.length() == 0) {
- try {
- partyQualId = delegator.getNextSeqId("PartyQual");
- } catch (IllegalArgumentException e) {
- errMsg = UtilProperties.getMessage(resource, "HumanResServices.PartyQualFailureIDCreation", locale);
- return ServiceUtil.returnError(errMsg);
- }
- } else {
- // if specified partyQualId starts with a number, return an error
- if (Character.isDigit(partyQualId.charAt(0))) {
- errMsg = UtilProperties.getMessage(resource, "HumanResServices.PartyQualFailureIDStartsDigit", locale);
- return ServiceUtil.returnError(errMsg);
- }
- }
try {
String title = (String) context.get("title");
- String institutionInternalId = (String) context.get("institutionInternalId");
- String infoString = (String) context.get("infoString");
- Timestamp fromDate = (Timestamp) context.get("fromDate");
+ String qualificationDesc = (String) context.get("qualificationDesc");
Timestamp thruDate = (Timestamp) context.get("thruDate");
if (fromDate == null) {
errMsg = UtilProperties.getMessage(resource,"HumanResServices.PartyQualFailureMissingParam", locale);
return ServiceUtil.returnError(errMsg);
}
GenericValue partyQual = delegator.makeValue("PartyQual", UtilMisc.toMap(new Object[] {
- "partyQualId", partyQualId,
"partyId", partyId,
"partyQualTypeId", partyQualTypeId,
- "institutionPartyId", institutionPartyId,
"title", title,
"statusId", statusId,
- "institutionInternalId", institutionInternalId,
- "infoString", infoString,
+ "qualificationDesc", qualificationDesc,
"verifStatusId", verifStatusId,
"fromDate", fromDate,
"thruDate", thruDate
@@ -116,7 +95,9 @@
return ServiceUtil.returnError(errMsg);
}
return UtilMisc.toMap(
- "partyQualId", partyQualId,
+ "partyId", partyId,
+ "partyQualTypeId", partyQualTypeId,
+ "fromDate", fromDate,
ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
}
}
Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Tue May 20 03:31:33 2008
@@ -68,28 +68,32 @@
<!-- ================HumanResource==================================== -->
<!-- ================Party Ability Group==================================== -->
- <request-map uri="EditPartyQuals">
+ <request-map uri="FindPartyQual">
<security https="true" auth="true"/>
- <response name="success" type="view" value="EditPartyQuals"/>
+ <response name="success" type="view" value="FindPartyQual"/>
+ </request-map>
+ <request-map uri="EditPartyQual">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPartyQual"/>
</request-map>
<request-map uri="createPartyQual">
<security https="true" auth="true"/>
<event type="service" invoke="createPartyQual"/>
- <response name="success" type="view" value="EditPartyQuals"/>
+ <response name="success" type="view" value="EditPartyQual"/>
</request-map>
<request-map uri="updatePartyQual">
<security https="true" auth="true"/>
- <event type="service" invoke="updatePartyQual"/>
- <response name="success" type="view" value="EditPartyQuals"/>
+ <event type="service-multi" invoke="updatePartyQual"/>
+ <response name="success" type="view" value="FindPartyQual"/>
</request-map>
<request-map uri="deletePartyQual">
<security https="true" auth="true"/>
<event type="service" invoke="deletePartyQual"/>
- <response name="success" type="view" value="EditPartyQuals"/>
+ <response name="success" type="view" value="FindPartyQual"/>
</request-map>
- <request-map uri="findPartyResumes">
+ <request-map uri="FindPartyResume">
<security https="true" auth="true"/>
- <response name="success" type="view" value="ListPartyResumes"/>
+ <response name="success" type="view" value="FindPartyResume"/>
</request-map>
<request-map uri="EditPartyResume">
<security https="true" auth="true"/>
@@ -108,7 +112,7 @@
<request-map uri="deletePartyResume">
<security https="true" auth="true"/>
<event type="service" invoke="deletePartyResume"/>
- <response name="success" type="view" value="ListPartyResumes"/>
+ <response name="success" type="view" value="EditPartyResume"/>
</request-map>
<request-map uri="FindPartySkills">
<security https="true" auth="true"/>
@@ -245,7 +249,7 @@
<request-map uri="deletePayHistory">
<security https="true" auth="true"/>
<event type="service" invoke="deletePayHistory"/>
- <response name="success" type="view" value="ListEmployments"/>
+ <response name="success" type="view" value="ListPayHistories"/>
</request-map>
<request-map uri="findPartyBenefits">
<security https="true" auth="true"/>
@@ -587,11 +591,12 @@
<view-map name="EditPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviews"/>
<view-map name="EditPerfReviewItems" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviewItems"/>
- <view-map name="ListPartyResumes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#ListPartyResumes"/>
+ <view-map name="FindPartyResume" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPartyResume"/>
<view-map name="EditPartyResume" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyResume"/>
<view-map name="FindPartySkills" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPartySkills"/>
<view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartySkills"/>
- <view-map name="EditPartyQuals" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyQuals"/>
+ <view-map name="FindPartyQual" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPartyQual"/>
+ <view-map name="EditPartyQual" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyQual"/>
<view-map name="FindEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#FindEmplPosition"/>
<view-map name="EditEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPosition"/>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Tue May 20 03:31:33 2008
@@ -194,20 +194,6 @@
</section>
</container>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResNewEmploymentApp}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -409,8 +395,14 @@
<section>
<actions>
<set field="titleProperty" value="HumanResAddUnemploymentClaim"/>
- <set field="headerItem" value="UnemploymentClaim"/>
+ <set field="headerItem" value="Employment"/>
+ <set field="tabButtonItem" value="EditUnemploymentClaim"/>
<set field="unemploymentClaimId" from-field="parameters.unemploymentClaimId" />
+ <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
+ <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
+ <set field="partyIdTo" from-field="parameters.partyIdTo"/>
+ <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
+ <set field="fromDate" from-field="parameters.fromDate"/>
<entity-one entity-name="UnemploymentClaim" value-name="unemploymentClaim" />
</actions>
<widgets>
Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Tue May 20 03:31:33 2008
@@ -27,13 +27,14 @@
<menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item>
<menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrade"/></menu-item>
<menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="FindTerminationReason"/></menu-item>
- <menu-item name="UnemploymentClaim" title="${uiLabelMap.HumanResUnemploymentClaim}"><link target="FindUnemploymentClaim"/></menu-item>
<menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item>
<menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="FindPartySkills"/></menu-item>
<menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item>
<menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
<menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="EditResponsibilityType"/></menu-item>
<menu-item name="Training" title="${uiLabelMap.HumanResTraining}"><link target="FindPersonTrainings"/></menu-item>
+ <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResume"/></menu-item>
+ <menu-item name="PartyQual" title="${uiLabelMap.HumanResPartyQualification}"><link target="FindPartyQual"/></menu-item>
<menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
@@ -45,7 +46,7 @@
</menu>
<menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" default-selected-style="selected"
type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
- <menu-item name="EditEmployment" title="${uiLabelMap.HumanResEditEmployment}">
+ <menu-item name="EditEmployment" title="${uiLabelMap.HumanResEmployment}">
<link target="EditEmployment?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/>
</menu-item>
<menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}">
@@ -61,6 +62,9 @@
<menu-item name="EditPayHistory" title="${uiLabelMap.HumanResEditPayHistory}">
<link target="ListPayHistories?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/>
</menu-item>
+ <menu-item name="EditUnemploymentClaim" title="${uiLabelMap.HumanResEditUnemploymentClaim}">
+ <link target="EditUnemploymentClaim?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/>
+ </menu-item>
</menu>
<menu name="EmplPostionBar" default-menu-item-name="EmplPositionView" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="EmplPositionView" title="${uiLabelMap.CommonSummary}">
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Tue May 20 03:31:33 2008
@@ -20,11 +20,10 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <screen name="EditPartyQuals">
+ <screen name="EditPartyQual">
<section>
<actions>
- <set field="headerItem" value="PartyReview"/>
- <set field="tabButtonItem" value="EditPartyQual"/>
+ <set field="headerItem" value="PartyQual"/>
<set field="partyId" from-field="parameters.partyId"/>
</actions>
<widgets>
@@ -33,7 +32,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.HumanResEditPartySkill}"/>
+ <label text="${uiLabelMap.HumanResAddPartyQual}"/>
</container>
</container>
<container style="screenlet-body">
@@ -42,8 +41,7 @@
<container>
<link target="EditPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/>
</container>
- <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- <include-form name="EditPartyQual" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="AddPartyQual" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
</widgets>
</section>
</container>
@@ -53,28 +51,32 @@
</widgets>
</section>
</screen>
- <screen name="ListPartyResumes">
+ <screen name="FindPartyResume">
<section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindPartyResume"></set>
+ <set field="headerItem" value="PartyResume"/>
+ </actions>
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResListPartyResumes}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditPartyResume" text="${uiLabelMap.HumanResNewPartyResume}" style="buttontext"/>
- </container>
- <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.HumanResFindPartyResume}">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditPartyResume" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewPartyResume}" style="buttontext"/>
+ </container>
+ <include-form name="FindPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.HumanResFindPartyResume}">
+ <section>
+ <widgets>
+ <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -83,14 +85,15 @@
<screen name="EditPartyResume">
<section>
<actions>
+ <set field="headerItem" value="PartyResume"></set>
<set field="tabButtonItem" value="EditPartySkill"/>
+ <set field="resumeId" from-field="parameters.resumeId"/>
<set field="partyId" from-field="parameters.partyId" />
<entity-one entity-name="PartyResume" value-name="partyResume" />
</actions>
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="PartyBar" location="component://humanres/widget/Menus.xml"/>
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
@@ -103,7 +106,7 @@
<container>
<link target="EditPartyResume" text="${uiLabelMap.HumanResNewPartyResume}" style="buttontext" />
</container>
- <include-form name="EditEmplPosition" location="component://humanres/widget/forms/PartyAbilityForms.xml" />
+ <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyAbilityForms.xml" />
</widgets>
</section>
</container>
@@ -410,4 +413,38 @@
</widgets>
</section>
</screen>
+ <screen name="FindPartyQual">
+ <section>
+ <actions>
+ <set field="titleProperty" value="HumanResFindPartyQual"/>
+ <set field="headerItem" value="PartyQual"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <set field="partyQualTypeId" from-field="parameters.partyQualTypeId"/>
+ <set field="fromDate" from-field="parameters.fromDate"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.HumanResFindPartyQual}">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/>
+ </container>
+ <include-form name="FindPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.HumanResFindPartyQual}">
+ <section>
+ <widgets>
+ <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Tue May 20 03:31:33 2008
@@ -153,7 +153,7 @@
<form name="ListPayHistories" type="list" target="updatePayHistory" title="" paginate-target="findPayHistories"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="PayHistory">
+ <entity-condition entity-name="PayHistory" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/>
<condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/>
@@ -163,12 +163,14 @@
</condition-list>
</entity-condition>
</actions>
- <auto-fields-service service-name="updatePayHistory" default-field-type="hidden"/>
+ <auto-fields-service service-name="updatePayHistory"/>
<field name="roleTypeIdFrom"><display/></field>
<field name="roleTypeIdTo"><display/></field>
<field name="partyIdFrom"><display/></field>
<field name="partyIdTo"><display/></field>
<field name="fromDate"><display/></field>
+ <field name="amount"><hidden/></field>
+ <field name="comments"><hidden/></field>
<field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><lookup target-form-name="LookupSalaryStep" size="20"/></field>
<field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}"><lookup target-form-name="LookupPayGrade" size="20"/></field>
<field name="periodTypeId" title="${uiLabelMap.FormFieldTitle_periodTypeId}">
@@ -179,11 +181,14 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deletePayHistory?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
+ </field>
</form>
<form name="ListPartyBenefits" type="list" target="updatePartyBenefit" title="" paginate-target="findPartyBenefits"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="PartyBenefit">
+ <entity-condition entity-name="PartyBenefit" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/>
<condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/>
@@ -209,6 +214,9 @@
</field>
<field name="thruDate"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deletePartyBenefit?benefitTypeId=${benefitTypeId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
+ </field>
</form>
<form name="AddPartyBenefit" type="single" target="createPartyBenefit"
header-row-style="header-row" default-table-style="basic-table">
@@ -348,12 +356,24 @@
<form name="ListUnemploymentClaims" type="list" title="" target="updateUnemploymentClaim" paginate-target="FindUnemploymentClaim"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="UnemploymentClaim"><order-by field-name="unemploymentClaimId"/></entity-condition>
+ <entity-condition entity-name="UnemploymentClaim" filter-by-date="true">
+ <condition-list combine="and">
+ <condition-expr field-name="partyIdFrom" operator="equals" env-name="parameters.partyIdFrom"/>
+ <condition-expr field-name="partyIdTo" operator="equals" env-name="parameters.partyIdTo"/>
+ <condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/>
+ <condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/>
+ <condition-expr field-name="fromDate" operator="equals" env-name="parameters.fromDate"/>
+ </condition-list>
+ <order-by field-name="unemploymentClaimId"/>
+ </entity-condition>
</actions>
- <auto-fields-service service-name="updateUnemploymentClaim"/>
+ <auto-fields-service service-name="updateUnemploymentClaim"/>
<field name="unemploymentClaimId"><display/></field>
<field name="partyIdFrom"><display/></field>
<field name="partyIdTo"><display/></field>
+ <field name="roleTypeIdTo"><display/></field>
+ <field name="roleTypeIdFrom"><display/></field>
+ <field name="fromDate"><display/></field>
<field name="description"><text size="12"/></field>
<field name="statusId">
<drop-down allow-empty="false">
@@ -363,23 +383,9 @@
</entity-options>
</drop-down>
</field>
- <field name="roleTypeIdFrom">
- <drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="roleTypeIdTo">
- <drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="deleteUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}" description="${uiLabelMap.CommonDelete}"/>
+ <hyperlink target="deleteUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
</field>
</form>
<form name="AddUnemploymentClaim" type="single" target="createUnemploymentClaim" title="" default-map-name="unemploymentClaim"
@@ -394,22 +400,11 @@
</entity-options>
</drop-down>
</field>
- <field name="roleTypeIdFrom">
- <drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="roleTypeIdTo">
- <drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeIdFrom"><hidden/></field>
+ <field name="roleTypeIdTo"><hidden/></field>
+ <field name="partyIdFrom"><hidden/></field>
+ <field name="partyIdTo"><hidden/></field>
+ <field name="fromDate"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="CreateEmployee" type="single" target="createEmployee"
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Tue May 20 03:31:33 2008
@@ -20,47 +20,83 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ListPartyQuals" type="list" title="" paginate-target="findPartyQuals"
+ <form name="ListPartyQuals" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartyQual" paginate-target="FindPartyQual"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="PartyQual"><order-by field-name="partyQualId"/></entity-condition>
- </actions>
+ <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="PartyQual"/>
+ <field-map field-name="orderBy" value="fromDate"/>
+ </service>
+ </actions>
<auto-fields-service service-name="updatePartyQual"/>
- <field name="partyQualId" title="PartyQualId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${partyQualId}" target="EditPartyQual?partyQualId=${partyQualId}"/>
- </field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
</display-entity>
</field>
+ <field name="partyQualTypeId"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="qualificationDesc"><text/></field>
+ <field name="title"><text/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="verifStatusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
</form>
- <form name="EditPartyQual" type="single" target="updatePartyQual" title="" default-map-name="partyQual"
+ <form name="AddPartyQual" type="single" target="createPartyQual" title=""
header-row-style="header-row" default-table-style="basic-table">
- <alt-target use-when="partyQual==null" target="createPartyQual"/>
- <auto-fields-service service-name="updatePartyQual" map-name="partyQual"/>
- <field use-when="partyQual!=null" name="partyQualId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field use-when="partyQual==null&&partyQualId!=null" name="partyQualId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${partyQualId}]"><text size="20" maxlength="20"/></field>
- <field name="partyQualId" use-when="partyQual!=null" title="partyQualId"><display/></field>
- <field name="partyQualId" use-when="partyQual==null" title="partyQualId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyQualTypeId" title="partyQualType Id">
- <drop-down allow-empty="false">
+ <auto-fields-service service-name="createPartyQual"/>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyQualTypeId">
+ <drop-down allow-empty="true">
<entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
- <entity-constraint name="partyQualTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="partyQualTypeId" use-when="partyQual!=null" title="partyQualTypeId"><display/></field>
- <field name="submitButton" use-when="partyQual==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="submitButton" use-when="partyQual!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="verifStatusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListPartyResumes" type="list" title="" paginate-target="findPartyResumes"
+ <form name="ListPartyResumes" type="list" separate-columns="true" default-entity-name="PartyResume" list-name="listIt" paginate-target="FindPartyResume" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="PartyResume"><order-by field-name="resumeId"/></entity-condition>
+ <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="PartyResume"/>
+ <field-map field-name="orderBy" value="resumeId"/>
+ </service>
</actions>
- <auto-fields-service service-name="updatePartyResume"/>
+ <auto-fields-entity entity-name="PartyResume" default-field-type="display"/>
<field name="resumeId" title="ResumeId" widget-style="linktext">
<hyperlink also-hidden="false" description="${resumeId}" target="EditPartyResume?resumeId=${resumeId}"/>
</field>
@@ -75,14 +111,16 @@
</form>
<form name="EditPartyResume" type="single" target="updatePartyResume" title="" default-map-name="partyResume"
header-row-style="header-row" default-table-style="basic-table">
- <alt-target use-when="partyResume==null" target="createpartyResume"/>
- <auto-fields-service service-name="updatePartyResume" map-name="partyResume"/>
+ <alt-target use-when="partyResume==null" target="createPartyResume"/>
+ <auto-fields-service service-name="createPartyResume"/>
+ <field name="contentId"><lookup target-form-name="LookupContent"/></field>
<field use-when="partyResume!=null" name="resumeId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field name="resumeId" use-when="partyResume!=null" title="resumeId"><display/></field>
- <field name="partyId" use-when="partyResume!=null" title="partyId"><display/></field>
- <field name="partyId" use-when="partyResume==null" title="partyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="submitButton" use-when="partyResume==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="submitButton" use-when="partyResume!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="resumeId" use-when="partyResume!=null" title="${uiLabelMap.HumanResResumeId}"><display/></field>
+ <field name="resumeId" use-when="partyResume==null" title="${uiLabelMap.HumanResResumeId}"><hidden/></field>
+ <field name="partyId" use-when="partyResume!=null&&partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><display/></field>
+ <field name="partyId" use-when="partyResume==null&&partyId==null" title="${uiLabelMap.FormFieldTitle_partyId}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
+ <field use-when="partyResume==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="partyResume!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="FindPartySkills" type="single" target="FindPartySkills"
header-row-style="header-row" default-table-style="basic-table">
@@ -354,4 +392,41 @@
<field name="thruDate"><date-time type="timestamp"/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="FindPartyResumes" type="single" target="FindPartyResume" header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PartyResume" default-field-type="find"/>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="contentId"><lookup target-form-name="LookupContent"/></field>
+ <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="FindPartyQuals" type="single" target="FindPartyQual" header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PartyQual" default-field-type="find"/>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyQualTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="statusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="verifStatusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ </forms>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue May 20 03:31:33 2008
@@ -978,6 +978,25 @@
<response name="success" type="view" value="EditPersonTrainings"/>
<response name="error" type="view" value="EditPersonTrainings"/>
</request-map>
+ <request-map uri="EditPartyResume">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPartyResume"/>
+ </request-map>
+ <request-map uri="createPartyResume">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPartyResume"/>
+ <response name="success" type="view" value="EditPartyResume"/>
+ </request-map>
+ <request-map uri="updatePartyResume">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePartyResume"/>
+ <response name="success" type="view" value="EditPartyResume"/>
+ </request-map>
+ <request-map uri="deletePartyResume">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deletePartyResume"/>
+ <response name="success" type="view" value="EditPartyResume"/>
+ </request-map>
<!-- Lookup request mappings -->
<request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
@@ -1093,5 +1112,6 @@
<view-map name="PartyInvitationRoleAssocs" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsRoleAssocs"/>
<view-map name="EditPartySkills" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartySkills"/>
<view-map name="EditPersonTrainings" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPersonTrainings"/>
+ <view-map name="EditPartyResume" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResume"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue May 20 03:31:33 2008
@@ -67,6 +67,9 @@
<menu-item name="PersonTraining" title="${uiLabelMap.HumanResTraining}">
<link target="EditPersonTrainings?partyId=${partyId}"/>
</menu-item>
+ <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}">
+ <link target="EditPartyResume?partyId=${partyId}"/>
+ </menu-item>
</menu>
<menu name="create-new-party" type="simple" menu-container-style="basic-nav">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=658193&r1=658192&r2=658193&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue May 20 03:31:33 2008
@@ -1109,4 +1109,36 @@
</widgets>
</section>
</screen>
+ <screen name="EditPartyResume">
+ <section>
+ <actions>
+ <set field="titleProperty" value="HumanResEditPartyResume"/>
+ <set field="headerItem" value="find"/>
+ <set field="tabButtonItem" value="PartyResume"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <set field="resumeId" from-field="parameters.resumeId"/>
+ <entity-one entity-name="PartyResume" value-name="partyResume"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.HumanResListPartyResumes}">
+ <section>
+ <widgets>
+ <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.HumanResNewPartyResume}">
+ <section>
+ <widgets>
+ <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>