svn commit: r687270 - in /ofbiz/trunk: applications/party/webapp/partymgr/communication/ specialpurpose/projectmgr/config/ specialpurpose/projectmgr/widget/ specialpurpose/projectmgr/widget/forms/

[ha...@apache.org]

Author: hansbak
Date: Wed Aug 20 00:20:38 2008
New Revision: 687270

URL: http://svn.apache.org/viewvc?rev=687270&view=rev
Log:
small adjustment in titles, screenlet conversion, sendemail using primary email address

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=687270&r1=687269&r2=687270&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Wed Aug 20 00:20:38 2008
@@ -125,9 +125,11 @@
         <field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
         <field name="emailAddress" parameter-name="contactMechIdFrom">
             <drop-down>
-                <entity-options entity-name="PartyAndContactMech" description="${infoString}" key-field-name="contactMechId">
+                <entity-options entity-name="PartyContactWithPurpose" description="${infoString}" key-field-name="contactMechId">
                     <entity-constraint name="partyId" value="${userLogin.partyId}"/>
                     <entity-constraint name="contactMechTypeId" value="EMAIL_ADDRESS"/>
+                    <entity-constraint name="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+                    <entity-order-by field-name="infoString"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=687270&r1=687269&r2=687270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Aug 20 00:20:38 2008
@@ -18,6 +18,9 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="AcceptedCustomerRequestList">
+        <value xml:lang="en">Accepted Customer Request list'</value>
+    </property>
     <property key="CommonStatustoComplete">
         <value xml:lang="en">Status to 'complete'</value>
         <value xml:lang="fr">Status à 'complet'</value>
@@ -1009,6 +1012,9 @@
         <value xml:lang="en">Check Complete</value>
         <value xml:lang="zh">是否完成</value>
     </property>    
+    <property key="ReviewedCustomerRequestTaskList">
+        <value xml:lang="en">Reviewed but not completed Customer Request list with task assigned'</value>
+    </property>
     <property key="FormFieldTitle_newTimesheetId">
         <value xml:lang="en">New Timesheet Id</value>
         <value xml:lang="zh">新的时间表Id</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=687270&r1=687269&r2=687270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Wed Aug 20 00:20:38 2008
@@ -34,11 +34,11 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequests">
+                        <screenlet title="${uiLabelMap.AcceptedCustomerRequestList}" navigation-form-name="ListRequests">
                             <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
                             <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.ProjectMgrRequestWorkEffortList}" navigation-form-name="ListRequestsWorkEffortForm">
+                        <screenlet title="${uiLabelMap.ReviewedCustomerRequestTaskList}" navigation-form-name="ListRequestsWorkEffortForm">
                             <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=687270&r1=687269&r2=687270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Aug 20 00:20:38 2008
@@ -554,20 +554,9 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
             </actions>
             <widgets>
-                <container style="screenlet">
-                     <container style="screenlet-title-bar">
-                         <container style="h3">
-                             <label text="${uiLabelMap.PageTitleRequestList}"/>
-                         </container>
-                     </container>
-                     <container style="screenlet-body">
-                         <section>
-                             <widgets>    
-                                 <include-form name="ListWorkEffortRequests" location="component://projectmgr/widget/forms/TaskForms.xml"/>
-                             </widgets>
-                         </section>
-                     </container>
-                 </container>
+                <screenlet title="${uiLabelMap.PageTitleRequestList}">
+                    <include-form name="ListWorkEffortRequests" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                </screenlet>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=687270&r1=687269&r2=687270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Aug 20 00:20:38 2008
@@ -568,7 +568,7 @@
             </entity-and>
         </actions>
         <field name="workEffortId"><hidden/></field>
-        <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestId}" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field>
+        <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestName} [${custRequestId}]" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field>
         <field name="description"><display/></field>
         <field name="custRequestTypeDescription"><display/></field>
         <field name="statusItemDescription"><display/></field>