You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/01/20 15:20:01 UTC
svn commit: r613562 - in /ofbiz/trunk/specialpurpose/projectmgr:
script/org/ofbiz/project/ servicedef/ webapp/projectmgr/WEB-INF/ widget/
widget/forms/
Author: hansbak
Date: Sun Jan 20 06:19:58 2008
New Revision: 613562
URL: http://svn.apache.org/viewvc?rev=613562&view=rev
Log:
add the possbility of an estimated hour quantity at task creation, commented out some log messages
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=613562&r1=613561&r2=613562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Sun Jan 20 06:19:58 2008
@@ -54,7 +54,7 @@
<!-- PROJECT -->
<if-compare field-name="sec_object" value="PROJECT" operator="equals">
- <log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/>
+ <!--log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/-->
<set field="projectId" from-field="parameters.projectId"/>
<set field="partyId" from-field="parameters.partyId"/>
<call-simple-method method-name="checkProjectMembership"/>
@@ -101,7 +101,7 @@
<!-- PHASE -->
<if-compare field-name="sec_object" value="PHASE" operator="equals">
- <log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/>
+ <!--log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/-->
<set field="projectId" from-field="parameters.projectId"/>
<call-simple-method method-name="checkProjectMembership"/>
<if>
@@ -147,7 +147,7 @@
<set field="phaseId" from-field="parameters.workEffortParentId"/>
</if-empty>
<set field="partyId" from-field="parameters.userLogin.partyId"/>
- <log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId: ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription}"/>
+ <!--log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId: ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription}"/-->
<call-simple-method method-name="checkProjectMembership"/>
<if>
<condition>
@@ -203,7 +203,7 @@
<!-- TIMESHEET -->
<if-compare field-name="sec_object" value="TIMESHEET" operator="equals">
- <log level="info" message="======ProjectMGR Security===== action: ${mainAction} object: ${sec_object} Id: ${parameters.timesheetId} partyId: ${parameters.partyId} resourceDescription: ${parameters.resourceDescription}"/>
+ <!--log level="info" message="======ProjectMGR Security===== action: ${mainAction} object: ${sec_object} Id: ${parameters.timesheetId} partyId: ${parameters.partyId} resourceDescription: ${parameters.resourceDescription}"/-->
<if>
<condition>
<or>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=613562&r1=613561&r2=613562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Sun Jan 20 06:19:58 2008
@@ -32,10 +32,20 @@
</simple-method>
<simple-method method-name="createProjectTask" short-description="Create a project task and optionally assign">
+ <!-- create task -->
<call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+ <!-- optionally assign to party -->
<if-not-empty field-name="parameters.partyId">
<set field="parameters.workEffortId" from-field="newEntity.workEffortId"/>
<call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
+ </if-not-empty>
+ <!-- optionally enter estimated time and required skill -->
+ <if-not-empty field-name="parameters.estimatedHours">
+ <set field="parameters.estimatedDuration" from-field="parameters.estimatedHours"/>
+ <if-empty field-name="parameters.skillTypeId">
+ <set field="parameters.skillTypeId" value="_NA_"/>
+ </if-empty>
+ <call-simple-method method-name="createWorkEffortSkillStandard" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
</if-not-empty>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=613562&r1=613561&r2=613562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Sun Jan 20 06:19:58 2008
@@ -110,6 +110,8 @@
<attribute name="quickAssignPartyId" type="String" mode="IN" optional="true"/>
<attribute name="requirementId" type="String" mode="IN" optional="true"/>
<attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
+ <attribute name="skillTypeId" type="String" mode="IN" optional="true"/>
+ <attribute name="estimatedHours" type="String" mode="IN"/>
<override name="workEffortTypeId" optional="false"/>
<override name="workEffortName" optional="false"/>
<override name="currentStatusId" optional="false"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=613562&r1=613561&r2=613562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sun Jan 20 06:19:58 2008
@@ -184,7 +184,7 @@
</request-map>
<request-map uri="createProjectTaskOrPhase">
<security https="true" auth="true"/>
- <event type="service" invoke="createWorkEffort"/>
+ <event type="service" invoke="createProjectTask"/>
<response name="success" type="view" value="EditProjectTasks"/>
<response name="error" type="view" value="EditProjectTasks"/>
</request-map>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=613562&r1=613561&r2=613562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Jan 20 06:19:58 2008
@@ -334,7 +334,7 @@
<actions>
<set field="text1" value="The projectmanager supports the administration/sheduling of projects, task assignment/re-assignment with time registration and invoicing.
For comments and requirements please add this to the documents below or open an issue in Jira.<br/><br/>
- The current status of the component is documented in the development document below." />
+ This component is now fairly complete, the current status of the component is documented in the development document below." />
<set field="text2" value="The following documents/systems are available:"/>
<set field="link1Text" value="A development document."/>
<set field="link1" value="http://docs.ofbiz.org/display/OFBIZ/Complete+the+implementation+of+the+ProjectMgr+component."/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=613562&r1=613561&r2=613562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Jan 20 06:19:58 2008
@@ -68,23 +68,29 @@
<entity-order-by field-name="phaseName"/>
</entity-options>
</drop-down>
+ </field>
+ <field name="estimatedHours"><text size="5"/></field>
+ <field name="skillTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="SkillType" description="${description}"/>
+ </drop-down>
</field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field use-when="myTask!=null||task==null" name="currentStatusId"><hidden value="PTS_CREATED"/></field>
<field use-when="task!=null" name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="priority" title="${uiLabelMap.CommonPriority}">
- <drop-down allow-empty="true" current="selected">
- <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
- <option key="2" description="2"/>
- <option key="3" description="3"/>
- <option key="4" description="4"/>
- <option key="5" description="5"/>
- <option key="6" description="6"/>
- <option key="7" description="7"/>
- <option key="8" description="8"/>
- <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
- </drop-down>
- </field>
+ <field name="priority" title="${uiLabelMap.CommonPriority}">
+ <drop-down allow-empty="true" current="selected">
+ <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
+ <option key="2" description="2"/>
+ <option key="3" description="3"/>
+ <option key="4" description="4"/>
+ <option key="5" description="5"/>
+ <option key="6" description="6"/>
+ <option key="7" description="7"/>
+ <option key="8" description="8"/>
+ <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
+ </drop-down>
+ </field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
<field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
<drop-down allow-empty="false">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
@@ -92,8 +98,8 @@
</entity-options>
</drop-down>
</field>
- <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time/></field>
- <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time/></field>
+ <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}" position="1"><date-time type="date"/></field>
+ <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}" position="2"><date-time type="date"/></field>
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
<form name="AddProjectTask" type="single" target="createProjectTaskOrPhase">
@@ -111,6 +117,12 @@
</entity-options>
</drop-down>
</field>
+ <field name="estimatedHours"><text size="5"/></field>
+ <field name="skillTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="SkillType" description="${description}"/>
+ </drop-down>
+ </field>
<field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}">
<drop-down allow-empty="true" current="selected">
<option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>