Author: erwan
Date: Mon Jan 16 14:18:21 2012
New Revision: 1232003
URL: http://svn.apache.org/viewvc?rev=1232003&view=rev
Log:
OFBIZ-2400 - Create a Portlet for leave - A patch from Vikas Mayur
Added:
ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml (with
props)
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/ofbiz-component.xml
ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=1232003&r1=1232002&r2=1232003&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon Jan 16
14:18:21 2012
@@ -1735,6 +1735,10 @@
<value xml:lang="zh">人åèµæºç®¡çç³»ç»</value>
<value xml:lang="zh_TW">人åè³æºç®¡ç系統</value>
</property>
+ <property key="HumanResMyLeaves">
+ <value xml:lang="en">My Leaves</value>
+ <value xml:lang="fr">Mes congés</value>
+ </property>
<property key="HumanResNewEmplPosition">
<value xml:lang="de">Stelle anlegen</value>
<value xml:lang="en">New Employee Position</value>
Added: ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml?rev=1232003&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml (added)
+++ ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml Mon Jan 16
14:18:21 2012
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<entity-engine-xml>
+
+ <PortletCategory portletCategoryId="HUMANRES" description="Human Resource
Portlets"/>
+ <PortalPortlet portalPortletId="myLeave"
+ portletName="My Leave"
+ screenName="MyLeaveList"
+ screenLocation="component://humanres/widget/EmployeeScreens.xml"
+ description="My Leaves form Human Resource"
securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>
+ <PortletPortletCategory portalPortletId="myLeave"
portletCategoryId="HUMANRES"/>
+
+</entity-engine-xml>
Propchange: ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/humanres/data/HumanResPortletData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?rev=1232003&r1=1232002&r2=1232003&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Mon Jan 16 14:18:21
2012
@@ -29,6 +29,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main"
location="data/HumanResTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/HumanResHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/HumanResSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main"
location="data/HumanResPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/HumanResDemoData.xml"/>
<service-resource type="model" loader="main"
location="servicedef/services.xml"/>
Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1232003&r1=1232002&r2=1232003&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Mon Jan 16
14:18:21 2012
@@ -322,4 +322,17 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="MyLeaveList">
+ <section>
+ <actions>
+ <set field="partyId" from-field="userLogin.partyId"/>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.HumanResMyLeaves}"
navigation-form-name="ListEmplLeaves">
+ <include-form name="ListEmplLeaves"
location="component://humanres/widget/forms/EmployeeForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=1232003&r1=1232002&r2=1232003&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Jan 16
14:18:21 2012
@@ -29,6 +29,7 @@
<PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="200"
portalPageName="Other Party Comms" description="The OFBiz My Portal other
commmunication page" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="400"
portalPageName="My Time Sheet" description="The OFBiz My Portal Timesheet page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="500"
portalPageName="My Tasks" description="The OFBiz My Portal My Task page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="600"
portalPageName="My Leave" description="The OFBiz My Portal My Leave page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="0"
portalPageName="Main" description="The OFBiz System info page"
ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML0" sequenceNum="50"
portalPageName="My Comms" description="The OFBiz My Communications page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
@@ -53,6 +54,7 @@
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001"/>
+ <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML0" columnSeqId="00001"/>
@@ -98,6 +100,7 @@
<PortletAttribute portalPageId="MYPORTAL_EMPLOYEE2"
portalPortletId="MyCommunications" portletSeqId="00001"
attrName="communicationPartyId" attrValue="Company"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4"
portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5"
portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6"
portalPortletId="myLeave" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML"
portalPortletId="SystemInfoNotes" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML"
portalPortletId="SystemInfoStatus" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=1232003&r1=1232002&r2=1232003&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Mon Jan 16
14:18:21 2012
@@ -209,6 +209,18 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="EmployeeDecorator">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="reloadCaptchaCode">
<section>
