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/09 01:44:04 UTC
svn commit: r610246 - in /ofbiz/trunk/specialpurpose/projectmgr: config/
script/org/ofbiz/project/ webapp/projectmgr/WEB-INF/ widget/ widget/forms/
Author: hansbak
Date: Tue Jan 8 16:44:01 2008
New Revision: 610246
URL: http://svn.apache.org/viewvc?rev=610246&view=rev
Log:
fixed several faults, made consistend listing of project/task/phase names
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Tue Jan 8 16:44:01 2008
@@ -56,6 +56,7 @@
PageTitleListPartyAssigns=Current Resource Assignments
PageTitleListProjectNotes=List Project Notes
PageTitleListResources=Resources
+PageTitleListSubProjects=List of Subprojects
PageTitleListTaskNotes=List Task Notes
PageTitleTimesheets=Timesheet list
PageTitleProjectBilling=Project Billing
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=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Jan 8 16:44:01 2008
@@ -495,6 +495,7 @@
</if-compare>
</if-compare>
<call-simple-method method-name="combineInfo"/>
+ <call-simple-method method-name="getHours"/>
</iterate>
</if-not-empty>
@@ -546,16 +547,7 @@
</entity-and>
<if-not-empty field-name="tasks">
<iterate entry-name="lowInfo" list-name="tasks">
- <if-empty field-name="savePhaseName">
- <set field="savePhaseName" from-field="lowInfo.phaseName"/>
- <set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
- <else>
- <if-compare-field field-name="lowInfo.phaseName" operator="not-equals" to-field-name="savePhaseName">
- <set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
- <set field="savePhaseName" from-field="lowInfo.phaseName"/>
- </if-compare-field>
- </else>
- </if-empty>
+ <set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
<call-simple-method method-name="combineInfo"/>
<clear-field field-name="highInfo.sequenceId"/>
<set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/>
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=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Tue Jan 8 16:44:01 2008
@@ -41,12 +41,18 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ListSubProjects"/>
</request-map>
- <request-map uri="AddSubProject">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateWorkEffort"/>
- <response name="error" type="view" value="ListSubProjects"/>
- <response name="success" type="view" value="ListSubProjects"/>
- </request-map>
+ <request-map uri="AddSubProject">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffort"/>
+ <response name="error" type="view" value="ListSubProjects"/>
+ <response name="success" type="view" value="ListSubProjects"/>
+ </request-map>
+ <request-map uri="RemoveSubProject">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffort"/>
+ <response name="error" type="view" value="ListSubProjects"/>
+ <response name="success" type="view" value="ListSubProjects"/>
+ </request-map>
<request-map uri="FindProject">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindProject"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Tue Jan 8 16:44:01 2008
@@ -35,7 +35,7 @@
<container style="screenlet">
<container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleListSubProjects}</label></container>
<container style="screenlet-body">
- <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ <include-form name="EditSubProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
</container>
</container>
<container style="screenlet">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Jan 8 16:44:01 2008
@@ -80,7 +80,7 @@
<service service-name="getPartyTelephone" result-map-name="telResult"/>
</row-actions>
<field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${personalTitle} ${lastName},${firstName} ${middleName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
+ <hyperlink also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
</field>
<field name="roleTypeId"><hidden/></field>
<field name="emailAddess"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMechId}&contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field>
@@ -111,9 +111,6 @@
<field name="fromDate"><display type="date"/></field>
</form>
<form name="ListProjects" type="list" list-name="projects" paginate-target="FindProject">
- <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${projectId}" target="projectView?projectId=${projectId}"/>
- </field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
</field>
@@ -127,6 +124,24 @@
<field name="actualHours"><display/></field>
<field name="createdStamp"><display type="date"/></field>
</form>
+ <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject">
+ <field name="projectId"><hidden/></field>
+ <field name="workEffortParentId"><hidden value=""/></field>
+ <field name="workEffortId"><hidden value="${projectId}"/></field>
+ <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
+ </field>
+ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
+ <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+ <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+ <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+ <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+ <field name="plannedHours"><display/></field>
+ <field name="actualHours"><display/></field>
+ <field name="createdStamp"><display type="date"/></field>
+ <!--field name="removeButton"><submit/></field--><!-- TODO: difficult to clear the workEffortParentId field in the record have to find solution-->
+ </form>
<form name="ProjectInfo" type="single" default-map-name="project" paginate-target="FindProject">
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><display/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
@@ -264,8 +279,8 @@
</form>
<form name="ListTaskInfo" type="list" list-name="tasks">
<field name="projectId"><hidden value="parameters.projectId"/></field>
- <field name="phase"><hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/></field>
<field name="task"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}"/></field>
+ <field name="phaseName"><display/></field>
<field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
<field name="priority"><display/></field>
<field name="startDate"><display/></field>
@@ -276,7 +291,7 @@
<form name="ListProjectParties" type="list" list-name="parties">
<field name="projectId"><hidden/></field>
<field name="partyName" title="${uiLabelMap.CommonName}">
- <hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyName}"/>
+ <hyperlink target="viewprofile?partyId=${partyId}" description="${partyName}"/>
</field>
<field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
@@ -300,18 +315,14 @@
</form>
<form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns">
<actions>
- <entity-condition entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignView">
<condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
</actions>
<field name="workEffortId"><hidden/></field>
<field name="projectId"><hidden/></field>
- <field name="partyId" widget-style="buttontext">
- <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
- <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
- </display-entity>
- </field>
+ <field name="partyId" widget-style="buttontext"><hyperlink target="viewprofile?partyId=${partyId}" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<display-entity entity-name="RoleType"/>
</field>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Jan 8 16:44:01 2008
@@ -112,8 +112,6 @@
</service>
<set field="projectId" from-field="result.projectId"/>
<set field="projectName" from-field="result.projectName"/>
- <set field="phaseId" from-field="result.phaseId"/>
- <set field="phaseName" from-field="result.phaseName"/>
</actions>
<field name="custRequestTypeId"><display-entity entity-name="CustRequestType" description="${description}"/></field>
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=610246&r1=610245&r2=610246&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Jan 8 16:44:01 2008
@@ -199,11 +199,9 @@
<set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
</row-actions>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/>
+ <hyperlink also-hidden="false" description="${workEffortName}" target="taskView?workEffortId=${workEffortId}"/>
</field>
- <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}">
- <hyperlink also-hidden="false" description="${phaseName}" target="FindPhase?projectId=${projectId}"/>
- </field>
+ <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
</field>