svn commit: r718363 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: apatel
Date: Mon Nov 17 12:23:06 2008 New Revision: 718363 URL: http://svn.apache.org/viewvc?rev=718363&view=rev Log: Simplified edit employee screen set. More cleanup to follow. Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml ofbiz/trunk/applications/humanres/servicedef/services.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon Nov 17 12:23:06 2008 @@ -501,7 +501,7 @@ <property key="HumanResEditUnemploymentClaim"> <value xml:lang="en">Unemployment Claims</value> </property> - <property key="HumanResEmployee"> + <property key="HumanResEmployees"> <value xml:lang="en">Employees</value> </property> <property key="HumanResEmplLeaveType"> @@ -963,6 +963,9 @@ <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸ªà¸£à¹à¸²à¸à¸à¸²à¸£à¸à¸£à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸¨à¸¶à¸à¸©à¸² , à¸à¹à¸à¸à¸à¸²à¸£à¸à¸±à¸§à¹à¸à¸£à¸à¸µà¹à¸«à¸²à¸¢à¹à¸</value> <value xml:lang="zh">æ æ³å建æè²è®°å½ï¼ç¼ºå°æéçåæ°</value> </property> + <property key="HumanResSkills"> + <value xml:lang="en">Skills</value> + </property> <property key="HumanResSkillType"> <value xml:lang="en">Skill Types</value> <value xml:lang="it">Tipo Abilità </value> 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=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Mon Nov 17 12:23:06 2008 @@ -25,6 +25,10 @@ <simple-method method-name="createPartyQual" short-description="Create a Party Qualification"> <make-value entity-name="PartyQual" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> + <if-empty field="newEntity.fromDate"> + <now-timestamp-to-env env-name="nowTimeStamp"/> + <set field="newEntity.fromDate" from-field="nowTimeStamp"/> + </if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <field-to-result field-name="newEntity.partyId" result-name="partyId"/> <field-to-result field-name="newEntity.partyQualTypeId" result-name="partyQualTypeId"/> Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/servicedef/services.xml (original) +++ ofbiz/trunk/applications/humanres/servicedef/services.xml Mon Nov 17 12:23:06 2008 @@ -32,7 +32,7 @@ <auto-attributes mode="IN" include="nonpk" optional="true"/> <override name="partyId" optional="false"/> <override name="partyQualTypeId" optional="false"/> - <override name="fromDate" optional="false"/> + <override name="fromDate" optional="true"/> </service> <service name="updatePartyQual" engine="simple" default-entity-name="PartyQual" 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=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Mon Nov 17 12:23:06 2008 @@ -396,18 +396,6 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditEmplLeaves"/> </request-map> - <request-map uri="createEmplLeave"> - <security https="true" auth="true"/> - <event type="service" invoke="createEmplLeave"/> - <response name="success" type="view" value="NewEmplLeave"/> - <response name="error" type="view" value="NewEmplLeave"/> - </request-map> - <request-map uri="updateEmplLeave"> - <security https="true" auth="true"/> - <event type="service-multi" invoke="updateEmplLeave"/> - <response name="success" type="view" value="FindEmplLeaves"/> - <response name="error" type="view" value="FindEmplLeaves"/> - </request-map> <request-map uri="EditEmplLeaveTypes"> <security https="true" auth="true"/> <response name="success" type="view" value="EditEmplLeaveTypes"/> @@ -538,9 +526,9 @@ <event type="service" invoke="deleteValidResponsibility"/> <response name="success" type="view" value="ListValidResponsibilities"/> </request-map> - <request-map uri="viewprofile"> + <request-map uri="EmployeeProfile"> <security https="true" auth="true"/> - <response name="success" type="view" value="viewprofile"/> + <response name="success" type="view" value="EmployeeProfile"/> </request-map> <request-map uri="findSkillTypes"> <security https="true" auth="true"/> @@ -577,13 +565,101 @@ <request-map uri="createEmployee"> <security https="true" auth="true"/> <event type="service" invoke="createEmployee"/> - <response name="success" type="request" value="viewprofile"/> + <response name="success" type="request" value="EmployeeProfile"/> <response name="error" type="view" value="NewEmployee"/> - </request-map> - <request-map uri="EditPartyQuals"> + </request-map> + <request-map uri="EditEmployeeSkills"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartyQuals"/> + <response name="success" type="view" value="EditEmployeeSkills"/> + </request-map> + <request-map uri="createEmployeeSkill"> + <security https="true" auth="true"/> + <event type="service" invoke="createPartySkill"/> + <response name="success" type="view" value="EditEmployeeSkills"/> + <response name="error" type="view" value="EditEmployeeSkills"/> </request-map> + <request-map uri="updateEmployeeSkill"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePartySkill"/> + <response name="success" type="view" value="EditEmployeeSkills"/> + <response name="error" type="view" value="EditEmployeeSkills"/> + </request-map> + <request-map uri="deleteEmployeeSkill"> + <security https="true" auth="true"/> + <event type="service" invoke="deletePartySkill"/> + <response name="success" type="view" value="EditEmployeeSkills"/> + <response name="error" type="view" value="EditEmployeeSkills"/> + </request-map> + <request-map uri="EditEmployeeQuals"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmployeeQuals"/> + </request-map> + <request-map uri="createEmployeeQualification"> + <security https="true" auth="true"/> + <event type="service" invoke="createPartyQual"/> + <response name="success" type="view" value="EditEmployeeQuals"/> + <response name="error" type="view" value="EditEmployeeQuals"/> + </request-map> + <request-map uri="updateEmployeeQualification"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePartyQual"/> + <response name="success" type="view" value="EditEmployeeQuals"/> + <response name="error" type="view" value="EditEmployeeQuals"/> + </request-map> + <request-map uri="deleteEmployeeQualification"> + <security https="true" auth="true"/> + <event type="service" invoke="deletePartyQual"/> + <response name="success" type="view" value="EditEmployeeQuals"/> + <response name="error" type="view" value="EditEmployeeQuals"/> + </request-map> + <request-map uri="EditEmployeeTrainings"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmployeeTrainings"/> + </request-map> + <request-map uri="createEmployeeTraining"> + <security https="true" auth="true"/> + <event type="service" invoke="createPersonTraining"/> + <response name="success" type="view" value="EditEmployeeTrainings"/> + <response name="error" type="view" value="EditEmployeeTrainings"/> + </request-map> + <request-map uri="updateEmployeeTraining"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePersonTraining"/> + <response name="success" type="view" value="EditEmployeeTrainings"/> + <response name="error" type="view" value="EditEmployeeTrainings"/> + </request-map> + <request-map uri="deleteEmployeeTraining"> + <security https="true" auth="true"/> + <event type="service" invoke="deletePersonTraining"/> + <response name="success" type="view" value="EditEmployeeTrainings"/> + <response name="error" type="view" value="EditEmployeeTrainings"/> + </request-map> + + <request-map uri="EditEmployeeResumes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmployeeResumes"/> + </request-map> + <request-map uri="EditEmployeePerformanceNotes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmployeePerformanceNotes"/> + </request-map> + <request-map uri="EditEmployeeLeaves"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmployeeLeaves"/> + </request-map> + <request-map uri="createEmplLeave"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplLeave"/> + <response name="success" type="view" value="EditEmployeeLeaves"/> + <response name="error" type="view" value="EditEmployeeLeaves"/> + </request-map> + <request-map uri="updateEmplLeave"> + <security https="true" auth="true"/> + <event type="service" invoke="updateEmplLeave"/> + <response name="success" type="view" value="EditEmployeeLeaves"/> + <response name="error" type="view" value="EditEmployeeLeaves"/> + </request-map> + <!-- ===================Responsibility Request============== --> <request-map uri="EditResponsibilityTypes"> <security https="true" auth="true"/> @@ -717,10 +793,6 @@ <response name="success" type="view" value="EditAgreementEmploymentAppls"/> </request-map> <!--====================Extended Requests===================================--> - <request-map uri="EditPartySkills"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartySkills"/> - </request-map> <request-map uri="EditPartySkillsExt"> <security https="true" auth="true"/> <response name="success" type="view" value="EditPartySkills"/> @@ -742,9 +814,9 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditPartyResumes"/> </request-map> - <request-map uri="EditEmploymentApps"> + <request-map uri="EditEmployeeEmploymentApps"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditEmploymentApps"/> + <response name="success" type="view" value="EditEmployeeEmploymentApps"/> </request-map> <request-map uri="EditEmploymentAppsExt"> <security https="true" auth="true"/> @@ -857,6 +929,14 @@ <view-map name="FindEmployee" type="screen" page="component://humanres/widget/EmployeeScreens.xml#FindEmployee"/> <view-map name="NewEmployee" type="screen" page="component://humanres/widget/EmployeeScreens.xml#NewEmployee"/> + <view-map name="EmployeeProfile" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EmployeeProfile"/> + <view-map name="EditEmployeeSkills" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeSkills"/> + <view-map name="EditEmployeeQuals" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeQuals"/> + <view-map name="EditEmployeeTrainings" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeTrainings"/> + <view-map name="EditEmployeeEmploymentApps" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeEmploymentApps"/> + <view-map name="EditEmployeeResumes" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeResumes"/> + <view-map name="EditEmployeePerformanceNotes" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeePerformanceNotes"/> + <view-map name="EditEmployeeLeaves" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeLeaves"/> <view-map name="FindEmplPositions" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#FindEmplPositions"/> <view-map name="EditEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPosition"/> @@ -901,7 +981,6 @@ <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationTypes"/> <view-map name="EditTerminationReasons" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationReasons"/> - <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#EditPartySkills"/> <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/> <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Mon Nov 17 12:23:06 2008 @@ -176,7 +176,7 @@ <#list partyList as partyRow> <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> + <td><a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> <td><#if partyRow.containsKey("userLoginId")> ${partyRow.userLoginId?default("N/A")} <#else> @@ -217,7 +217,7 @@ </#if> <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td> <td class="button-col align-float"> - <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> + <a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> </td> </tr> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Mon Nov 17 12:23:06 2008 @@ -237,6 +237,64 @@ </widgets> </section> </screen> + <screen name="EmployeeDecorator"> + <!-- Decorator for Employee edit/view screen set. partyId in this context is a Party in Employee Role and in Employment relationship with internal organization --> + <section> + <actions> + <set field="headerItem" value="Employees"/> + <set field="partyId" from-field="parameters.partyId"/> + <entity-one entity-name="Party" value-name="party"/> + <entity-one entity-name="Person" value-name="lookupPerson"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <condition> + <and> + <if-has-permission permission="HUMANRES" action="_VIEW"/> + <not><if-empty field-name="partyId"/></not> + </and> + </condition> + <widgets> + <include-menu name="EmployeeProfileTabBar" location="component://humanres/widget/Menus.xml"/> + </widgets> + </section> + </decorator-section> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="HUMANRES" action="_VIEW"/> + </condition> + <widgets> + <section> + <condition><not><if-empty field-name="partyId"/></not></condition> + <widgets> + <container style="h1"> + <section> + <condition><not><if-empty field-name="lookupPerson"/></not></condition> + <widgets> + <label text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} [${partyId}]"/> + </widgets> + <fail-widgets> + <label style="h1" text="${uiLabelMap.HumanResNewEmployee}"/> + </fail-widgets> + </section> + </container> + </widgets> + </section> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + + </decorator-screen> + </widgets> + </section> + </screen> <screen name="CommonPartyDecorator"> <section> <actions> Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Mon Nov 17 12:23:06 2008 @@ -24,7 +24,7 @@ <section> <actions> <set field="titleProperty" value="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployee}"/> - <set field="headerItem" value="Employee"/> + <set field="headerItem" value="Employees"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -59,7 +59,7 @@ <section> <actions> <set field="titleProperty" value="PartyCreateNewEmployee"/> - <set field="headerItem" value="Employee"/> + <set field="headerItem" value="Employees"/> <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/> </actions> <widgets> @@ -77,4 +77,218 @@ </widgets> </section> </screen> + <screen name="EmployeeProfile"> + <section> + <actions> + <set field="titleProperty" value="PageTitleViewPartyProfile"/> + <set field="tabButtonItem" value="EmployeeProfile"/> + <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/> + <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <not><if-empty field-name="party"/></not> + </condition> + <widgets> + <section> + <condition> + <if-compare field-name="showOld" operator="equals" value="true" type="Boolean"/> + </condition> + <widgets> + <container style="button-bar button-style-2"> + <link target="viewprofile?partyId=${party.partyId}" text="${uiLabelMap.PartyHideOld}"/> + </container> + </widgets> + <fail-widgets> + <container style="button-bar button-style-2"> + <link target="viewprofile?partyId=${party.partyId}&SHOW_OLD=true" text="${uiLabelMap.PartyShowOld}"/> + </container> + </fail-widgets> + </section> + <section> + <widgets> + <container style="profile-left"> + <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="contactsAndAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="LoyaltyPoints" location="component://party/widget/partymgr/ProfileScreens.xml"/> + </container> + <container style="profile-right"> + <include-screen name="UserLogin" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="Attributes" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="Subscriptions" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/> + </container> + </widgets> + </section> + </widgets> + <fail-widgets> + <container> + <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label> + </container> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeeSkills"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPartySkill"/> + <set field="tabButtonItem" value="EditEmployeeSkills"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="skillTypeId" from-field="parameters.skillTypeId"/> + <set field="partySkillsCtx.partyId" from-field="parameters.partyId"/> + <set field="parameters.insideEmployee" value="true"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListEmployeeSkills" location="component://humanres/widget/forms/EmployeeForms.xml"/> + <screenlet id="AddPartySkillPanel" title="${uiLabelMap.HumanResAddPartySkill}" collapsible="true"> + <include-form name="AddEmployeeSkills" location="component://humanres/widget/forms/EmployeeForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeeQuals"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPartyQual"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditEmployeeQuals"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyQualCtx.partyId" from-field="parameters.partyId"/> + <set field="parameters.insideEmployee" value="true"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListEmployeeQualification" location="component://humanres/widget/forms/EmployeeForms.xml"/> + <screenlet id="AddPartyQualPanel" title="${uiLabelMap.HumanResAddPartyQual}" collapsible="true"> + <include-form name="AddEmployeeQualification" location="component://humanres/widget/forms/EmployeeForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeeTrainings"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPersonTraining"/> + <set field="tabButtonItem" value="EditEmployeeTrainings"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/> + <set field="personTrainingsCtx.partyId" from-field="parameters.partyId"/> + <set field="parameters.insideEmployee" value="true"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListEmployeeTrainings" location="component://humanres/widget/forms/EmployeeForms.xml"/> + <screenlet id="AddPersonTrainingPanel" title="${uiLabelMap.HumanResAddPersonTraining}" collapsible="true"> + <include-form name="AddEmployeeTraining" location="component://humanres/widget/forms/EmployeeForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeeEmploymentApps"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewEmploymentApp"/> + <set field="tabButtonItem" value="EditEmployeeEmploymentApps"/> + <set field="referredByPartyId" from-field="parameters.partyId"/> + <set field="employmentAppCtx.applicationId" from-field="parameters.applicationId"/> + <set field="parameters.insideEmployee" value="true"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/> + <screenlet id="AddEmploymentAppPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmploymentApp}" collapsible="true"> + <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeeResumes"> + <section> + <actions> + <set field="headerItem" value="PartyResume"></set> + <set field="tabButtonItem" value="EditEmployeeResumes"/> + <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="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyResumeForms.xml"/> + <screenlet id="AddEmploymentAppPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEditPartyResume}" collapsible="true"> + <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml" /> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeePerformanceNotes"> + <section> + <actions> + <set field="titleProperty" value="HumanResEditPerfNote"/> + <set field="tabButtonItem" value="EditEmployeePerformanceNotes"/> + <set field="partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListPerformanceNotes" location="component://humanres/widget/forms/EmploymentForms.xml"/> + <screenlet id="AddPerformanceNotePanel" title="${uiLabelMap.HumanResAddPerfNote}" collapsible="true"> + <include-form name="AddPerformanceNote" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmployeeLeaves"> + <section> + <actions> + <set field="titleProperty" value="HumanResEditEmplLeave"/> + <set field="tabButtonItem" value="EditEmployeeLeaves"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="emplLeaveCtx.partyId" from-field="parameters.partyId"/> + <set field="parameters.insideEmployee" value="true"/> + </actions> + <widgets> + <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmployeeForms.xml"/> + <screenlet id="AddEmplLeavePanel" title="${uiLabelMap.HumanResAddEmplLeave}" collapsible="true"> + <include-form name="AddEmplLeave" location="component://humanres/widget/forms/EmployeeForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Mon Nov 17 12:23:06 2008 @@ -22,9 +22,9 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="HumanResAppBar" title="${uiLabelMap.HumanResManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item> - <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item> + <menu-item name="Employees" title="${uiLabelMap.HumanResEmployees}"><link target="findEmployees"/></menu-item> <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPositions"/></menu-item> - <menu-item name="PartySkills" title="${uiLabelMap.CommonPartySkills}"><link target="FindPartySkills"/></menu-item> + <menu-item name="EmplSkills" title="${uiLabelMap.HumanResSkills}"><link target="FindPartySkills"/></menu-item> <menu-item name="PartyQual" title="${uiLabelMap.HumanResPartyQualification}"><link target="FindPartyQuals"/></menu-item> <menu-item name="Training" title="${uiLabelMap.HumanResTraining}"><link target="FindPersonTrainings"/></menu-item> <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApps"/></menu-item> @@ -108,31 +108,32 @@ </menu-item> </menu> - <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected" + <menu name="EmployeeProfileTabBar" default-menu-item-name="EditEmployeeSkills" default-selected-style="selected" type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> - <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}"> - <link target="viewprofile?partyId=${partyId}"/> + <menu-item name="EmployeeProfile" title="${uiLabelMap.PartyProfile}"> + <link target="EmployeeProfile?partyId=${partyId}"/> </menu-item> - <menu-item name="EditPartySkills" title="${uiLabelMap.CommonPartySkills}"> - <link target="EditPartySkills?partyId=${partyId}"/> + <menu-item name="EditEmployeeSkills" title="${uiLabelMap.HumanResSkills}"> + <link target="EditEmployeeSkills?partyId=${partyId}"/> </menu-item> - <menu-item name="EditPartyQuals" title="${uiLabelMap.HumanResPartyQualification}"> - <link target="EditPartyQuals?partyId=${partyId}"/> + <menu-item name="EditEmployeeQuals" title="${uiLabelMap.HumanResPartyQualification}"> + <link target="EditEmployeeQuals?partyId=${partyId}"/> </menu-item> - <menu-item name="EditPersonTrainings" title="${uiLabelMap.HumanResTraining}"> - <link target="EditPersonTrainings?partyId=${partyId}"/> - </menu-item> - <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> - <link target="EditEmploymentApps?partyId=${partyId}"/> - </menu-item> - <menu-item name="EditPartyResumes" title="${uiLabelMap.HumanResPartyResume}"> - <link target="EditPartyResumes?partyId=${partyId}"/> - </menu-item> - <menu-item name="EditPerformanceNotes" title="${uiLabelMap.HumanResPerfNote}"> - <link target="EditPerformanceNotes?partyId=${partyId}"/> - </menu-item> - <menu-item name="EditEmplLeaves" title="${uiLabelMap.HumanResEmplLeave}"> - <link target="EditEmplLeaves?partyId=${partyId}"/> + <menu-item name="EditEmployeeTrainings" title="${uiLabelMap.HumanResTraining}"> + <link target="EditEmployeeTrainings?partyId=${partyId}"/> + </menu-item> + <!-- I think these don't belong here, I'll get to these in short while. + <menu-item name="EditEmployeeEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> + <link target="EditEmployeeEmploymentApps?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditEmployeeResumes" title="${uiLabelMap.HumanResPartyResume}"> + <link target="EditEmployeeResumes?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditEmployeePerformanceNotes" title="${uiLabelMap.HumanResPerfNote}"> + <link target="EditEmployeePerformanceNotes?partyId=${partyId}"/> + </menu-item> --> + <menu-item name="EditEmployeeLeaves" title="${uiLabelMap.HumanResEmplLeave}"> + <link target="EditEmployeeLeaves?partyId=${partyId}"/> </menu-item> </menu> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=718363&r1=718362&r2=718363&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Mon Nov 17 12:23:06 2008 @@ -66,4 +66,158 @@ <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="50" maxlength="60"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file + <form name="AddEmployeeSkills" type="single" target="createEmployeeSkill" default-map-name="partySkill"> + <field name="partyId"><hidden/></field> + <field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <drop-down> + <entity-options description="${description}" entity-name="SkillType"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="yearsExperience"><text/></field> + <field name="rating"><text/></field> + <field name="skillLevel"><text/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmployeeSkills" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmployeeSkill" paginate-target="findPartySkills" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="PartySkill"> + <condition-expr field-name="partyId" env-name="partyId"/> + <order-by field-name="skillTypeId"/> + </entity-condition> + </actions> + <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/> + <field name="skillTypeId"> + <display-entity entity-name="SkillType" description="${description}"/> + </field> + <field name="yearsExperience"><text/></field> + <field name="rating"><text/></field> + <field name="skillLevel"><text/></field> + <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="deleteEmployeeSkill?skillTypeId=${skillTypeId}&&partyId=${partyId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + </form> + <form name="AddEmployeeQualification" type="single" target="createEmployeeQualification"> + <auto-fields-service service-name="createPartyQual"/> + <field name="partyId"><hidden/></field> + <field name="partyQualTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <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="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmployeeQualification" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmployeeQualification" paginate-target="FindPartyQuals" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="PartyQual"> + <condition-expr field-name="partyId" env-name="partyId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <auto-fields-service service-name="updatePartyQual"/> + <field name="partyId"><hidden/></field> + <field name="partyQualTypeId"><display-entity entity-name="PartyQualType" description="${description}"/></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="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="deleteEmployeeQualification?partyId=${partyId}&partyQualTypeId=${partyQualTypeId}&fromDate=${fromDate}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> + </form> + <form name="AddEmployeeTraining" type="single" target="createEmployeeTraining"> + <field name="partyId"><hidden/></field> + <field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <drop-down allow-empty="false"> + <entity-options description="${description}" entity-name="TrainingClassType"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="fromDate"><date-time type="timestamp"/></field> + <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="ListEmployeeTrainings" type="list" list-name="listIt" separate-columns="true" target="updateEmployeeTraining" paginate-target="FindPersonTrainings" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="PersonTraining"> + <condition-expr field-name="partyId" env-name="partyId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/> + <field name="partyId"><hidden/></field> + <field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field> + <field name="thruDate"><date-time type="timestamp"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> + <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="deleteEmployeeTraining?partyId=${partyId}&trainingClassTypeId=${trainingClassTypeId}&fromDate=${fromDate}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/> + </field> + </form> + <form name="AddEmplLeave" type="single" target="createEmplLeave"> + <auto-fields-service service-name="createEmplLeave"/> + <field name="partyId"><hidden/></field> + <field name="leaveTypeId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmplLeaves" type="list" list-name="listIt" separate-columns="true" target="updateEmplLeave" paginate-target="FindEmplLeaves" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="EmplLeave"> + <condition-expr field-name="partyId" env-name="partyId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <auto-fields-service service-name="updateEmplLeave"/> + <field name="partyId"><hidden/></field> + <field name="leaveTypeId"><display-entity description="${description}" entity-name="EmplLeaveType"/></field> + <field name="fromDate"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> + </form> + +</forms> + |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |