svn commit: r678343 - in /ofbiz/trunk/specialpurpose: mypage/webapp/mypage/WEB-INF/controller.xml mypage/widget/CommonScreens.xml mypage/widget/MyPageForms.xml mypage/widget/MyPageScreens.xml projectmgr/widget/RequestScreens.xml

[hansbak-2]

Author: hansbak
Date: Sun Jul 20 21:25:11 2008
New Revision: 678343

URL: http://svn.apache.org/viewvc?rev=678343&view=rev
Log:
show customer requests when the logged on user is reponsible for them, several fault fixes

Modified:
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml

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=678343&r1=678342&r2=678343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Sun Jul 20 21:25:11 2008
@@ -174,6 +174,22 @@
         <response name="error" type="view"
             value="main"/>
     </request-map>
+    <request-map uri="deleteMyCommunicationEvents">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/>
+        <response name="success" type="view"
+            value="myCommunications"/>
+        <response name="error" type="view"
+            value="myCommunications"/>
+    </request-map>
+    <request-map uri="deleteOtherCommunicationEvents">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/>
+        <response name="success" type="view"
+            value="otherCommunications"/>
+        <response name="error" type="view"
+            value="otherCommunications"/>
+    </request-map>
     
     <!-- PREFERENCES -->
     <request-map uri="preferences">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=678343&r1=678342&r2=678343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Jul 20 21:25:11 2008
@@ -143,6 +143,17 @@
                     result-map-name="preferences">
                     <field-map field-name="userPrefGroupId" value="MyPage" />
                 </service>
+                <!--  check if there are any customer requests for this user -->
+                <entity-condition list-name="custRequests" entity-name="CustReqAndTypeAndPartyRel">
+                    <condition-list combine="and">
+                        <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="partyIdFrom" operator="equals" env-name="userLogin.partyId"/>
+                            <condition-expr field-name="partyIdTo" operator="equals" env-name="userLogin.partyId"/>
+                        </condition-list>
+                    </condition-list>
+                    <order-by field-name="-custRequestDate"/>
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator"
@@ -150,6 +161,16 @@
                     <decorator-section name="body">
                         <section>
                             <condition>
+                                <not><if-empty field-name="custRequests"/></not>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequestList" >
+                                    <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                        <section>
+                            <condition>
                                 <if-compare field-name="preferences.userPrefMap.myCommunications"
                                     operator="equals" value="Y" />
                             </condition>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=678343&r1=678342&r2=678343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sun Jul 20 21:25:11 2008
@@ -27,6 +27,7 @@
             <hyperlink also-hidden="false" description="${workEffortName}" target="/projectmgr/control/taskView?workEffortId=${workEffortId}" target-type="inter-app" target-window="_BLANK"/>
         </field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="/projectmgr/control/projectView?projectId=${resultProject.projectId}"  target-type="inter-app" target-window="_BLANK" description="${resultProject.projectName}"/></field>
+        <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId"/></field>
         <field use-when="!headerItem.equals(&quot;main&quot;)" name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigmentKey?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
         <field use-when="headerItem.equals(&quot;main&quot;)" name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
         <field use-when="!headerItem.equals(&quot;main&quot;)" name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigmentKey?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field>
@@ -90,9 +91,8 @@
         <field name="updateButton"><submit/></field>
     </form>
     
-    <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
-            odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-
+    <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list">
+        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field use-when="headerItem.equals(&quot;main&quot;)" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
         </field>
@@ -112,8 +112,10 @@
             <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;type=other" />
         </field>
     </form>
-    <form name="ListMyUnknownPartyEmails"
+    <form name="ListMyUnknownPartyEmails" type="multi"
         extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" use-row-submit="true">
+        <alt-target use-when="&quot;otherCommunications&quot;.equals(headerItem)" target="deleteOtherUnknownCommunicationEvents"/>
+        <alt-target use-when="&quot;myCommunications&quot;.equals(headerItem)" target="deleteMyUnknownCommunicationEvents"/>
 
         <field use-when="headerItem.equals(&quot;main&quot;)" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
             <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;type=main"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=678343&r1=678342&r2=678343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Jul 20 21:25:11 2008
@@ -198,7 +198,7 @@
     <screen name="Communications">
         <section>
             <actions>
-                <entity-condition entity-name="CommunicationEvent"
+                <entity-condition entity-name="CommunicationEventAndRole"
                     list-name="commEvents">
                     <condition-list combine="and">
                         <condition-expr field-name="statusId" operator="not-equals"
@@ -208,19 +208,23 @@
                                 value="${partyId}" />
                             <condition-expr field-name="partyIdTo" operator="equals"
                                 value="${partyId}" />
+                            <condition-expr field-name="partyId" operator="equals"
+                                value="${partyId}" />
                         </condition-list>
                     </condition-list>
-                    <order-by field-name="-lastUpdatedStamp" />
+                    <order-by field-name="-datetimeStarted" />
                 </entity-condition>
-                <entity-condition entity-name="CommunicationEvent"
+                <entity-condition entity-name="CommunicationEventAndRole"
                     list-name="commEventsUnknown">
                     <condition-list combine="and">
                         <condition-expr field-name="statusId" operator="equals"
                             value="COM_UNKNOWN_PARTY" />
                         <condition-expr field-name="partyIdTo" operator="equals"
                             env-name="partyId" />
+                        <condition-expr field-name="partyId" operator="equals"
+                            value="${partyId}" />
                     </condition-list>
-                    <order-by field-name="-lastUpdatedStamp" />
+                    <order-by field-name="-datetimeStarted" />
                 </entity-condition>
                 <entity-one entity-name="PartyNameView" value-name="partyName">
                     <field-map field-name="partyId" env-name="partyId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=678343&r1=678342&r2=678343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Sun Jul 20 21:25:11 2008
@@ -27,7 +27,7 @@
                 <set field="tabButtonItem" value="requestlist"/>
                 <set field="headerItem" value="request"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <set field="parameters.statusId" value="CRQ_SUBMITTED"/>
+                <set field="parameters.statusId" value="CRQ_ACCEPTED"/>
                 <set field="entityName" value="CustRequest"/>
             </actions>
             <widgets>