svn commit: r761186 [2/2] - in /ofbiz/trunk: applications/order/config/ applications/order/data/ applications/order/webapp/orde
Locked
svn commit: r761186 [2/2] - in /ofbiz/trunk: applications/order/config/ applications/order/data/ applications/order/webapp/orde
 
|
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Thu Apr 2 06:57:09 2009 @@ -56,99 +56,6 @@ </widgets> </section> </screen> - <screen name="ViewRequest"> - <section> - <actions> - <set field="MainColumnStyle" value="rightonly"/> - <set field="tabButtonItem" value="ViewRequest"/> - <set field="headerItem" value="request"/> - <set field="titleProperty" value="PageTitleViewRequest"/> - <set field="showRequestManagementLinks" value="Y"/> - <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-field="custRequest"/> - <get-related-one value-field="custRequest" relation-name="CustRequestType" to-value-field="custRequestType"/> - <get-related-one value-field="custRequest" relation-name="StatusItem" to-value-field="statusItem"/> - <get-related-one value-field="custRequest" relation-name="CurrencyUom" to-value-field="currency"/> - <get-related-one value-field="custRequest" relation-name="ProductStore" to-value-field="store"/> - <get-related-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/> - <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> - <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> - </entity-and> - <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> - <set field="orderBy[]" value="sequenceNum"/> - <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/> - <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest"> - <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> - </entity-and> - <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> - <field-map field-name="custRequestId" from-field="custRequestId"/> - </entity-and> - </actions> - <widgets> - <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="lefthalf"> - <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}"> - <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - <screenlet title="${uiLabelMap.PageTitleRequestItems}"> - <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - </container> - <container style="righthalf"> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestDate.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html> - </platform-specific> - <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequestCommunicationEvents"> - <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - <screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequestWorkEfforts"> - <include-form name="ViewRequestWorkEfforts" location="component://myportal/widget/MyPortalForms.xml"/> - </screenlet> - <screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent"> - <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="EditRequest"> - <section> - <actions> - <set field="titleProperty" value="OrderRequest"/> - <set field="tabButtonItem" value="editRequest"/> - <set field="headerItem" value="request"/> - - <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-field="custRequest"/> - - <set field="statusId" from-field="custRequest.statusId"/> - <entity-one entity-name="StatusItem" value-field="currentStatus"/> - </actions> - <widgets> - <section> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.OrderNewRequest}"> - <include-form name="EditCustRequest" location="component://myportal/widget/MyPortalForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </widgets> - </section> - </screen> <screen name="ListInvoices"> <section> <actions> @@ -280,159 +187,15 @@ </widgets> </section> </screen> - <screen name="EditCustRequestContent"> - <section> - <actions> - <set field="titleProperty" value="PageTitleEditRequestContent"/> - <set field="tabButtonItem" value="custRequestContent"/> - <set field="headerItem" value="request"/> - <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="Content" value-field="content"/> - <entity-one entity-name="CustRequest" value-field="custRequest"/> - <entity-and entity-name="CustRequestContent" list="custRequestContents" filter-by-date="true"> - <field-map field-name="custRequestId" from-field="custRequestId"/> - </entity-and> - <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> - <field-map field-name="custRequestId" from-field="custRequestId"/> - </entity-and> - </actions> - <widgets> - <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet id="AddCustRequestContentsPanel" title="${uiLabelMap.PageTitleAddContent}" collapsible="true"> - <include-form name="AddCustRequestContent" location="component://myportal/widget/RequestForms.xml"/> - </screenlet> - <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="ListCustRequests"> + <screen name="CreateUserNotification"> <section> <actions> - <set field="partyId" from-field="userLogin.partyId"/> - <set field="portalPageId" from-field="parameters.portalPageId"/> - <set field="status" from-field="parameters.status" default-value="open"/> - <set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/> - <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> - <condition-list combine="or"> - <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> - <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> - <condition-list combine="or"> - <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> - <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> - </condition-list> - </condition-list> - <order-by field-name="custRequestDate"/> - </entity-condition> - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> - <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> - <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> - </condition-list> - <order-by field-name="custRequestDate"/> - </entity-condition> - <!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only --> - <entity-condition entity-name="CommunicationEventAndRole" list="commEvents"> - <condition-list combine="and"> - <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> - <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> - <condition-list combine="or"> - <condition-expr field-name="roleStatusId" - operator="not-equals" value="COM_ROLE_COMPLETED" /> - <condition-expr field-name="roleStatusId" - operator="like" value="${status}" /> - </condition-list> - </condition-list> - <order-by field-name="-datetimeStarted" /> - </entity-condition> - </actions> + <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation}"/> + </actions> <widgets> - <section> - <widgets> - <screenlet title="${uiLabelMap.MyPortalOpenCustomerRequests}" navigation-form-name="ListCustRequests" > - <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> - <include-form name="ListCustRequests" location="component://myportal/widget/MyPortalForms.xml"/> - </screenlet> - </widgets> - </section> - </widgets> - </section> + <platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific> + </widgets> + </section> </screen> - - <screen name="ListCustRequestsCompleted"> - <section> - <actions> - <set field="partyId" from-field="userLogin.partyId"/> - <set field="status" from-field="parameters.status" default-value="open"/> - <set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/> - <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> - <condition-list combine="or"> - <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> - <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> - <condition-list combine="or"> - <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> - <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> - </condition-list> - </condition-list> - <order-by field-name="custRequestDate"/> - </entity-condition> - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> - <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> - <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> - </condition-list> - <order-by field-name="custRequestDate"/> - </entity-condition> - <!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only --> - <entity-condition entity-name="CommunicationEventAndRole" list="commEvents"> - <condition-list combine="and"> - <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> - <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> - <condition-list combine="or"> - <condition-expr field-name="roleStatusId" - operator="not-equals" value="COM_ROLE_COMPLETED" /> - <condition-expr field-name="roleStatusId" - operator="like" value="${status}" /> - </condition-list> - </condition-list> - <order-by field-name="-datetimeStarted" /> - </entity-condition> - </actions> - <widgets> - <section> - <widgets> - <screenlet title="${uiLabelMap.MyPortalCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted"> - <include-form name="ListCustRequestsCompleted" location="component://myportal/widget/MyPortalForms.xml"/> - </screenlet> - </widgets> - </section> - </widgets> - </section> - </screen> - </screens> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Thu Apr 2 06:57:09 2009 @@ -21,6 +21,7 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="CreateCustRequestAndAssignTaskToPerson" short-description=""> <set-service-fields service-name="createCustRequest" map="parameters" to-map="createCust"/> + <set field="createCust.statusId" value="CRQ_ACCEPTED"/><!-- entered by employee, should only enter accepted customer requests --> <call-service service-name="createCustRequest" in-map-name="createCust"> <result-to-field result-name="custRequestId" field="custRequestId"/> </call-service> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Thu Apr 2 06:57:09 2009 @@ -447,7 +447,7 @@ <request-map uri="MyStatusToComplete"> <security https="true" auth="true"/> <event type="service" invoke="updateTimesheet"/> - <response name="success" type="view" value="MyTimesheet"/> + <response name="success" type="view-last" value="MyTimesheet"/> <response name="error" type="view" value="MyTimesheet"/> </request-map> <request-map uri="StatusToComplete"> @@ -502,14 +502,10 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditRequest"/> </request-map> - <request-map uri="ViewRequest"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ViewRequest"/> - </request-map> <request-map uri="createrequest"> <security https="true" auth="true"/> <event type="simple" invoke="CreateCustRequestAndAssignTaskToPerson" path="org/ofbiz/project/ProjectSimpleEvents.xml"/> - <response name="success" type="request-redirect-noparam" value="requestlist"/> + <response name="success" type="view-home" value="requestlist"/> <response name="error" type="view" value="EditRequest"/> </request-map> <request-map uri="updaterequest"> @@ -518,12 +514,6 @@ <response name="success" type="request-redirect-noparam" value="requestlist"/> <response name="error" type="view" value="EditRequest"/> </request-map> - <request-map uri="setCustRequestStatus"> - <security https="true" auth="true"/> - <event type="service" invoke="updateCustRequest"/> - <response name="success" type="request-redirect-noparam" value="requestlist"/> - <response name="error" type="view" value="EditRequest"/> - </request-map> <request-map uri="listResourcesTask"> <security https="true" auth="true"/> <response name="success" type="view" value="listResourcesTask"/> @@ -536,51 +526,6 @@ <security https="true" auth="true"/> <response name="success" type="view" value="ListResourceBillingHours"/> </request-map> - <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map> - <request-map uri="updatePerson"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updatePerson"/> - <response name="success" type="request-redirect" value="viewprofile"/> - <response name="error" type="view" value="EditPerson"/> - </request-map> - <request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map> - <request-map uri="createPartyNote"> - <security https="true" auth="true"/> - <event type="service" invoke="createPartyNote"/> - <response name="success" type="view" value="viewprofile"/> - <response name="error" type="view" value="AddPartyNote"/> - </request-map> - <request-map uri="editcontactmech"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech"/></request-map> - <request-map uri="createContactMech"> - <security https="true" auth="true"/> - <event type="service" invoke="createPartyContactMech"/> - <response name="success" type="view" value="editcontactmech"/> - <response name="error" type="view" value="editcontactmech"/> - </request-map> - <request-map uri="updateContactMech"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePartyContactMech"/> - <response name="success" type="view" value="editcontactmech"/> - <response name="error" type="view" value="editcontactmech"/> - </request-map> - <request-map uri="deleteContactMech"> - <security https="true" auth="true"/> - <event type="service" invoke="deletePartyContactMech"/> - <response name="success" type="view" value="editcontactmech"/> - <response name="error" type="view" value="editcontactmech"/> - </request-map> - <request-map uri="createEmailAddress"> - <security https="true" auth="true"/> - <event type="service" invoke="createPartyEmailAddress"/> - <response name="success" type="view" value="editcontactmech"/> - <response name="error" type="view" value="editcontactmech"/> - </request-map> - <request-map uri="updateEmailAddress"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePartyEmailAddress"/> - <response name="success" type="view" value="editcontactmech"/> - <response name="error" type="view" value="editcontactmech"/> - </request-map> <request-map uri="EditCommunicationEvent"><security https="true" auth="true"/> <response name="success" type="view" value="EditCommunicationEvent"/> </request-map> @@ -610,41 +555,6 @@ <response name="success" type="view" value="viewprofile"/> <response name="error" type="view" value="createnewlogin"/> </request-map> - <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map> - <request-map uri="visitdetail"><security https="true" auth="true"/><response name="success" type="view" value="visitdetail"/></request-map> - <request-map uri="editlogin"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLogin"/></request-map> - <request-map uri="updatePassword"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updatePassword"/> - <response name="success" type="view" value="EditUserLogin"/> - <response name="error" type="view" value="EditUserLogin"/> - </request-map> - <request-map uri="updateUserLoginSecurity"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updateUserLoginSecurity"/> - <response name="success" type="view" value="EditUserLogin"/> - <response name="error" type="view" value="EditUserLogin"/> - </request-map> - - <request-map uri="EditUserLoginSecurityGroups"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLoginSecurityGroups"/></request-map> - <request-map uri="userLogin_addUserLoginToSecurityGroup"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="addUserLoginToSecurityGroup"/> - <response name="success" type="view" value="EditUserLoginSecurityGroups"/> - <response name="error" type="view" value="EditUserLoginSecurityGroups"/> - </request-map> - <request-map uri="userLogin_updateUserLoginToSecurityGroup"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/> - <response name="success" type="view" value="EditUserLoginSecurityGroups"/> - <response name="error" type="view" value="EditUserLoginSecurityGroups"/> - </request-map> - <request-map uri="userLogin_removeUserLoginFromSecurityGroup"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/> - <response name="success" type="view" value="EditUserLoginSecurityGroups"/> - <response name="error" type="view" value="EditUserLoginSecurityGroups"/> - </request-map> <request-map uri="addWorkEffortPartyAssign"> <security https="true" auth="true"/> <event type="service" invoke="assignPartyToWorkEffort"/> @@ -663,32 +573,6 @@ <response name="success" type="view" value="listResourcesTask"/> <response name="error" type="view" value="listResourcesTask"/> </request-map> - <request-map uri="editpartygroup"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyGroup"/></request-map> - <request-map uri="createPartyGroup"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="createPartyGroup"/> - <response name="success" type="request-redirect" value="viewprofile"/> - <response name="error" type="view" value="EditPartyGroup"/> - </request-map> - <request-map uri="updatePartyGroup"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updatePartyGroup"/> - <response name="success" type="request-redirect" value="viewprofile"/> - <response name="error" type="view" value="EditPartyGroup"/> - </request-map> - <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map> - <request-map uri="createPerson"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="createPerson"/> - <response name="success" type="request-redirect" value="viewprofile"/> - <response name="error" type="view" value="EditPerson"/> - </request-map> - <request-map uri="updatePerson"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updatePerson"/> - <response name="success" type="request-redirect" value="viewprofile"/> - <response name="error" type="view" value="EditPerson"/> - </request-map> <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map> <request-map uri="createUserLogin"> <security https="true" auth="true"/> @@ -696,14 +580,6 @@ <response name="success" type="view" value="viewprofile"/> <response name="error" type="view" value="createnewlogin"/> </request-map> - <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map> - <request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map> - <request-map uri="createPartyNote"> - <security https="true" auth="true"/> - <event type="service" invoke="createPartyNote"/> - <response name="success" type="view" value="viewprofile"/> - <response name="error" type="view" value="AddPartyNote"/> - </request-map> <request-map uri="EditPartyRates"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRates"/></request-map> <request-map uri="createPartyRate"> <security https="true" auth="true"/> @@ -766,16 +642,11 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="viewprofile" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#viewprofile"/> <view-map name="viewroles" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#viewroles"/> <view-map name="listResourcesTask" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesTask"/> <view-map name="listResourcesProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesProject"/> - <view-map name="EditPartyGroup" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartyGroup"/> - <view-map name="EditPerson" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPerson"/> <view-map name="createnewlogin" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#CreateUserLogin"/> <view-map name="showvisits" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#showvisits"/> - <view-map name="AddPartyNote" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#AddPartyNote"/> - <view-map name="editcontactmech" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#editcontactmech"/> <view-map name="EditPartyRates" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#EditPartyRates"/> <view-map name="main" type="screen" page="component://projectmgr/widget/CommonScreens.xml#Main"/> @@ -794,7 +665,6 @@ <view-map name="EditTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTask"/> <view-map name="Dependencies" type="screen" page="component://projectmgr/widget/TaskScreens.xml#Dependencies"/> <view-map name="EditTaskPartyAssigns" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskPartyAssigns"/> - <!--view-map name="EditTaskListAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskListAndAssoc"/--> <view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectParties"/> <view-map name="FindPhase" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindPhase"/> <view-map name="EditTaskSkills" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskSkills"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl Thu Apr 2 06:57:09 2009 @@ -87,7 +87,7 @@ ${custRequestItemNoteViewList.noteInfo} </td> <td> - ${custRequestItemNoteViewList.noteDateTime} + ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} </td> </tr> </#if> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Thu Apr 2 06:57:09 2009 @@ -368,22 +368,9 @@ </screen> <screen name="CommonRequestDecorator"> <section> - <actions> - </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <include-menu location="component://projectmgr/widget/Menus.xml" name="RequestTabBar"/> - <include-menu name="RequestSubTabBar" location="component://projectmgr/widget/Menus.xml"/> - <container> - <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label> - </container> - <decorator-section-include name="body"/> - </widgets> - </section> - </decorator-section> + <decorator-screen name="CommonRequestDecorator" location="component://order/widget/ordermgr/CommonScreens.xml"> + <decorator-section name="body"/> </decorator-screen> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=761186&r1=761185&r2=761186&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Thu Apr 2 06:57:09 2009 @@ -28,41 +28,9 @@ </hyperlink> </field> </form> - <form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest"> - <alt-target use-when="custRequest==null" target="createrequest"/> - <field name="custRequestId"><hidden/></field> - <field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"> - <lookup target-form-name="LookupPartyName"/> - </field> - <field name="custRequestName" title="${uiLabelMap.PartySubject}"><text/></field> - <field name="custRequestTypeId"> - <drop-down allow-empty="false"> - <entity-options entity-name="CustRequestType" description="${description}"/> - </drop-down> - </field> + <form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest" + extends="EditSmallCustRequest" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml"> <field name="description" parameter-name="story" use-when="custRequest==null"><textarea cols="60" rows="12"/></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})"> - <entity-constraint name="statusId" value="${custRequest.statusId}"/> - <entity-order-by field-name="sequenceId"/> - </entity-options> - </drop-down> - </field> - <field name="statusId" use-when="custRequest==null"><hidden value="CRQ_ACCEPTED"/></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="workEffortName"><hidden value="${custRequestName}"/></field> <field name="workEffortId"><hidden value="${custRequestId}"/></field> <field name="statusId"><hidden value="PAS_ASSIGNED"/></field> @@ -90,6 +58,20 @@ <field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><date-time type="timestamp"/></field> <field name="responseRequiredDate"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> + <sort-order> + <sort-field name="custRequestId"/> + <sort-field name="fromPartyId"/> + <sort-field name="custRequestName"/> + <sort-field name="custRequestTypeId"/> + <sort-field name="description"/> + <sort-field name="statusId"/> + <sort-field name="priority"/> + <sort-field name="childWorkEffortId"/> + <sort-field name="partyId"/> + <sort-field name="custRequestDate"/> + <sort-field name="responseRequiredDate"/> + <sort-field name="submitButton"/> + </sort-order> </form> <form name="RequestInfo" type="single" default-entity-name="CustRequest" default-map-name="custRequest" header-row-style="header-row" default-table-style="basic-table"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |