svn commit: r597347 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ProjectMgrUiLabels.properties widget/ProjectScreens.xml widget/forms/ProjectForms.xml

[hansbak-2]

Author: hansbak
Date: Thu Nov 22 01:20:11 2007
New Revision: 597347

URL: http://svn.apache.org/viewvc?rev=597347&view=rev
Log:
update project summary with a combined list of phases and tasks

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=597347&r1=597346&r2=597347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Thu Nov 22 01:20:11 2007
@@ -70,7 +70,7 @@
 ProjectMgrProjectTeam=Project Team
 ProjectMgrPhaseDetails=Enter the Phase Details below
 ProjectMgrPhases=Phases
-ProjectMgrPhaseList=List of Phase
+ProjectMgrPhaseTaskList=List of Phases and Tasks
 ProjectMgrPartySkills=Party Skills
 ProjectMgrSkillStandards=Skill Standards
 ProjectMgrSkillType=Skill Type

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=597347&r1=597346&r2=597347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Nov 22 01:20:11 2007
@@ -529,12 +529,11 @@
                             <widgets>                                                  
                                 <container style="lefthalf">
                                     <include-screen name="ProjectInfo"/>
-                                    <include-screen name="PhasesInfo"/>
-                                    <include-screen name="PartiesInfo"/>
+                                    <include-screen name="PhasesTasksInfo"/>
                                 </container>
                                 <container style="righthalf">
-                                    <include-screen name="SubProjectsInfo"/>
-                                    <include-screen name="TasksInfo"/>                                    
+                                    <include-screen name="SubProjectsInfo"/>
+                                    <include-screen name="PartiesInfo"/>
                                     <include-screen name="NoteInfo"/>
                                 </container>
                             </widgets>
@@ -572,39 +571,22 @@
             </widgets>
         </section>
     </screen>
-    <screen name="TasksInfo">
-        <section>
-            <actions>
-                <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
-                <set field="parameters.workEffortTypeId" value="TASK"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
-            </actions>
-            <widgets>                
-                <container style="screenlet">
-                    <container style="screenlet-title-bar">
-                        <label style="boxhead" text="">${uiLabelMap.ProjectMgrTaskList}</label>
-                    </container>
-                    <container style="screenlet-body">
-                        <include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/>
-                    </container>
-                </container>                
-            </widgets>
-        </section>
-    </screen>
-    <screen name="PhasesInfo">
+    <screen name="PhasesTasksInfo">
         <section>
             <actions>
                 <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
                 <set field="parameters.workEffortTypeId" value="PHASE"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
+                <entity-and entity-name="ProjectAndPhaseAndTask" list-name="phases">
+                    <field-map field-name="projectId" env-name="parameters.workEffortId"/>
+                </entity-and>
             </actions>
             <widgets>                
                 <container style="screenlet">
                     <container style="screenlet-title-bar">
-                        <label style="boxhead" text="">${uiLabelMap.ProjectMgrPhaseList}</label>
+                        <label style="boxhead" text="">${uiLabelMap.ProjectMgrPhaseTaskList}</label>
                     </container>
                     <container style="screenlet-body">
-                        <include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+                        <include-form name="ListPhaseTaskInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                     </container>
                 </container>                
             </widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=597347&r1=597346&r2=597347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Nov 22 01:20:11 2007
@@ -162,19 +162,15 @@
         <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
-    <form name="ListPhaseInfo" type="list" list-name="phases">
-        <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortId}" target="EditPhase?workEffortId=${workEffortId}"/>
-        </field>
-        <field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.ProjectMgrWorkEffortTypeId}"><display-entity entity-name="WorkEffortType"/></field>
-        <field name="workEffortPurposeTypeId" title="${uiLabelMap.ProjectMgrWorkEffortPurposeTypeId}"><display-entity entity-name="WorkEffortPurposeType"/></field>
-        <!--field name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrProjectSummary}" target="projectView?workEffortId=${workEffortId}"/>
-        </field-->
-        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProject?workEffortId=${workEffortId}"/>
-        </field>
+    <form name="ListPhaseTaskInfo" type="list" list-name="phases">
+        <field name="workEffortIdFrom"><hidden value="parameters.worEffortIdFrom"/></field>
+        <field name="Phase"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}[${phaseId}"/></field>
+        <field name="Task"><hyperlink target="EditTask?workEffortId=${taskId}" description="${taskName}[${taskId}]"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate"><display/></field>
+        <field name="estimatedEndDate"><display/></field>
+        <field name="actualStartDate"><display/></field>
+        <field name="actualEndDate"><display/></field>
     </form>
     <form name="ListAssociatedParties" type="list" list-name="associatedParties">
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">