svn commit: r686173 - in /ofbiz/trunk/specialpurpose: mypage/config/MyPageUiLabels.xml mypage/webapp/mypage/WEB-INF/controller.xml mypage/widget/MyPageForms.xml projectmgr/widget/RequestScreens.xml projectmgr/widget/forms/RequestForms.xml

[hansbak-2]

Author: hansbak
Date: Fri Aug 15 01:30:41 2008
New Revision: 686173

URL: http://svn.apache.org/viewvc?rev=686173&view=rev
Log:
some more corrections and adjustments for the display of customer requests

Modified:
    ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=686173&r1=686172&r2=686173&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Fri Aug 15 01:30:41 2008
@@ -94,4 +94,19 @@
         <value xml:lang="en">Communications of party</value>
         <value xml:lang="fr">Communications de l'acteur</value>
     </property>
+    <property key="TaskStatus">
+        <value xml:lang="en">Task Status</value>
+    </property>
+    <property key="TaskPlanStartDate">
+        <value xml:lang="en">Task Pln Start</value>
+    </property>
+    <property key="TaskPlanEndDate">
+        <value xml:lang="en">Task Pln End</value>
+    </property>
+    <property key="TaskActStartDate">
+        <value xml:lang="en">Task Act Start</value>
+    </property>
+    <property key="TaskActEndDate">
+        <value xml:lang="en">Task Act End</value>
+    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml?rev=686173&r1=686172&r2=686173&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Fri Aug 15 01:30:41 2008
@@ -193,5 +193,5 @@
     <view-map name="myTimesheet" type="screen" page="component://mypage/widget/CommonScreens.xml#MyTimesheet"/>
     <view-map name="newEvent" type="screen" page="component://mypage/widget/MyPageScreens.xml#newEvent"/>
     <view-map name="ViewCommunicationEvent" type="screen" page="component://mypage/widget/MyPageScreens.xml#ViewCommunicationEvent"/>
-    <view-map name="ViewRequest" type="screen" page="component://mypage/widget/MyPageScreens.xml#ViewRequest"/>
+    <view-map name="ViewRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#ViewRequest"/>
 </site-conf>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=686173&r1=686172&r2=686173&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Fri Aug 15 01:30:41 2008
@@ -136,11 +136,11 @@
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="createdDate" title="Date"><display type="date"/></field>
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
-        <field name="currentStatusId" map-name="taskResult.taskInfo"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="estimatedStartDate" map-name="taskResult.taskInfo"><display type="date"/></field>
-        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo"><display type="date"/></field>
-        <field name="actualStartDate" map-name="taskResult.taskInfo"><display type="date"/></field>
-        <field name="actualCompletionDate" map-name="taskResult.taskInfo"><display type="date"/></field>
+        <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanEndDate}"><display type="date"/></field>
+        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActEndDate}"><display type="date"/></field>
         <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
         <field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
     </form>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=686173&r1=686172&r2=686173&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Fri Aug 15 01:30:41 2008
@@ -115,7 +115,7 @@
                                 <html><html-template location="component://order/webapp/ordermgr/request/requestInfo.ftl"/></html>
                             </platform-specific>
                             <screenlet title="${uiLabelMap.PageTitleRequestItems}">
-                                <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+                                <include-form name="OverviewRequestItems" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                             </screenlet>
                         </container>
                         <container style="righthalf">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=686173&r1=686172&r2=686173&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Fri Aug 15 01:30:41 2008
@@ -119,7 +119,7 @@
             </service>
         </row-actions>
         <field name="custRequestId">
-            <hyperlink target="/ordermgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app" description="${custRequestName} [${custRequestId}]"/>
+            <hyperlink target="ViewRequest?custRequestId=${custRequestId}" description="${custRequestName} [${custRequestId}]"/>
          </field>
         <field name="projectId" map-name="sResult">
             <hyperlink target="projectView?projectId=${sResult.projectId}" description="${sResult.projectName} [${sResult.projectId}]"/>
@@ -147,4 +147,12 @@
             <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName} [${workEffortId}]"/>
         </field>
     </form>
+    <form name="OverviewRequestItems" extends="OverviewRequestItems" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+        <field name="story" title="${uiLabelMap.CommonText}"><display/></field>
+        <field name="productId"><ignored/></field>
+        <field name="statusId"><ignored/></field>
+        <field name="quantity"><ignored/></field>
+        <field name="description"><ignored/></field>
+        <field name="custRequestItemSeqId"><ignored/></field>
+    </form>
 </forms>
\ No newline at end of file