Author: hansbak
Date: Tue Sep 13 11:57:22 2011
New Revision: 1170129
URL: http://svn.apache.org/viewvc?rev=1170129&view=rev
Log:
move the public holiday definition from scrum to the HR component
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
ofbiz/trunk/specialpurpose/scrum/config/scrumUiLabels.xml
ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml
ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml
ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml
ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Tue Sep 13
11:57:22 2011
@@ -673,6 +673,9 @@
<value xml:lang="zh">å·¥ä½ç»éªï¼å¹´ï¼</value>
<value xml:lang="zh_TW">å·¥ä½ç¶é©ï¼å¹´ï¼</value>
</property>
+ <property key="HumanHolidayName">
+ <value xml:lang="en">Holiday Name</value>
+ </property>
<property key="HumanResAddEmplLeave">
<value xml:lang="en">Add Employee Leave</value>
<value xml:lang="fr">Ajouter le congé</value>
@@ -2347,6 +2350,9 @@
<value xml:lang="fr">Rechercher une demande d'emploi</value>
<value xml:lang="pt_BR">Procurar pro petição de emrpego</value>
</property>
+ <property key="PageTitleAddPublicHoliday">
+ <value xml:lang="en">Add Public Holiday</value>
+ </property>
<property key="PageTitleEditApprovalStatus">
<value xml:lang="en">Edit Approval Status</value>
<value xml:lang="fr">Modifier les approbations</value>
@@ -2547,6 +2553,12 @@
<value xml:lang="zh">ææèè´£å表</value>
<value xml:lang="zh_TW">ææè·è²¬å表</value>
</property>
+ <property key="PageTitlePublicHoliday">
+ <value xml:lang="en">Public Holiday</value>
+ </property>
+ <property key="PageTitlePublicHolidayList">
+ <value xml:lang="en">Public Holiday List</value>
+ </property>
<property key="PageTitleViewEmploymentApp">
<value xml:lang="en">View Employment App</value>
<value xml:lang="fr">Voir les demandes d'emploi</value>
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue Sep 13
11:57:22 2011
@@ -163,5 +163,7 @@ under the License.
<PerfRatingType perfRatingTypeId="3" hasTable="N" description="Fulfilled
Expectations"/>
<PerfRatingType perfRatingTypeId="4" hasTable="N" description="Frequently
Exceeds"/>
<PerfRatingType perfRatingTypeId="5" hasTable="N"
description="Consistently Exceeds"/>
-
+
+ <!-- Public Holiday -->
+ <WorkEffortType workEffortTypeId="PUBLIC_HOLIDAY" description="Public
Holiday" hasTable="N"/>
</entity-engine-xml>
Modified:
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
---
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
(original)
+++
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
Tue Sep 13 11:57:22 2011
@@ -55,4 +55,34 @@
<set field="orgRelCtx.fromDate" from-field="fromDate"/>
<call-service service-name="deletePartyRelationship"
in-map-name="orgRelCtx"></call-service>
</simple-method>
-</simple-methods>
\ No newline at end of file
+
+ <!-- Public Holiday -->
+ <simple-method method-name="createPublicHoliday" short-description="Create
Public Holiday">
+ <if-empty field="parameters.estimatedStartDate">
+ <add-error>
+ <fail-message message="The FromDate is missing"/>
+ </add-error>
+ <check-errors/>
+ </if-empty>
+ <set field="dateValue" from-field="parameters.estimatedStartDate"
type="Timestamp"/>
+ <call-class-method method-name="getDayEnd"
class-name="org.ofbiz.base.util.UtilDateTime" ret-field="dateEnd">
+ <field field="dateValue" type="java.sql.Timestamp"/>
+ </call-class-method>
+ <set field="parameters.estimatedCompletionDate" from-field="dateEnd"/>
+ <entity-and list="workEffortList" entity-name="WorkEffort">
+ <field-map field-name="workEffortTypeId" value="PUBLIC_HOLIDAY"/>
+ <field-map field-name="estimatedStartDate"
from-field="parameters.estimatedStartDate"/>
+ </entity-and>
+ <if-empty field="workEffortList">
+ <call-service service-name="createWorkEffortAndPartyAssign"
in-map-name="parameters">
+ <default-message>Successfully created.</default-message>
+ </call-service>
+ <else>
+ <add-error>
+ <fail-message message="This FromDate :
${parameters.estimatedStartDate} already exist."/>
+ </add-error>
+ <check-errors/>
+ </else>
+ </if-empty>
+ </simple-method>
+</simple-methods>
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=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
Tue Sep 13 11:57:22 2011
@@ -1108,6 +1108,29 @@ under the License.
<event type="service" invoke="createEmplPositionFulfillment"/>
<response name="success" type="view" value="main"/>
</request-map>
+ <request-map uri="PublicHoliday">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="PublicHoliday"/>
+ <response name="error" type="view" value="PublicHoliday"/>
+ </request-map>
+ <request-map uri="createPublicHoliday">
+ <security https="true" auth="true"/>
+ <event type="simple"
path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml"
invoke="createPublicHoliday"/>
+ <response name="success" type="request-redirect-noparam"
value="PublicHoliday"/>
+ <response name="error" type="view-last"/>
+ </request-map>
+ <request-map uri="updatePublicHoliday">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffort"/>
+ <response name="success" type="request-redirect-noparam"
value="PublicHoliday"/>
+ <response name="error" type="view-last"/>
+ </request-map>
+ <request-map uri="deletePublicHoliday">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteWorkEffort"/>
+ <response name="success" type="view" value="PublicHoliday"/>
+ <response name="error" type="view-last"/>
+ </request-map>
<!-- ===================Lookup Request===================== -->
<request-map uri="LookupPartyName"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupPartyName"/></request-map>
@@ -1207,6 +1230,7 @@ under the License.
<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="EditTrainingTypes" type="screen"
page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTrainingTypes"/>
+ <view-map name="PublicHoliday" type="screen"
page="component://humanres/widget/GlobalHRSettingScreens.xml#PublicHoliday"/>
<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/widget/GlobalHRSettingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Tue Sep
13 11:57:22 2011
@@ -270,4 +270,30 @@
</widgets>
</section>
</screen>
+ <screen name="PublicHoliday">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitlePublicHoliday"/>
+ <set field="headerItem" value="GlobalHRSettings"/>
+ <set field="tabButtonItem" value="publicHoliday"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet id="addPublicHoliday"
title="${uiLabelMap.PageTitleAddPublicHoliday}" collapsible="true">
+ <include-form name="AddPublicHoliday"
location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+ </screenlet>
+ <screenlet id="listPublicHoliday"
title="${uiLabelMap.PageTitlePublicHolidayList}" collapsible="true">
+ <include-form name="ListPublicHoliday"
location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml Tue Sep 13
11:57:22 2011
@@ -183,6 +183,9 @@
<menu-item name="EditTrainingTypes"
title="${uiLabelMap.HumanResTrainingClassType}">
<link target="EditTrainingTypes"/>
</menu-item>
+ <menu-item name="publicHoliday"
title="${uiLabelMap.PageTitlePublicHoliday}">
+ <link target="PublicHoliday"/>
+ </menu-item>
</menu>
<menu name="EmployeeProfileTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
Modified:
ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Tue
Sep 13 11:57:22 2011
@@ -306,4 +306,49 @@ under the License.
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden
value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit"><submit/></field>
</form>
+ <form name="AddPublicHoliday" type="single" target="createPublicHoliday"
default-map-name="workEffort">
+ <alt-target use-when="workEffort!=null" target="updatePublicHoliday"/>
+ <field name="workEffortId"
use-when="workEffort!=null"><hidden/></field>
+ <field name="partyId"><hidden
value="${parameters.userLogin.partyId}"/></field>
+ <field name="roleTypeId" use-when="workEffort==null"><hidden
value="CAL_OWNER"/></field>
+ <field name="statusId" use-when="workEffort==null"><hidden
value="PRTYASGN_ASSIGNED"/></field>
+ <field name="workEffortTypeId"><hidden value="PUBLIC_HOLIDAY"/></field>
+ <field name="currentStatusId" use-when="workEffort==null"><hidden
value="CAL_TENTATIVE"/></field>
+ <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field>
+ <field name="workEffortName" title="${uiLabelMap.HumanHolidayName}"
tooltip="${uiLabelMap.CommonRequired}"><text size="50"/></field>
+ <field name="description"
title="${uiLabelMap.CommonDescription}"><textarea/></field>
+ <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}"
tooltip="${uiLabelMap.CommonRequired}"><date-time type="date"/></field>
+ <field name="addButton" title="${uiLabelMap.CommonSubmit}"
use-when="workEffort==null"><submit/></field>
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}"
use-when="workEffort!=null"><submit/></field>
+ </form>
+ <form name="ListPublicHoliday" type="list" target="PublicHoliday"
list-name="listIt" separate-columns="true"
+ odd-row-style="alternate-row" default-table-style="hover-bar
basic-table">
+ <actions>
+ <entity-and entity-name="WorkEffort" list="listIt">
+ <field-map field-name="workEffortTypeId"
value="PUBLIC_HOLIDAY"/>
+ <order-by field-name="-estimatedStartDate"/>
+ </entity-and>
+ </actions>
+ <row-actions>
+ <entity-and entity-name="WorkEffortPartyAssignment"
list="assignmentList">
+ <field-map field-name="workEffortId"
from-field="workEffortId"/>
+ </entity-and>
+ <set field="partyId" from-field="assignmentList[0].partyId"/>
+ </row-actions>
+ <field name="workEffortId"><hidden/></field>
+ <field name="workEffortTypeId"><hidden value="PUBLIC_HOLIDAY"/></field>
+ <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field>
+ <field name="workEffortName"
title="${uiLabelMap.HumanHolidayName}"><display/></field>
+ <field name="description"
title="${uiLabelMap.CommonDescription}"><display/></field>
+ <field name="estimatedStartDate"
title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
+ <field name="partyId" title="${uiLabelMap.CommonBy}">
+ <display-entity entity-name="PartyNameView"
description="${lastName}, ${firstName} ${middleName}" key-field-name="partyId"/>
+ </field>
+ <field name="updateButton"
title="${uiLabelMap.CommonUpdate}"><submit/></field>
+ <field name="removeHoliday" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
+ <hyperlink description="${uiLabelMap.CommonDelete}"
target="deletePublicHoliday">
+ <parameter param-name="workEffortId"
from-field="workEffortId"/>
+ </hyperlink>
+ </field>
+ </form>
</forms>
Modified: ofbiz/trunk/specialpurpose/scrum/config/scrumUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/config/scrumUiLabels.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/config/scrumUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/config/scrumUiLabels.xml Tue Sep 13
11:57:22 2011
@@ -29,9 +29,6 @@
<value xml:lang="nl">Alle gerapporteerde/goedgekeurde uren toevoegen
aan nieuwe faktuur</value>
<value
xml:lang="zh">æå
¨é¨å·²æ¥å/å·²æ¹åçä»»å¡æ¶é´æ·»å å°ä¸ä¸ªæ°çå票</value>
</property>
- <property key="PageTitleAddPublicHoliday">
- <value xml:lang="en">Add Public Holiday</value>
- </property>
<property key="PageTitleAddSprint">
<value xml:lang="en">Add Sprint</value>
</property>
@@ -206,12 +203,6 @@
<property key="PageTitleProjectAndSprintList">
<value xml:lang="en">Project and Sprint List</value>
</property>
- <property key="PageTitlePublicHoliday">
- <value xml:lang="en">Public Holiday</value>
- </property>
- <property key="PageTitlePublicHolidayList">
- <value xml:lang="en">Public Holiday List</value>
- </property>
<property key="PageTitleScrumDefaultTasks">
<value xml:lang="en">Scrum Default Tasks</value>
</property>
@@ -612,9 +603,6 @@
<value xml:lang="nl">Vr</value>
<value xml:lang="zh">å¨äº</value>
</property>
- <property key="ScrumHolidayName">
- <value xml:lang="en">Holiday Name</value>
- </property>
<property key="ScrumHowToTest">
<value xml:lang="en">How to test</value>
</property>
Modified: ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml Tue Sep 13 11:57:22
2011
@@ -15,7 +15,7 @@
<WorkEffortType workEffortTypeId="SCRUM_TASK_IMPL"
parentTypeId="SCRUM_TASK" description="Implementation" hasTable="N"/>
<WorkEffortType workEffortTypeId="SCRUM_TASK_INST"
parentTypeId="SCRUM_TASK" description="Installation" hasTable="N"/>
<WorkEffortType workEffortTypeId="SCRUM_TASK_TEST"
parentTypeId="SCRUM_TASK" description="Test" hasTable="N"/>
- <WorkEffortType workEffortTypeId="SCRUM_HOLIDAY" description="Public
Holiday" hasTable="N"/> <!-- Public Holiday -->
+
<WorkEffortPurposeType workEffortPurposeTypeId="SCRUM_DEFAULT_TASK"
description="Default Task"/>
<WorkEffortPurposeType workEffortPurposeTypeId="SYSTEM_DEFAULT_TASK"
description="System Default Task"/>
<CustRequestType custRequestTypeId="RF_PROD_BACKLOG" hasTable="N"
description="Request For Product Backlog Items"/>
Modified:
ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
(original)
+++ ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Tue
Sep 13 11:57:22 2011
@@ -4362,29 +4362,6 @@
<entity-one value-field="productRoleMap" entity-name="ProductRole"/>
<remove-value value-field="productRoleMap"/>
</simple-method>
- <simple-method method-name="createPublicHoliday" short-description="Create
Public Holiday">
- <if-empty field="parameters.estimatedStartDate">
- <add-error>
- <fail-message message="The FromDate is missing"/>
- </add-error>
- <check-errors/>
- </if-empty>
- <entity-and list="workEffortList" entity-name="WorkEffort">
- <field-map field-name="workEffortTypeId" value="SCRUM_HOLIDAY"/>
- <field-map field-name="estimatedStartDate"
from-field="parameters.estimatedStartDate"/>
- </entity-and>
- <if-empty field="workEffortList">
- <call-service service-name="createWorkEffortAndPartyAssign"
in-map-name="parameters">
- <default-message>Successfully created.</default-message>
- </call-service>
- <else>
- <add-error>
- <fail-message message="This FromDate :
${parameters.estimatedStartDate} already exist."/>
- </add-error>
- <check-errors/>
- </else>
- </if-empty>
- </simple-method>
<simple-method method-name="updateNotBilledBacklog"
short-description="Update Not Billed Backlog">
<call-class-method method-name="getParameterMap"
class-name="org.ofbiz.base.util.UtilHttp" ret-field="paramMap">
<field field="request"
type="javax.servlet.http.HttpServletRequest"/>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml Tue
Sep 13 11:57:22 2011
@@ -1233,29 +1233,6 @@
<response name="success" type="request-redirect-noparam"
value="FindResource"/>
<response name="error" type="view" value="FindResource"/>
</request-map>
- <request-map uri="PublicHoliday">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="PublicHoliday"/>
- <response name="error" type="view" value="PublicHoliday"/>
- </request-map>
- <request-map uri="createPublicHoliday">
- <security https="true" auth="true"/>
- <event type="simple" invoke="createPublicHoliday"
path="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
- <response name="success" type="request-redirect-noparam"
value="PublicHoliday"/>
- <response name="error" type="view-last"/>
- </request-map>
- <request-map uri="updatePublicHoliday">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateWorkEffort"/>
- <response name="success" type="request-redirect-noparam"
value="PublicHoliday"/>
- <response name="error" type="view-last"/>
- </request-map>
- <request-map uri="deletePublicHoliday">
- <security https="true" auth="true"/>
- <event type="service" invoke="deleteWorkEffort"/>
- <response name="success" type="view" value="PublicHoliday"/>
- <response name="error" type="view-last"/>
- </request-map>
<!-- View Mappings -->
<view-map name="main" type="screen"
page="component://scrum/widget/scrumScreens.xml#ScrumProduct"/>
@@ -1354,7 +1331,6 @@
<view-map name="quickAddPartyRelationship" type="screen"
page="component://scrum/widget/ResourceScreens.xml#QuickAddPartyRelationship"/>
<view-map name="QuickAddPartyRate" type="screen"
page="component://scrum/widget/ResourceScreens.xml#QuickAddPartyRate"/>
<view-map name="ProductStatistics" type="screen"
page="component://scrum/widget/scrumScreens.xml#ProductStatistics"/>
- <view-map name="PublicHoliday" type="screen"
page="component://scrum/widget/scrumScreens.xml#PublicHoliday"/>
<!-- Unplan Backlog -->
<view-map name="unplanBacklog" type="screen"
page="component://scrum/widget/scrumScreens.xml#unplanBacklog"/>
Modified:
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
(original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
Tue Sep 13 11:57:22 2011
@@ -28,7 +28,7 @@ while (countHoliday < dayNumber) {
var conditionTimestampFrom = new Timestamp(actualStartDate.getTime() +
(countHoliday*1000*60*60*24));
// get public holiday
var holidayConds = FastList.newInstance();
-
holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS,
"SCRUM_HOLIDAY"));
+
holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS,
"PUBLIC_HOLIDAY"));
holidayConds.add(EntityCondition.makeCondition("estimatedStartDate",
EntityOperator.EQUALS, conditionTimestampFrom));
var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate");
var holidayList = delegator.findList("WorkEffort",
EntityCondition.makeCondition(holidayConds), fieldsToSelect, null, null, false);
@@ -234,7 +234,7 @@ if (nowTimestamp.getTime() >= conditionT
// get public holiday
var holidayConds = FastList.newInstance();
-holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS,
"SCRUM_HOLIDAY"));
+holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS,
"PUBLIC_HOLIDAY"));
holidayConds.add(EntityCondition.makeCondition("estimatedStartDate",
EntityOperator.EQUALS, conditionTimestampFrom));
var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate");
var holidayList = delegator.findList("WorkEffort",
EntityCondition.makeCondition(holidayConds), fieldsToSelect, null, null, false);
Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Tue Sep 13 11:57:22
2011
@@ -3208,49 +3208,4 @@
</field>
<field name="submitButton"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="AddPublicHoliday" type="single" target="createPublicHoliday"
default-map-name="workEffort">
- <alt-target use-when="workEffort!=null" target="updatePublicHoliday"/>
- <field name="workEffortId"
use-when="workEffort!=null"><hidden/></field>
- <field name="partyId"><hidden
value="${parameters.userLogin.partyId}"/></field>
- <field name="roleTypeId" use-when="workEffort==null"><hidden
value="CAL_OWNER"/></field>
- <field name="statusId" use-when="workEffort==null"><hidden
value="PRTYASGN_ASSIGNED"/></field>
- <field name="workEffortTypeId"><hidden value="SCRUM_HOLIDAY"/></field>
- <field name="currentStatusId" use-when="workEffort==null"><hidden
value="CAL_TENTATIVE"/></field>
- <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field>
- <field name="workEffortName" title="${uiLabelMap.ScrumHolidayName}"
tooltip="${uiLabelMap.CommonRequired}"><text size="50"/></field>
- <field name="description"
title="${uiLabelMap.CommonDescription}"><textarea/></field>
- <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}"
tooltip="${uiLabelMap.CommonRequired}"><date-time type="date"/></field>
- <field name="addButton" use-when="workEffort==null"><submit/></field>
- <field name="updateButton"
use-when="workEffort!=null"><submit/></field>
- </form>
- <form name="ListPublicHoliday" type="list" target="PublicHoliday"
list-name="listIt" separate-columns="true"
- odd-row-style="alternate-row" default-table-style="hover-bar
basic-table">
- <actions>
- <entity-and entity-name="WorkEffort" list="listIt">
- <field-map field-name="workEffortTypeId"
value="SCRUM_HOLIDAY"/>
- <order-by field-name="-estimatedStartDate"/>
- </entity-and>
- </actions>
- <row-actions>
- <entity-and entity-name="WorkEffortPartyAssignment"
list="assignmentList">
- <field-map field-name="workEffortId"
from-field="workEffortId"/>
- </entity-and>
- <set field="partyId" from-field="assignmentList[0].partyId"/>
- </row-actions>
- <field name="workEffortId"><hidden/></field>
- <field name="workEffortTypeId"><hidden value="SCRUM_HOLIDAY"/></field>
- <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field>
- <field name="workEffortName"
title="${uiLabelMap.ScrumHolidayName}"><display/></field>
- <field name="description"
title="${uiLabelMap.CommonDescription}"><display/></field>
- <field name="estimatedStartDate"
title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
- <field name="partyId" title="${uiLabelMap.CommonBy}">
- <display-entity entity-name="PartyNameView"
description="${lastName}, ${firstName} ${middleName}" key-field-name="partyId"/>
- </field>
- <field name="updateButton"
title="${uiLabelMap.CommonUpdate}"><submit/></field>
- <field name="removeHoliday" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
- <hyperlink description="${uiLabelMap.CommonDelete}"
target="deletePublicHoliday">
- <parameter param-name="workEffortId"
from-field="workEffortId"/>
- </hyperlink>
- </field>
- </form>
</forms>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Tue Sep 13 11:57:22
2011
@@ -109,12 +109,6 @@
</condition>
<link target="ProductStatistics"/>
</menu-item>
- <menu-item name="publicHoliday"
title="${uiLabelMap.PageTitlePublicHoliday}">
- <condition>
- <if-has-permission permission="SCRUM" action="_ADMIN"/>
- </condition>
- <link target="PublicHoliday"/>
- </menu-item>
</menu>
<menu name="SprintMenu" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml?rev=1170129&r1=1170128&r2=1170129&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml Tue Sep 13
11:57:22 2011
@@ -2753,35 +2753,6 @@
</widgets>
</section>
</screen>
- <screen name="PublicHoliday">
- <section>
- <condition>
- <if-has-permission permission="SCRUM" action="_ADMIN"/>
- </condition>
- <actions>
- <set field="titleProperty" value="PageTitlePublicHoliday"/>
- <set field="headerItem" value="admin"/>
- <set field="tabButtonItem" value="publicHoliday"/>
- <entity-one entity-name="WorkEffort" value-field="workEffort"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonAdminDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <screenlet id="addPublicHoliday"
title="${uiLabelMap.PageTitleAddPublicHoliday}" collapsible="true">
- <include-form name="AddPublicHoliday"
location="component://scrum/widget/scrumForms.xml"/>
- </screenlet>
- <screenlet id="listPublicHoliday"
title="${uiLabelMap.PageTitlePublicHolidayList}" collapsible="true">
- <include-form name="ListPublicHoliday"
location="component://scrum/widget/scrumForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="QuickAddBacklog">
<section>
<condition>
