svn commit: r671826 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: hansbak
Date: Thu Jun 26 01:49:12 2008 New Revision: 671826 URL: http://svn.apache.org/viewvc?rev=671826&view=rev Log: cleanup the comm screens combining find and search and intrucing screenlets....could not get the paging inside the screenlet working... Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=671826&r1=671825&r2=671826&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Jun 26 01:49:12 2008 @@ -248,7 +248,7 @@ <value xml:lang="zh">æ²éäºä»¶ç®çç±»åæ è¯</value> </property> <property key="FormFieldTitle_communicationEventTypeId"> - <value xml:lang="en">Communication Event Type Id</value> + <value xml:lang="en">Comm.Type Id</value> <value xml:lang="fr">Identifiant type de communication</value> <value xml:lang="it">Tipo Evento Communicazioni</value> <value xml:lang="nl">Communication Event Type Id</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=671826&r1=671825&r2=671826&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jun 26 01:49:12 2008 @@ -20,27 +20,6 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <!--form name="viewCommunication1" type="single" target="editCommunication" default-map-name="communicationEvent"> - <alt-target target="createCommunicationEvent" use-when="communicationEvent==null"/> - <field name="communicationEventId" use-when="communicationEvent != null"><display/></field> - <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView"><sub-hyperlink target="viewprofile?partyId=${partyIdFrom}" description="${firstName} ${middleName} ${lastName} ${groupName}"/></display-entity></field> - <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display/></field> - <field name="statusId" use-when="statusId==null"><display/></field> - <field name="statusId" use-when="statusId!=null"><display/></field> - <field name="contactMechTypeId" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null"><display/></field> - <field name="contactMechTypeId" use-when="commEventContactMechType==null&&parentCommEventContactMechType!=null"><display/></field> - <field name="contactMechTypeId" use-when="commEventContactMechType==null&&parentCommEventContactMechType==null"><display/></field> - <field name="roleTypeIdFrom" use-when="commEventRoleTypeIdFrom!=null"><display/></field> - <field name="roleTypeIdTo" use-when="commEventRoleTypeIdTo!=null"><display/></field> - <field name="custRequestId"><display/></field> - <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field> - <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field> - <field map-name="subjectMap" name="subject"><display/></field> - <field map-name="subjectMap" name="note" title="${uiLabelMap.CommonNote}"><display/></field> - <field name="content" title="${uiLabelMap.CommonContent}"><text size="1"/></field> - <field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit button-type="button"/></field> - </form--> - <form name="EditCommEvent" type="single" target="updateCommunicationEvent" default-map-name="communicationEvent" header-row-style="header-row" default-table-style="basic-table"> <actions> @@ -244,7 +223,7 @@ </field> </form> - <form name="findCommEvents" type="single" target="ListLookupCommEvents" paginate="true" + <form name="findCommEvents" type="single" target="FindCommunicationEvents" paginate="true" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId" use-when="communicationEvent != null"><text-find/></field> <field name="parentCommEventId"><text-find/></field> @@ -268,7 +247,7 @@ <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/> </drop-down> </field> - <field name="roleTypeIdFrom"> + <!--field name="roleTypeIdFrom"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/> </drop-down> @@ -277,9 +256,9 @@ <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/> </drop-down> - </field> + </field--> <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field> - <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field> + <!--field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field> <field name="reasonEnumId"> <drop-down no-current-selected-key="" allow-empty="true"> @@ -288,7 +267,7 @@ <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> - </field> + </field--> <field map-name="subjectMap" name="subject"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> @@ -296,8 +275,10 @@ </form> <form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="communicationEventId" widget-style="smallSubmit"> - <hyperlink description="${communicationEventId}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="intra-app"/> + <field name="communicationEventId"><hidden/></field> + <field name="communicationEventTypeId"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field> + <field name="subject"> + <hyperlink description="${subject}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}"/> </field> <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"> <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/> @@ -305,8 +286,6 @@ <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"> <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/> </field> - <field map-name="subjectMap" name="subject"><display/></field> - <field name="communicationEventTypeId"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field> <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <!-- Next two fields don't seem to be used, commenting out for now --> @@ -329,9 +308,6 @@ <order-by field-name="-lastUpdatedStamp"/> </entity-condition> </actions> - <field name="communicationEventId" widget-style="smallSubmit"> - <hyperlink description="${communicationEventId}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}&partyId=${partyId}" target-type="intra-app"/> - </field> <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}"/> </field> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=671826&r1=671825&r2=671826&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Jun 26 01:49:12 2008 @@ -108,64 +108,6 @@ </widgets> </section> </screen> - <screen name="ListLookupCommEvents"> - <section> - <actions> - <set field="titleProperty" value="PageTitleCommEvents"/> - <set field="headerItem" value="comm"/> - <set field="tabButtonItem" value="PartyCommEvents"/> - <set field="subTabButtonItem" value="CommunicationEvent"/> - <set field="partyId" value="${parameters.partyId}"/> - <set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/> - <set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/> - <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> - <set field="entityName" value="CommunicationEvent"/> - </actions> - <widgets> - <decorator-screen location="${parameters.mainDecoratorLocation}" name="main-decorator"> - <decorator-section name="body"> - <section> - <condition> - <if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/> - </condition> - <widgets> - <section> - <condition> - <not><if-empty field-name="partyId"/></not> - </condition> - <widgets> - <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/> - </widgets> - </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyFoundCommunicationEvents}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container style="button-bar"> - <link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/> - <link style="smallSubmit" target="FindCommunicationEvents" text="${uiLabelMap.PartyNewFind}"/> - </container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/> - </widgets> - </section> - </container> - </container> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="FindCommunicationEvents"> <section> <actions> @@ -174,7 +116,8 @@ <set field="headerItem" value="comm"/> <set field="tabButtonItem" value="find"/> <set field="entityName" value="CommunicationEvent"/> - <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> </actions> <widgets> <decorator-screen location="${parameters.mainDecoratorLocation}" name="main-decorator"> @@ -192,21 +135,13 @@ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/> </widgets> </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyFindCommunicationEvents}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PartyFindCommunicationEvents}" collapsible="true" id="FindCommunicationEvents"> + <container><link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/> + </screenlet> + <screenlet title="${uiLabelMap.PartyFoundCommunicationEvents}" navigation-form-name="FindCommunicationEvents"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/> + </screenlet> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -307,34 +242,30 @@ <decorator-section name="body"> <section> <widgets> - <section> - <widgets> - <container style="button-bar"> - <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/> - <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&parentCommEventId=${communicationEventId}" text="${uiLabelMap.PartyReply}"/> - <!--<link style="smallSubmit" target="EditCommunicationEvent?communicationEventTypeId=${communicationEvent.communicationEventTypeId}&contactMechIdTo=${communicationEvent.contactMechIdFrom}&contactMechIdFrom=${communicationEvent.contactMechIdTo}&partyId=${partyId}&partyIdTo=${partyId}&partyIdFrom=${userLogin.partyId}&parentCommEventId=${communicationEventId}&toString=${communicationEvent.fromString}" text="${uiLabelMap.PartyReply}"/>--> - </container> - </widgets> - </section> - <section> - <condition> - <if-compare field-name="okayToUpdate" operator="equals" value="true" type="Boolean"/> - </condition> - <widgets> - <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/> - </screenlet> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> - </widgets> - <fail-widgets> - <screenlet id="ViewPartyNewCommunicationPanel" title="${uiLabelMap.PartyNewCommunication}" collapsible="true"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/> - </screenlet> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> - </fail-widgets> - </section> + <container style="button-bar"> + <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/> + <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&parentCommEventId=${communicationEventId}" text="${uiLabelMap.PartyReply}"/> + <!--<link style="smallSubmit" target="EditCommunicationEvent?communicationEventTypeId=${communicationEvent.communicationEventTypeId}&contactMechIdTo=${communicationEvent.contactMechIdFrom}&contactMechIdFrom=${communicationEvent.contactMechIdTo}&partyId=${partyId}&partyIdTo=${partyId}&partyIdFrom=${userLogin.partyId}&parentCommEventId=${communicationEventId}&toString=${communicationEvent.fromString}" text="${uiLabelMap.PartyReply}"/>--> + </container> </widgets> </section> + <section> + <condition> + <if-compare field-name="okayToUpdate" operator="equals" value="true" type="Boolean"/> + </condition> + <widgets> + <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/> + </screenlet> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + </widgets> + <fail-widgets> + <screenlet id="ViewPartyNewCommunicationPanel" title="${uiLabelMap.PartyNewCommunication}" collapsible="true"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/> + </screenlet> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + </fail-widgets> + </section> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |