svn commit: r785703 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: ashish
Date: Wed Jun 17 16:21:29 2009 New Revision: 785703 URL: http://svn.apache.org/viewvc?rev=785703&view=rev Log: Applied patch from jira issue OFBIZ-2622 (Paginations in SFA Screens(Account, Contacts and Leads)) Thanks Chirag for your contribution on this. Added: ofbiz/trunk/applications/marketing/webapp/sfa/account/ ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl (with props) ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl (with props) ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl (with props) Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Added: ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl?rev=785703&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl (added) +++ ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl Wed Jun 17 16:21:29 2009 @@ -0,0 +1,76 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <#if (partyListSize > 0)> + <#if (partyListSize > highIndex)> + <li><a class="nav-next button-col" href="<@ofbizUrl>FindAccounts?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li> + <#else> + <li class="disabled button-col">${uiLabelMap.CommonNext}</li> + </#if> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li> + <#if (viewIndex > 0)> + <li><a class="nav-previous button-col" href="<@ofbizUrl>FindAccounts?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li> + <#else> + <li class="disabled button-col">${uiLabelMap.CommonPrevious}</li> + </#if> + </#if> + </ul> + </div> + <div class="screenlet-body"> + <h2>${uiLabelMap.SfaFindResults}</h2> + <#if partyList?exists> + <#if partyList?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row-2"> + <td>${uiLabelMap.PartyPartyId}</td> + <td>${uiLabelMap.PartyName}</td> + <td>${uiLabelMap.PartyType}</td> + </tr> + <#assign alt_row = false> + <#list partyList as partyRow> + <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> + <td> + <#if partyRow.getModelEntity().isField("groupName") && partyRow.groupName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.groupName}</a> + <#else> + <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> + <#if partyName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyName}</a> + <#else> + (${uiLabelMap.PartyNoNameFound}) + </#if> + </#if> + </td> + <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.PartyNoPartiesFound} + </#if> + </#if> + </div> +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/account/ListAccounts.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl?rev=785703&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl (added) +++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl Wed Jun 17 16:21:29 2009 @@ -0,0 +1,75 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <#if (partyListSize > 0)> + <#if (partyListSize > highIndex)> + <li><a class="nav-next button-col" href="<@ofbizUrl>FindContacts?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li> + <#else> + <li class="disabled button-col">${uiLabelMap.CommonNext}</li> + </#if> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li> + <#if (viewIndex > 0)> + <li><a class="nav-previous button-col" href="<@ofbizUrl>FindContacts?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li> + <#else> + <li class="disabled button-col">${uiLabelMap.CommonPrevious}</li> + </#if> + </#if> + </ul> + </div> + <div class="screenlet-body"> + <h2>${uiLabelMap.SfaFindResults}</h2> + <#if partyList?exists> + <#if partyList?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row-2"> + <td>${uiLabelMap.PartyPartyId}</td> + <td>${uiLabelMap.PartyName}</td> + <td>${uiLabelMap.SfaVCard}</td> + </tr> + <#assign alt_row = false> + <#list partyList as partyRow> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> + <td> + <#if partyRow.getModelEntity().isField("lastName") && lastName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if></a> + <#else> + <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> + <#if partyName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyName}</a> + <#else> + (${uiLabelMap.PartyNoNameFound}) + </#if> + </#if> + </td> + <td><a href="<@ofbizUrl>createVCardFromContact?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.SfaVCard}<a></td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.PartyNoPartiesFound} + </#if> + </#if> + </div> +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/contact/ListContacts.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl?rev=785703&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl (added) +++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl Wed Jun 17 16:21:29 2009 @@ -0,0 +1,78 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <#if (partyListSize > 0)> + <#if (partyListSize > highIndex)> + <li><a class="nav-next button-col" href="<@ofbizUrl>FindLeads?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li> + <#else> + <li class="disabled button-col">${uiLabelMap.CommonNext}</li> + </#if> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li> + <#if (viewIndex > 0)> + <li><a class="nav-previous button-col" href="<@ofbizUrl>FindLeads?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li> + <#else> + <li class="disabled button-col">${uiLabelMap.CommonPrevious}</li> + </#if> + </#if> + </ul> + </div> + <div class="screenlet-body"> + <h2>${uiLabelMap.SfaFindResults}</h2> + <#if partyList?exists> + <#if partyList?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row-2"> + <td>${uiLabelMap.PartyPartyId}</td> + <td>${uiLabelMap.PartyName}</td> + <td>${uiLabelMap.CommonStatus}</td> + </tr> + <#assign alt_row = false> + <#list partyList as partyRow> + <#assign status = delegator.findOne("StatusItem", {"statusId":partyRow.statusId}, false)?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> + <td> + <#if partyRow.getModelEntity().isField("groupName") && partyRow.groupName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.groupName}</a> + <#elseif partyRow.getModelEntity().isField("lastName") && lastName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if></a> + <#else> + <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> + <#if partyName?has_content> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyName}</a> + <#else> + (${uiLabelMap.PartyNoNameFound}) + </#if> + </#if> + </td> + <td><#if status.description?exists>${status.get("description", locale)}<#else>???</#if></td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.PartyNoPartiesFound} + </#if> + </#if> + </div> +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/ListLeads.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=785703&r1=785702&r2=785703&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Wed Jun 17 16:21:29 2009 @@ -40,32 +40,11 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html> + <html> + <html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/> + <html-template location="component://marketing/webapp/sfa/account/ListAccounts.ftl"/> + </html> </platform-specific> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.SfaFindResults}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <condition> - <not> - <if-empty field="partyList"/> - </not> - </condition> - <widgets> - <include-form name="ListAccounts" location="component://marketing/widget/sfa/forms/AccountForms.xml"/> - </widgets> - <fail-widgets> - <container style="h3"> - <label text="${uiLabelMap.PartyNoPartiesFound}"/> - </container> - </fail-widgets> - </section> - </container> - </container> </widgets> </section> </widgets> Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=785703&r1=785702&r2=785703&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Wed Jun 17 16:21:29 2009 @@ -37,28 +37,11 @@ <widgets> <include-menu name="ContactSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> <platform-specific> - <html><html-template location="component://marketing/webapp/sfa/party/findContactParty.ftl"/></html> + <html> + <html-template location="component://marketing/webapp/sfa/party/findContactParty.ftl"/> + <html-template location="component://marketing/webapp/sfa/contact/ListContacts.ftl"/> + </html> </platform-specific> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"><label text="${uiLabelMap.SfaFindResults}"/></container> - </container> - <container style="screenlet-body"> - <section> - <condition> - <not><if-empty field="partyList"/></not> - </condition> - <widgets> - <include-form name="ListContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> - </widgets> - <fail-widgets> - <container style="h3"> - <label text="${uiLabelMap.PartyNoPartiesFound}"/> - </container> - </fail-widgets> - </section> - </container> - </container> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=785703&r1=785702&r2=785703&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Wed Jun 17 16:21:29 2009 @@ -37,25 +37,11 @@ <include-menu name="LeadSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> <container style="no-clear"> <platform-specific> - <html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html> + <html> + <html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/> + <html-template location="component://marketing/webapp/sfa/lead/ListLeads.ftl"/> + </html> </platform-specific> - <screenlet title="${uiLabelMap.SfaFindResults}"> - <section> - <condition> - <not> - <if-empty field="partyList"/> - </not> - </condition> - <widgets> - <include-form name="ListLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/> - </widgets> - <fail-widgets> - <container style="h3"> - <label text="${uiLabelMap.PartyNoPartiesFound}"/> - </container> - </fail-widgets> - </section> - </screenlet> </container> </widgets> </section> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=785703&r1=785702&r2=785703&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Wed Jun 17 16:21:29 2009 @@ -21,23 +21,6 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListAccounts" type="list" list-name="partyList" paginate-target="FindAccount" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <row-actions> - <entity-one entity-name="PartyGroup" value-field="partyGroup"/> - </row-actions> - <field name="partyId" title="${uiLabelMap.PartyPartyId}"> - <hyperlink target="viewprofile" description="${partyId}" target-type="inter-app"> - <parameter param-name="partyId"/> - </hyperlink> - </field> - <field name="partyName" title="${uiLabelMap.PartyName}"> - <hyperlink target="viewprofile" description="${partyGroup.groupName}" target-type="inter-app"> - <parameter param-name="partyId"/> - </hyperlink> - </field> - <field name="partyTypeId" title="${uiLabelMap.PartyType}"><display-entity entity-name="PartyType"/></field> - </form> <form name="NewAccount" type="single" target="createAccount" header-row-style="header-row" default-table-style="basic-table"> <field name="accountType"><hidden value="${accountType}"/></field> <field name="groupName" title="${uiLabelMap.PartyGroupName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=785703&r1=785702&r2=785703&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Wed Jun 17 16:21:29 2009 @@ -21,27 +21,6 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListLeads" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindLead" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> - <row-actions> - <entity-one entity-name="PartyNameView" value-field="partyName"> - <field-map field-name="partyId" from-field="partyRow.partyId"/> - </entity-one> - <set field="statusId" from-field="partyRow.statusId"/> - </row-actions> - <field name="partyId" title="${uiLabelMap.PartyPartyId}"> - <hyperlink target="viewprofile" description="${partyRow.partyId}"> - <parameter param-name="partyId" from-field="partyRow.partyId"/> - </hyperlink> - </field> - <field name="partyName" title="${uiLabelMap.PartyName}"> - <hyperlink target="viewprofile" description="${partyName.lastName}${partyName.groupName} ${partyName.firstName} "> - <parameter param-name="partyId" from-field="partyRow.partyId"/> - </hyperlink> - </field> - <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field> - </form> - <form name="createLead" type="single" target="createLead" header-row-style="header-row" default-table-style="basic-table" default-map-name="contactDetailMap"> <field name="firstName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> <field name="lastName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |