svn commit: r599280 - in /ofbiz/trunk/specialpurpose/projectmgr: script/org/ofbiz/project/ProjectServices.xml webapp/projectmgr/project/summary/projectinfo.ftl widget/ProjectScreens.xml widget/TaskScreens.xml widget/forms/ProjectForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Nov 28 21:32:48 2007
New Revision: 599280

URL: http://svn.apache.org/viewvc?rev=599280&view=rev
Log:
replaced the project general info screens and get info from service getProject

Removed:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl
Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

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=599280&r1=599279&r2=599280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Nov 28 21:32:48 2007
@@ -188,6 +188,29 @@
                 </if-compare-field>
             </else>
         </if-empty>
+        
+        <!-- add the extimated hours together -->
+        <get-related value-name="lowInfo" relation-name="WorkEffortSkillStandard" list-name="estimates"/>
+        <iterate entry-name="estimate" list-name="estimates">
+            <if-not-empty field-name="estimate.estimatedDuration">
+                <calculate field-name="highInfo.plannedHours">
+                    <calcop operator="get" field-name="highInfo.hours"></calcop>
+                    <calcop operator="add" field-name="estimate.estimatedDuration"/>
+                </calculate>
+            </if-not-empty>
+        </iterate>
+        
+        <!-- get the actual hours -->
+        <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="actuals"/>
+        <iterate entry-name="actual" list-name="actuals">
+            <if-not-empty field-name="actual.hours">
+                <calculate field-name="highInfo.actualHours">
+                    <calcop operator="get" field-name="highInfo.actualHours"/>
+                    <calcop operator="add" field-name="actual.hours"></calcop>
+                </calculate>
+            </if-not-empty>
+        </iterate>
+        
     </simple-method>
     
                 

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=599280&r1=599279&r2=599280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Nov 28 21:32:48 2007
@@ -492,7 +492,12 @@
                             </condition>
                             <widgets>                                                  
                                 <container style="lefthalf">
-                                    <include-screen name="ProjectInfo"/>
+                                    <container style="screenlet">
+                                        <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditSubProject}</label></container>
+                                        <container style="screenlet-body">
+                                            <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+                                        </container>
+                                    </container>
                                     <include-screen name="PhasesTasksInfo"/>
                                 </container>
                                 <container style="righthalf">
@@ -513,15 +518,6 @@
             <widgets>
                 <platform-specific>
                     <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html>
-                </platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="ProjectInfo">
-        <section>
-            <widgets>
-                <platform-specific>
-                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html>
                 </platform-specific>
             </widgets>
         </section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=599280&r1=599279&r2=599280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Nov 28 21:32:48 2007
@@ -292,7 +292,6 @@
                             <widgets>                                                  
                                 <container style="lefthalf">
                                     <include-screen name="TaskInfo"/>
-                                    <include-screen name="SubTasksInfo"/>
                                 </container>
                                 <container style="righthalf">
                                     <include-screen name="NoteInfo"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=599280&r1=599279&r2=599280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Nov 28 21:32:48 2007
@@ -81,8 +81,28 @@
         <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="createdDate"><display type="date"/></field>
     </form>                                        
+    <form name="ProjectInfo" type="single" default-map-name="project" paginate-target="FindProject">
+        <actions>
+            <service service-name="getProject" result-map-name="result">
+                <field-map field-name="projectId" env-name="parameters.projectId"/>
+            </service>
+            <set field="project" from-field="result.projectInfo"/>
+        </actions>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><display/></field>
+        <field name="statusDescription" title="${uiLabelMap.CommonStatus}"><display/></field>
+        <field name="priority" title="${uiLabelMap.CommonPriority}"><display type="date"/></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="createdDate"><display type="date"/></field>
+    </form>                                        
     <form name="ListChildEfforts"  target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject">
         <row-actions>
             <entity-one entity-name="StatusItem" value-name="currentStatus">