svn commit: r761186 [1/2] - in /ofbiz/trunk: applications/order/config/ applications/order/data/ applications/order/webapp/orde
Locked
svn commit: r761186 [1/2] - in /ofbiz/trunk: applications/order/config/ applications/order/data/ applications/order/webapp/orde
 
|
Author: hansbak
Date: Thu Apr 2 06:57:09 2009 New Revision: 761186 URL: http://svn.apache.org/viewvc?rev=761186&view=rev Log: many cleanups, moved customer requests back into order, fixed the edit contactmech in portal as reported in the mailing list Removed: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/js/ Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml ofbiz/trunk/applications/order/data/OrderPortletData.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml ofbiz/trunk/applications/product/data/ProductSecurityData.xml ofbiz/trunk/framework/common/config/CommonUiLabels.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu Apr 2 06:57:09 2009 @@ -4579,6 +4579,15 @@ <value xml:lang="th">à¸à¸²à¸¢</value> <value xml:lang="zh">éå®ä¸</value> </property> + <property key="OrderOpenMyCustomerRequests"> + <value xml:lang="en">My Open Customer Requests</value> + <value xml:lang="fr">Mes demandes de clients en-cours</value> + <value xml:lang="it">Proprie richieste clienti aperte</value> + <value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²</value> + </property> + <property key="OrderOpenCompanyCustomerRequests"> + <value xml:lang="en">Other Customer Requests from the same company</value> + </property> <property key="OrderOptions"> <value xml:lang="de">Bestelloptionen</value> <value xml:lang="en">Order options</value> Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original) +++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Thu Apr 2 06:57:09 2009 @@ -23,8 +23,19 @@ <PortletCategory portletCategoryId="CUST_REQUEST" description="Customer Requests"/> <PortalPortlet portalPortletId="INCOM_CUST_REQUESTS" portletName="Incoming Cust.Requests" - screenName="IncomingCustRequests" screenLocation="component://order/widget/ordermgr/RequestScreens.xml" + screenName="IncomingCustRequests" + screenLocation="component://order/widget/ordermgr/RequestScreens.xml" description="List Request List for a request taker" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> <PortletPortletCategory portalPortletId="INCOM_CUST_REQUESTS" portletCategoryId="CUST_REQUEST"/> + <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) available to a Customer" /> + <PortalPortlet portalPortletId="ListCustRequests" + portletName="List Cust Requests" + screenName="ListCustRequests" + screenLocation="component://order/widget/ordermgr/RequestScreens.xml" + description="List Cust Requests to the customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" + editFormName="EditCustReqStatusId" + editFormLocation="component://order/webapp/ordermgr/request/RequestForms.xml" /> + <PortletPortletCategory portalPortletId="ListCustRequests" portletCategoryId="LIST_CUSTOMER"/> + </entity-engine-xml> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Thu Apr 2 06:57:09 2009 @@ -1140,7 +1140,12 @@ <response name="success" type="view" value="EditRequest"/> <response name="error" type="view" value="EditRequest"/> </request-map> - + <request-map uri="setCustRequestStatus"> + <security https="true" auth="true"/> + <event type="service" invoke="setCustRequestStatus"/> + <response name="success" type="view-last"/> + <response name="error" type="view" value="EditRequest"/> + </request-map> <request-map uri="requestroles"><security https="true" auth="true"/><response name="success" type="view" value="RequestRoles"/></request-map> <request-map uri="createCustRequestParty"> <security https="true" auth="true"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Thu Apr 2 06:57:09 2009 @@ -80,8 +80,10 @@ </service> </actions> </form> + <form name="ListRequestList" type="list" use-row-submit="true" list-name="custRequests" title="List of customer requests" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="FindRequest"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="custRequestId"><hidden/></field> <field name="custRequestName"> <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest"> <parameter param-name="custRequestId" from-field="custRequestId"/> @@ -100,6 +102,13 @@ <display-entity also-hidden="false" entity-name="StatusItem"/> </field> <field name="lastModifiedDate"><display/></field> + <!--field name="statusId"><hidden value="CRQ_REJECTED"/></field--> + <field name="reject"> + <hyperlink target="setCustRequestStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}"> + <parameter param-name="custRequestId"/> + <parameter param-name="statusId" value="CRQ_REJECTED"/> + </hyperlink> + </field> </form> <form name="ListRequestItems" type="list" use-row-submit="true" title="" list-name="custRequestItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestItems"> @@ -165,8 +174,8 @@ <field name="custRequestItemSeqId"><hidden/></field> </form> - <form name="ViewRequestCommunicationEvents" type="list" extends="ListCommEvents"> - <!-- extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"--> + <form name="ViewRequestCommunicationEvents" type="list" extends="ListCommEvents" + extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> <field name="subject"> <hyperlink description="${subject}" target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app"> <parameter param-name="communicationEventId" from-field="communicationEventId"/> @@ -174,24 +183,6 @@ </field> </form> - <!-- copy of form from CommForms.xml because of loop problem see jira issue: OFBIZ-1914 --> - <form name="ListCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> - <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"> - <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> - <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]"> - <parameter param-name="partyId" from-field="partyIdFrom"/> - </sub-hyperlink> - </display-entity> - </field> - <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"> - <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> - <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]"> - <parameter param-name="partyId" from-field="partyIdTo"/> - </sub-hyperlink> - </display-entity> - </field> - </form> - <form name="ViewRequestWorkEfforts" type="list" list-name="requestWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortId"> @@ -209,7 +200,6 @@ <alt-target use-when="custRequest==null" target="createrequest"/> <auto-fields-service service-name="updateCustRequest" default-field-type="edit"/> <field name="custRequestId"><hidden/></field> - <field name="custRequestName"/> <field name="custRequestTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="CustRequestType" description="${description}"/> @@ -229,14 +219,7 @@ </drop-down> </field> - <field use-when="custRequest==null" name="statusId"> - <drop-down allow-empty="false" current="first-in-list"> - <entity-options entity-name="StatusItem" description="${description}"> - <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/> - <entity-order-by field-name="sequenceId"/> - </entity-options> - </drop-down> - </field> + <field use-when="custRequest==null" name="statusId"><hidden value="CRQ_SUBMITTED"/></field> <field use-when="custRequest!=null" name="statusId"> <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}"> <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> @@ -246,16 +229,16 @@ </drop-down> </field> <field name="priority"> - <drop-down allow-empty="false"> - <option key="9"/> - <option key="8"/> - <option key="7"/> - <option key="6"/> - <option key="5"/> - <option key="4"/> - <option key="3"/> + <drop-down allow-empty="true"> + <option key="1(Highest)"/> <option key="2"/> - <option key="1"/> + <option key="3"/> + <option key="4"/> + <option key="5"/> + <option key="6"/> + <option key="7"/> + <option key="8"/> + <option key="9(Lowest)"/> </drop-down> </field> <field name="maximumAmountUomId"> @@ -294,6 +277,18 @@ <field name="lastModifiedByUserLogin"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <form name="EditSmallCustRequest" extends="EditCustRequest"> + <field name="salesChannelEnumId"><ignored/></field> + <field name="custRequestCategoryId"><ignored/></field> + <field name="maximumAmountUomId"><ignored/></field> + <field name="productStoreId"><ignored/></field> + <field name="fulfillContactMechId"><ignored/></field> + <field name="currencyUomId"><ignored/></field> + <field name="openDateTime"><ignored/></field> + <field name="closedDateTime"><ignored/></field> + <field name="internalComment"><ignored/></field> + <field name="reason"><ignored/></field> + </form> <form name="EditCustRequestItem" type="single" target="updaterequestitem" title="" default-map-name="custRequestItem" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="custRequestItem==null" target="createrequestitem"/> @@ -597,4 +592,59 @@ </hyperlink> </field> </form> + <form name="EditCustReqStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> + <field name="statusGroup" entry-name="attributeMap.statusGroup"> + <drop-down> + <option key="OPEN" description="Open"/> + <option key="COMPLETED" description="Completed"/> + <option key="CANCELLED" description="Cancelled"/> + </drop-down> + </field> + <field name="otherContacts" entry-name="attributeMap.otherContacts"><drop-down allow-empty="false"><option key="Y" description="Yes"/><option key="N" description="No"/></drop-down></field> + <field name="saveButton"><submit/></field> + </form> + <form name="ListCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updateRequest"> + <row-actions> + <service service-name="getProjectTask" result-map="taskResult"> + <field-map field-name="taskId" from-field="workEffortId"/> + </service> + </row-actions> + <field name="custRequestId"><hidden/></field> + <field name="custRequestName"> + <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest"> + <parameter param-name="custRequestId" from-field="custRequestId"/> + </hyperlink> + </field> + <field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field> + <field name="fromPartyId"> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${fromPartyId}])"/> + </field> + <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> + <field name="priority" use-when="statusGroup!="OPEN""><display/></field> + <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> + <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field> + <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field> + <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActStartDate}"><display type="date"/></field> + <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActEndDate}"><display type="date"/></field> + <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field> + <field name="actualHours" map-name="taskResult.taskInfo"><display/></field> + </form> + <form name="ListMyCustRequests" extends="ListCustRequests"> + <field name="fromPartyId"><ignored/></field> + <field name="priority"> + <drop-down allow-empty="true"> + <option key="9"/> + <option key="8"/> + <option key="7"/> + <option key="6"/> + <option key="5"/> + <option key="4"/> + <option key="3"/> + <option key="2"/> + <option key="1"/> + </drop-down> + </field> + <field name="updateButton" widget-style="smallSubmit"><submit /></field> + </form> + </forms> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Thu Apr 2 06:57:09 2009 @@ -74,7 +74,14 @@ </section> <include-menu name="RequestSubTabBar" location="component://order/widget/ordermgr/RequestMenus.xml"/> <container> - <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label> + <section> + <condition> + <not><if-empty field="custRequest"/></not> + </condition> + <widgets> + <label style="h1">${custRequest.custRequestName} [${uiLabelMap.CommonId}:${custRequest.custRequestId}] </label> + </widgets> + </section> </container> <decorator-section-include name="body"/> </decorator-section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml Thu Apr 2 06:57:09 2009 @@ -47,15 +47,25 @@ </menu> <menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - menu-container-style="button-bar button-style-2 no-clear"> + menu-container-style="button-bar button-style-2 no-clear"> <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}"> - <link target="request"/> + <link target="EditRequest"/> </menu-item> <menu-item name="createQuoteFromRequest" title="${uiLabelMap.OrderCreateQuoteFromRequest}"> + <condition> + <not><if-empty field="custRequest"/></not> + </condition> <link target="createQuoteFromCustRequest?custRequestId=${custRequest.custRequestId}"/> </menu-item> </menu> - + + <menu name="RequestScreenletMenu" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" + menu-container-style="button-bar button-style-2 no-clear"> + <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}"> + <link target="EditRequest"/> + </menu-item> + </menu> + <menu name="editrequestitemmenu" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="requestitem" title="${uiLabelMap.OrderRequestItem}"> <link id="requestitem" target="requestitem"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Thu Apr 2 06:57:09 2009 @@ -105,7 +105,7 @@ <screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequestWorkEfforts"> <include-form name="ViewRequestWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent"> + <screenlet title="${uiLabelMap.CommonContent}"> <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> </container> @@ -129,7 +129,17 @@ <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.OrderRequest}"> - <include-form name="EditCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + <section> + <condition> + <if-compare field="parameters.small" operator="equals" value="Y"/> + </condition> + <widgets> + <include-form name="EditSmallCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </widgets> + <fail-widgets> + <include-form name="EditCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </fail-widgets> + </section> </screenlet> </decorator-section> </decorator-screen> @@ -520,7 +530,8 @@ <not><if-empty field="custRequests"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.OrderIncomingCustRequests}" navigation-form-name="ListRequestList"> + <screenlet title="${uiLabelMap.OrderIncomingCustRequests}" navigation-menu-name="RequestScreenletMenu"> + <include-menu name="RequestScreenletMenu" location="component://order/widget/ordermgr/RequestMenus.xml"/> <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> </widgets> @@ -528,5 +539,116 @@ </widgets> </section> </screen> + <screen name="ListCustRequests"> + <section> + <actions> + <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> + <set field="fromPartyId" from-field="userLogin.partyId"/> + <set field="screenletTitle" from-field="uiLabelMap.OrderOpenMyCustomerRequests"/> + </actions> + <widgets> + <section> + <condition> + <if-compare field="otherContacts" operator="equals" value="Y"/> + </condition> + <actions> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> + <set field="fromPartyId" from-field=""/> + <set field="notFromPartyId" from-field="userLogin.partyId"/> + <set field="screenletTitle" from-field="uiLabelMap.OrderOpenCompanyCustomerRequests"/> + </actions> + <widgets/> + </section> + <section> + <condition> + <if-compare field="statusGroup" operator="equals" value="OPEN"/> + </condition> + <actions> + <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/> + <condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/> + <condition-expr field-name="fromPartyId" operator="not-equals" from-field="notFromPartyId" ignore-if-empty="true"/> + <condition-list combine="or"> + <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_REVIEWED"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/> + </condition-list> + </condition-list> + <order-by field-name="+priority"/> + <order-by field-name="+custRequestDate"/> + </entity-condition> + </actions> + <widgets/> + </section> + <section> + <condition> + <if-compare field="statusGroup" operator="equals" value="COMPLETED"/> + </condition> + <actions> + <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-null="true"/> + <condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/> + <condition-expr field-name="fromPartyId" operator="not-equals" from-field="notFromPartyId" ignore-if-empty="true"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> + </condition-list> + <order-by field-name="+priority"/> + <order-by field-name="+custRequestDate"/> + </entity-condition> + </actions> + <widgets/> + </section> + <section> + <condition> + <if-compare field="statusGroup" operator="equals" value="CANCELLED"/> + </condition> + <actions> + <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-null="true"/> + <condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/> + <condition-expr field-name="fromPartyId" operator="not-equals" from-field="notFromPartyId" ignore-if-empty="true"/> + <condition-list combine="or"> + <condition-expr field-name="statusId" operator="equals" value="CRQ_REJECTED"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> + </condition-list> + </condition-list> + <order-by field-name="+priority"/> + <order-by field-name="+custRequestDate"/> + </entity-condition> + </actions> + <widgets/> + </section> + <section> + <condition> + <and> + <if-compare field="statusGroup" operator="equals" value="OPEN"/> + <if-compare field="otherContacts" operator="not-equals" value="Y"/> + </and> + </condition> + <widgets> + <screenlet title="${screenletTitle} ${fromPartyId}" navigation-form-name="ListCustRequests" > + <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> + <include-form name="ListMyCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> + </widgets> + <fail-widgets> + <section><!-- only show open requests from other people in the company if there are any to show --> + <condition> + <not><if-empty field="custRequests"/></not> + </condition> + <widgets> + <screenlet title="${screenletTitle} ${fromPartyId}" navigation-form-name="ListCustRequests" > + <include-form name="ListCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> + </widgets> + </section> + </fail-widgets> + </section> + </widgets> + </section> + </screen> + </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Thu Apr 2 06:57:09 2009 @@ -21,7 +21,6 @@ <#if !preContactMechTypeId?has_content> <h1>${uiLabelMap.PartyCreateNewContact}</h1> <form method="post" action="<@ofbizUrl>editcontactmech</@ofbizUrl>" name="createcontactmechform"> - <input type="hidden" name="DONE_PAGE" value="${donePage}"> <input type="hidden" name="partyId" value="${partyId}"> <table class="basic-table" cellspacing="0"> <tr> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Thu Apr 2 06:57:09 2009 @@ -21,7 +21,7 @@ <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.PartyContactInformation}</li> - <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session) || userLogin.partyId == party.partyId> + <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session) || userLogin.partyId == partyId> <li><a href="<@ofbizUrl>editcontactmech?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li> </#if> </ul> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu Apr 2 06:57:09 2009 @@ -417,7 +417,7 @@ <if-compare field="hasViewPermission" operator="equals" value="true" type="Boolean"/> <if-compare field="hasPcmCreatePermission" operator="equals" value="true" type="Boolean"/> <if-compare field="hasPcmUpdatePermission" operator="equals" value="true" type="Boolean"/> - <if-compare-field field="parameters.partyId" operator="equals" to-field="userLogin.partyId" type="String"/> + <if-compare-field field="parameters.partyId" operator="equals" to-field="userLogin.partyId"/> <not><if-empty field="mechMap.partyContactMech"/></not> </or> </condition> @@ -428,7 +428,7 @@ </widgets> <fail-widgets> <container style="button-bar"> - <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/> + <link target="backHome" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/> </container> <container> <label style="h3">${uiLabelMap.PartyMsgContactNotBelongToYou}</label> Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Thu Apr 2 06:57:09 2009 @@ -43,7 +43,10 @@ <widgets> <section> <condition> - <if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/> + <or> + <if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/> + <if-compare-field field="parameters.partyId" operator="equals" to-field="userLogin.partyId"/> + </or> </condition> <widgets> <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel"> Modified: ofbiz/trunk/applications/product/data/ProductSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductSecurityData.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/applications/product/data/ProductSecurityData.xml (original) +++ ofbiz/trunk/applications/product/data/ProductSecurityData.xml Thu Apr 2 06:57:09 2009 @@ -28,7 +28,7 @@ <SecurityPermission description="Limited Create operations in the Catalog Manager." permissionId="CATALOG_ROLE_CREATE"/> <SecurityPermission description="Limited Update operations in the Catalog Manager." permissionId="CATALOG_ROLE_UPDATE"/> <SecurityPermission description="Limited Delete operations in the Catalog Manager." permissionId="CATALOG_ROLE_DELETE"/> - <SecurityPermission description="Permission required, in addition to other applicable permissions, to maintain product price information including prices, promotions, and price rules." permissionId="CATALOG_PRICE_MAINT"/> + <SecurityPermission description="To be able to maintain product prices, promotions, and price rules." permissionId="CATALOG_PRICE_MAINT"/> <SecurityPermission description="Allow create/update of 'View Allow' in the Catalog Manager." permissionId="CATALOG_VIEW_ALLOW"/> <SecurityPermission description="Allow create/update of 'Purchase Allow' in the Catalog Manager." permissionId="CATALOG_PURCHASE_ALLOW"/> Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Apr 2 06:57:09 2009 @@ -8011,6 +8011,10 @@ <value xml:lang="th">à¸à¸³à¸à¸§à¸</value> <value xml:lang="zh">æ°é</value> </property> + <property key="FormFieldTitle_rejectButton"> + <value xml:lang="ar">إضاÙØ©</value> + <value xml:lang="en">Reject</value> + </property> <property key="FormFieldTitle_removeButton"> <value xml:lang="ar">Ùزع</value> <value xml:lang="de">Entfernen</value> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Thu Apr 2 06:57:09 2009 @@ -118,8 +118,11 @@ <Person partyId="DemoCustomer" firstName="Demo" lastName="Customer"/> <UserLogin partyId="DemoCustomer" userLoginId="DemoCustomer"/> <PartyRole partyId="DemoCustomer" roleTypeId="CUSTOMER"/> + <PartyRole partyId="DemoCustomer" roleTypeId="CONTACT"/> <PartyRole partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER"/> - <PartyGeoPoint partyId="DemoCustomer" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/> + <PartyGeoPoint partyId="DemoCustomer" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/> + <PartyRelationship partyIdFrom="DemoCustCompany" roleTypeIdFrom="ACCOUNT" partyIdTo="DemoCustomer" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00.000" partyRelationshipTypeId="EMPLOYMENT"/> + <ContactMech contactMechId="9015" contactMechTypeId="POSTAL_ADDRESS"/> <PostalAddress contactMechId="9015" toName="Demo Customer" address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="UT" postalCode="84057" countryGeoId="USA" geoPointId="9000"/> Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Thu Apr 2 06:57:09 2009 @@ -141,12 +141,6 @@ <value xml:lang="it">Usare l'utente 'DemoCustomer' o 'DemoEmployee' per una dimostrazione.</value> <value xml:lang="th">à¸à¸³à¸¥à¸à¸à¸à¸¹à¹à¹à¸à¹à¹à¸à¹à¸ DemoCustomer à¹à¸¥à¸° DemoEmployee à¹à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> </property> - <property key="MyPortalOpenCustomerRequests"> - <value xml:lang="en">My Open Customer Requests</value> - <value xml:lang="fr">Mes demandes de clients en-cours</value> - <value xml:lang="it">Proprie richieste clienti aperte</value> - <value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²</value> - </property> <property key="MyPortalOtherCommunications"> <value xml:lang="en">Other Communications</value> <value xml:lang="fr">Autres communications</value> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml Thu Apr 2 06:57:09 2009 @@ -26,8 +26,10 @@ <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/> <!-- incoming customer request examples --> - <CustRequest custRequestId="9000" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustomer" priority="9" custRequestName="Customer Request Usage" description="Could you please advise us how to use the customer request facility within ofbiz?" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin" lastUpdatedStamp="2008-07-28 11:45:31.984" lastUpdatedTxStamp="2008-07-28 11:45:31.83" createdStamp="2008-07-28 11:45:31.984" createdTxStamp="2008-07-28 11:45:31.83"/> - <CustRequest custRequestId="9001" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustAgent" priority="9" custRequestName="Hardware?" description="Please provide us with the hardware requirements of OFBiz" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin" lastUpdatedStamp="2008-07-28 11:45:31.984" lastUpdatedTxStamp="2008-07-28 11:45:31.83" createdStamp="2008-07-28 11:45:31.984" createdTxStamp="2008-07-28 11:45:31.83"/> + <CustRequest custRequestId="9000" custRequestDate="2008-07-28 09:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustomer" priority="9" custRequestName="Customer Request Usage" description="Could you please advise us how to use the customer request facility within ofbiz?" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin" /> + <CustRequestItem custRequestId="9000" custRequestItemSeqId="00001" story="This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request."/> + <CustRequest custRequestId="9001" custRequestDate="2008-07-21 11:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustAgent" priority="9" custRequestName="Hardware?" description="Please provide us with the hardware requirements of OFBiz" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin"/> + <CustRequest custRequestId="9002" custRequestDate="2008-07-19 18:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustomer2" priority="9" custRequestName="Customer Same company" description="This will contain a request from the same company?" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin"/> <!-- Employees assigned to handle these incoming customer requests--> <CustRequestType custRequestTypeId="RF_SUPPORT" partyId="Company"/> <PartyRole partyId="admin" roleTypeId="REQ_TAKER"/> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Thu Apr 2 06:57:09 2009 @@ -49,7 +49,8 @@ <PortalPage portalPageId="MYPORTAL_CUSTOMER2" sequenceNum="200" portalPageName="Invoices" description="The OFBiz My Portal Invoices page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" /> <PortalPage portalPageId="MYPORTAL_CUSTOMER3" sequenceNum="300" portalPageName="Projects" description="The OFBiz My Portal Project page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" /> - <PortalPageColumn portalPageId="MYPORTAL_NONE" sequenceNum="0" columnSeqId="00001" /> + <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001" /> + <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00002" columnWidthPercentage="50" /> <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE" columnSeqId="00001" /> <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00001" columnWidthPercentage="50" /> @@ -73,16 +74,15 @@ <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" /> <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" /> - <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) of Customer" /> - <PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="ListInvoices" portletName="List Invoices" screenName="ListInvoices" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Invoices From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> - <PortalPortlet portalPortletId="ListCustRequests" portletName="List Cust Requests" screenName="ListCustRequests" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> - <PortalPortlet portalPortletId="ListCustRequestsComp" portletName="List Cust Requests Completed" screenName="ListCustRequestsCompleted" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests Completed From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> - <PortalPortlet portalPortletId="ListPartyCommEvents" portletName="List Party Comm Events" screenName="ListPartyCommEvents" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Party Comm Events in myportal from party" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="ListProjects" portletName="List Projects" screenName="ListProjects" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Projects From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/> + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/> + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> @@ -121,11 +121,16 @@ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListPartyCommEvents" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" attrName="statusGroup" attrValue="OPEN"/> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" columnSeqId="00001" sequenceNum="2"/> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="COMPLETED"/> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" columnSeqId="00001" sequenceNum="2"/> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="OPEN" /> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="otherContacts" attrValue="Y" /> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="8"/> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="10"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="3" /> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/> @@ -139,9 +144,6 @@ <PortletPortletCategory portalPortletId="ListInvoices" portletCategoryId="LIST_CUSTOMER"/> - <PortletPortletCategory portalPortletId="ListCustRequests" portletCategoryId="LIST_CUSTOMER"/> - <PortletPortletCategory portalPortletId="ListCustRequestsComp" portletCategoryId="LIST_CUSTOMER"/> - <PortletPortletCategory portalPortletId="ListPartyCommEvents" portletCategoryId="LIST_CUSTOMER"/> <PortletPortletCategory portalPortletId="ListProjects" portletCategoryId="LIST_CUSTOMER"/> <WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE" /> Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Thu Apr 2 06:57:09 2009 @@ -88,21 +88,6 @@ </iterate> </simple-method> - <simple-method method-name="getToNextDonePage" - short-description="return the requestValue 'donePage' as a resultcode to the controller"> - <set field="donePage" from-field="parameters.donePage" - default-value="${parameters.DONE_PAGE}"/> - <if-not-empty field="donePage"> - <log level="info" message="Next request: ${donePage}"/> - <return response-code="${donePage}"/> - <else> - <log level="info" message="Next 'donePage' variable not provided, returning 'error'"/> - <return response-code="error"/> - </else> - </if-not-empty> - </simple-method> - - <simple-method method-name="createRegister" short-description="Create person when new register" login-required="false"> <call-bsh><![CDATA[ @@ -116,7 +101,6 @@ <check-errors error-list-name="error_list" error-code="resultPage"/> <!-- set parameter of person to personContext Map --> - <set field="personContext.partyId" from-field="parameters.USERNAME"/> <set field="personContext.salutation" from-field="parameters.salutation"/> <set field="personContext.firstName" from-field="parameters.firstName"/> <set field="personContext.middleName" from-field="parameters.middleName"/> @@ -155,7 +139,7 @@ <!-- create the PartyDataSource entry to track where this info came from... --> <make-value entity-name="PartyDataSource" value-field="partyDataSource"/> - <set value="ECOMMERCE_SITE" field="partyDataSource.dataSourceId"/> + <set value="MY_PORTAL" field="partyDataSource.dataSourceId"/> <set from-field="nowStamp" field="partyDataSource.fromDate"/> <set value="Y" field="partyDataSource.isCreate"/> <set from-field="partyId" field="partyDataSource.partyId"/> @@ -164,9 +148,8 @@ <create-value value-field="partyDataSource"/> <!-- Create E-mail address --> - <set field="emailContext.infoString" from-field="parameters.USER_EMAIL"/> - <set field="emailContext.contactMechTypeId" value="EMAIL_ADDRESS"/> - <call-service service-name="createContactMech" in-map-name="emailContext"> + <set field="emailContext.emailAddress" from-field="parameters.USER_EMAIL"/> + <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> <result-to-field result-name="contactMechId" field="emailPurposeContext.contactMechId"/> </call-service> <set from-field="partyId" field="emailPurposeContext.partyId"/> @@ -181,7 +164,7 @@ <get-related-one value-field="createdUserLogin" relation-name="Person" to-value-field="person"/> <set field="bodyParameters.person" from-field="person"/> <set field="emailParams.bodyParameters" from-field="bodyParameters"/> - <set field="emailParams.sendTo" from-field="emailContext.infoString"/> + <set field="emailParams.sendTo" from-field="emailContext.emailAddress"/> <set field="emailParams.subject" from-field="storeEmail.subject"/> <set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/> <set field="emailParams.sendCc" from-field="storeEmail.ccAddress"/> @@ -192,12 +175,17 @@ <set field="emailParams.emailType" from-field="storeEmail.emailType"/> <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/> - <!-- Create Customer Request --> + <!-- Create Customer Request to show new registration--> <set field="custRequest.custRequestTypeId" value="RF_SUPPORT"/> <set field="custRequest.fromPartyId" from-field="partyId"/> - <set field="custRequest.custRequestName" value="New user account"/> + <set field="custRequest.custRequestName" value="New user account created by registration"/> <set field="custRequest.productStoreId" from-field="webSite.productStoreId"/> - <call-service service-name="createCustRequest" in-map-name="custRequest"/> + <call-service service-name="createCustRequest" in-map-name="custRequest"> + <result-to-field result-name="custRequestId"/> + </call-service> + <set field="custRequestItem.custRequestId" from-field="custRequestId"/> + <set field="custRequestItem.story" from-field="parameters.whyWouldYouLikeToRegister"/> + <call-service service-name="createCustRequestItem" in-map-name="custRequestItem"/> <!-- set field to request --> <field-to-request field="partyId" request-name="partyId"/> Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Thu Apr 2 06:57:09 2009 @@ -20,10 +20,13 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <!-- take care: later requests/views will overwrite earlier ones in the controller.xml list --> + <!-- so the order should be from most common to most specific--> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/> - <include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/> <include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/> + <include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/> + <include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/> <description>Show personal information in the system</description> @@ -43,7 +46,7 @@ <response name="resultPage" type="view" value="newRegisterLogin"/> </request-map> - <!-- COMPANY COMMUNICATION --> + <!-- COMPANY Events --> <request-map uri="myCompanyComms"> <security https="true" auth="true"/> <response name="success" type="view" value="myCompanyComms"/> @@ -64,60 +67,12 @@ <response name="success" type="request" value="myCompanyComms"/> </request-map> - <!-- Create Customer Request--> - <request-map uri="newrequest"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditRequest"/> - </request-map> - <request-map uri="createrequest"> - <security https="true" auth="true"/> - <event type="service" invoke="createCustRequest"/> - <response name="error" type="request-redirect-noparam" value="showPortalPage"/> - <response name="error" type="view" value="EditRequest"/> - </request-map> - <request-map uri="updateRequest"> - <security https="true" auth="true"/> - <event type="service" invoke="updateCustRequest"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="listInvoices"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ListInvoices"/> - </request-map> - <request-map uri="listProjects"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ListProjects"/> - </request-map> - - <!-- CustRequest Content --> - <request-map uri="EditCustRequestContent"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditCustRequestContent"/> - </request-map> - - <request-map uri="createCustRequestContent"> - <security auth="true" https="true"/> - <event path="org/ofbiz/order/request/CustRequestEvents.xml" type="simple" invoke="createCustRequestContent"/> - <response name="success" type="request-redirect" value="EditCustRequestContent"/> - <response name="error" type="view" value="EditCustRequestContent"/> - </request-map> - - <request-map uri="deleteCustRequestContent"> - <security auth="true" https="true"/> - <event invoke="deleteCustRequestContent" type="service"/> - <response name="success" type="request-redirect" value="EditCustRequestContent"/> - <response name="error" type="view" value="EditCustRequestContent"/> - </request-map> <view-map name="main" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/> <view-map name="login" type="screen" page="component://myportal/widget/CommonScreens.xml#login"/> <view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/> - <view-map name="myTasks" type="screen" page="component://myportal/widget/CommonScreens.xml#MyTasks"/> <view-map name="myCompanyComms" type="screen" page="component://myportal/widget/CommonScreens.xml#MyCompanyComms"/> <view-map name="newEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#newEvent"/> - <view-map name="ViewRequest" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ViewRequest"/> - <view-map name="EditRequest" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditRequest"/> <view-map name="ListInvoices" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListInvoices"/> <view-map name="ListProjects" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListProjects"/> </site-conf> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Apr 2 06:57:09 2009 @@ -206,25 +206,9 @@ <screen name="CommonRequestDecorator"> <section> - <actions> - <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-field="custRequest"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <not><if-empty field="custRequest"/></not> - </condition> - <widgets> - <include-menu location="component://myportal/widget/MyPortalMenus.xml" name="RequestTabBar"/> - </widgets> - </section> - <include-menu name="RequestSubTabBar" location="component://myportal/widget/MyPortalMenus.xml"/> - <container> - <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label> - </container> + <widgets> + <decorator-screen name="CommonRequestDecorator" location="component://order/widget/ordermgr/CommonScreens.xml"> + <decorator-section name="body"> <decorator-section-include name="body"/> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Apr 2 06:57:09 2009 @@ -21,86 +21,6 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="MyTasks" extends="MyTasks" extends-resource="component://projectmgr/widget/forms/TaskForms.xml"> - <field name="portalPageId"><hidden value="${parameters.portalPageId}"/></field> - <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortName}" target="/projectmgr/control/taskView" target-type="inter-app" target-window="_BLANK"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - </hyperlink> - </field> - <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"> - <hyperlink target="/projectmgr/control/projectView" target-type="inter-app" target-window="_BLANK" description="${resultProject.projectName}"> - <parameter param-name="projectId" from-field="resultProject.projectId"/> - </hyperlink> - </field> - <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId}"/></field> - <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonRemove}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> - <parameter param-name="statusId" value="PAS_ENDED"/> - <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> - </hyperlink> - </field> - <!-- better set to complete on the timesheet --> - <!-- <field name="toComplete" title="${uiLabelMap.MyPortalToComplete}"><hyperlink target="updateTaskAssigment" description="${uiLabelMap.MyPortalToComplete}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> - <parameter param-name="statusId" value="PAS_COMPLETED"/> - <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> - </hyperlink> - </field--> - </form> - - <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml"> - <alt-target use-when="!headerItem.equals("main")" target="updateTimesheetKey"/> - <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"> - <drop-down allow-empty="true"> - <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}"> - <entity-constraint name="workEffortTypeId" operator="not-equals" value="TASK_TEMPLATE"/> - <entity-constraint name="partyId" env-name="timesheet.partyId"/> - <entity-order-by field-name="projectName"/> - <entity-order-by field-name="phaseName"/> - <entity-order-by field-name="workEffortName"/> - </entity-options> - <sub-hyperlink target="/projectmgr/control/taskView" target-type="inter-app" target-window="_BLANK" link-style="buttontext" description="${bsh:workEffortId != void && !workEffortId.equals("Totals") ? workEffortId : ""}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - </sub-hyperlink> - </drop-down> - </field> - <field name="updateButton"><submit/></field> - </form> - - <form name="WeekTimesheet" type="list" list-name="timeEntries" separate-columns="true" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="timesheetId"><hidden/></field> - <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"> - <hyperlink target="/projectmgr/control/taskView" target-type="inter-app" target-window="_BLANK" description="${workEffortName}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - </hyperlink> - </field> - <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field> - <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"> - <hyperlink target="/projectmgr/control/projectView" target-type="inter-app" target-window="_BLANK" description="${projectName}"> - <parameter param-name="projectId" from-field="projectId"/> - </hyperlink> - </field> - <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field> - <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field> - <field name="0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrSun}"><display/></field> - <field name="1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrMon}"><display/></field> - <field name="2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrTue}"><display/></field> - <field name="3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrWen}"><display/></field> - <field name="4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><display/></field> - <field name="5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><display/></field> - <field name="6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><display/></field> - <field name="total" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field> - <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field> - </form> - <form name="MyCompanyComms" type="list" list-name="events" target="deleteEvent" paginate-target="FindTask" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -138,54 +58,6 @@ </hyperlink> </field> </form> - - <form name="ListCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updateRequest"> - <row-actions> - <service service-name="getProjectTask" result-map="taskResult"> - <field-map field-name="taskId" from-field="workEffortId"/> - </service> - </row-actions> - <field name="custRequestId"><hidden/></field> - <field name="custRequestName"> - <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest"> - <parameter param-name="custRequestId" from-field="custRequestId"/> - </hyperlink> - </field> - <field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field> - <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> - <field name="priority"> - <drop-down allow-empty="true"> - <option key="9"/> - <option key="8"/> - <option key="7"/> - <option key="6"/> - <option key="5"/> - <option key="4"/> - <option key="3"/> - <option key="2"/> - <option key="1"/> - </drop-down> - </field> - <field name="updateButton" widget-style="smallSubmit"><submit /></field> - <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> - <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field> - <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field> - <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActStartDate}"><display type="date"/></field> - <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActEndDate}"><display type="date"/></field> - <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field> - <field name="actualHours" map-name="taskResult.taskInfo"><display/></field> - </form> - - <form name="ListCustRequestsCompleted" extends="ListCustRequests" list-name="custRequestsCompleted"> - <field name="priority"><display/></field> - <field name="updateButton"><ignored/></field> - </form> - - <form name="ListOtherCompanyRequests" extends="ListCustRequestsCompleted" list-name="companyCustRequests"> - <field name="fromPartyId"> - <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${fromPartyId}])"/> - </field> - </form> <form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/RequestForms.xml"> <field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"><hidden value="${userLogin.partyId}"/></field> @@ -234,8 +106,9 @@ <!--New Register Person--> <form name="RegisterPerson" type="single" target="createRegister" default-map-name="personInfo" - focus-field-name="salutation" header-row-style="header-row" default-table-style="basic-table"> + focus-field-name="whyWouldYouLikeToRegister" header-row-style="header-row" default-table-style="basic-table"> <field name="webSiteId"><hidden value="${webSiteId}"/></field> + <field name="whyWouldYouLikeToRegister" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><textarea cols="60" rows="10"/></field> <field name="salutation"><text size="40" maxlength="60"/></field> <field name="firstName" title="${uiLabelMap.PartyFirstName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="40" maxlength="60"/></field> <field name="middleName" title="${uiLabelMap.PartyMiddleName}" ><text size="40" maxlength="60"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |