svn commit: r1667969 - in /ofbiz/trunk/framework/webtools: config/WebtoolsUiLabels.xml webapp/webtools/WEB-INF/controller.xml widget/GeoManagementForms.xml widget/GeoManagementScreens.xml widget/Menus.xml

Author: jleroux
Date: Fri Mar 20 09:48:24 2015
New Revision: 1667969

URL: http://svn.apache.org/r1667969
Log:
A patch from Pierre Smits for "Adding GeoPoints overview to geo management" https://issues.apache.org/jira/browse/OFBIZ-6148


Modified:
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml
    ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
    ofbiz/trunk/framework/webtools/widget/Menus.xml

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1667969&r1=1667968&r2=1667969&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Fri Mar 20 09:48:24 2015
@@ -2441,6 +2441,9 @@
         <value xml:lang="zh">链接地理（把它们关联到一个地理位置）</value>
         <value xml:lang="zh-TW">連結地理(把它們結合到一個地理位置)</value>
     </property>
+    <property key="WebtoolsGeoPoints">
+        <value xml:lang="en">GEO Points</value>
+    </property>
     <property key="WebtoolsGeosSelect">
         <value xml:lang="en">Select Geos to associate</value>
         <value xml:lang="fr">Sélectionnez les zones géographiques à associer</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1667969&r1=1667968&r2=1667969&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Fri Mar 20 09:48:24 2015
@@ -543,6 +543,7 @@ under the License.
 
     <!-- Geo Management -->
     <request-map uri="FindGeo"><security https="true" auth="true"/><response name="success" type="view" value="FindGeo" save-home-view="true"/></request-map>
+    <request-map uri="geoPoints"><security https="true" auth="true"/><response name="success" type="view" value="geoPoints" save-home-view="true"/></request-map>
     <request-map uri="EditGeo"><security https="true" auth="true"/><response name="success" type="view" value="EditGeo"/></request-map>
     <request-map uri="LinkGeos"><security https="true" auth="true"/><response name="success" type="view" value="LinkGeos"/></request-map>
     <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
@@ -672,9 +673,10 @@ under the License.
 
     <!-- Geo Management -->
     <view-map name="FindGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#FindGeo"/>
+    <view-map name="geoPoints" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#GeoPoints"/>
     <view-map name="EditGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#EditGeo"/>
     <view-map name="LinkGeos" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LinkGeos"/>
-    <view-map name="LookupGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LookupGeo"/>    
+    <view-map name="LookupGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LookupGeo"/>
     
     <view-map name="WebtoolsLayoutDemo" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemo" type="screen"/>
 

Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml?rev=1667969&r1=1667968&r2=1667969&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml Fri Mar 20 09:48:24 2015
@@ -21,7 +21,23 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
-    <form name="FindGeo" id="FindGeo" target="${currentUrl}" extends="LookupGeo" extends-resource="component://common/widget/LookupForms.xml"/>        
+    <form name="FindGeo" id="FindGeo" target="${currentUrl}" extends="LookupGeo" extends-resource="component://common/widget/LookupForms.xml"/>
+    
+    <form name="FindGeoPoint" id="FindGeo" target="${currentUrl}"  type="single" header-row-style="header-row" default-table-style="basic-table">
+        <field name="geoPointId" title="${uiLabelMap.CommonId}"><text-find/></field>
+        <field name="dataSourceId" title="${uiLabelMap.Source}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="DataSource" description="${description}">
+                    <entity-constraint name="dataSourceTypeId" value="GEOPOINT_SUPPLIER"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="latitude" title="${uiLabelMap.CommonLatitude}"><text-find/></field>
+        <field name="longitude" title="${uiLabelMap.CommonLongitude}"><text-find/></field>
+        <field name="information"><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>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
     
     <form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="listLookupGeo" paginate-target="${currentUrl}"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true" >
@@ -38,20 +54,42 @@
             </hyperlink>
         </field>
     </form>
+    <form name="ListGeoPoints" paginate-target="${currentUrl}" type="list" separate-columns="true" default-entity-name="GeoPoint" list-name="listIt" paginate="true"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" value="GeoPoint"/>
+                <field-map field-name="orderBy" value="geoPointId"/>
+                <field-map field-name="viewIndex" from-field="viewIndex"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+            </service>
+        </actions>
+        <field name="geoPointId" widget-style="buttontext" title="${uiLabelMap.CommonId}"><display/>
+        </field>
+        <field name="dataSourceId" title="${uiLabelMap.Source}"><display/></field>
+        <field name="latitude"  title="${uiLabelMap.CommonLatitude}"><display/></field>
+        <field name="longitude" title="${uiLabelMap.CommonLongitude}"><display/></field>
+        <field name="elevation"  title="${uiLabelMap.Elevation}" title-area-style="align-right" widget-area-style="align-right"><display/></field>
+        <field name="elevationUomId" title="${uiLabelMap.CommonUom}">
+            <display-entity entity-name="Uom" key-field-name="uomId" description="${abbreviation}"/>
+        </field>
+        <field name="information"><display/></field>
+    </form>
     
     <form name="EditGeo" type="single" target="updateGeo" title="" default-map-name="geo"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="geo==null" target="createGeo"/>
-        <field name="geoId" title="${uiLabelMap.CommonGeoId}"><lookup target-form-name="LookupGeo"/></field>
-        <field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
+        <field name="geoId" title="${uiLabelMap.CommonId}"><lookup target-form-name="LookupGeo"/></field>
+        <field name="geoTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="geoName" title="${uiLabelMap.CommonGeoName}"><text/></field>
-        <field name="geoCode" title="${uiLabelMap.CommonGeoCode}"><text/></field>
+        <field name="geoName" title="${uiLabelMap.CommonName}"><text/></field>
+        <field name="geoCode" title="${uiLabelMap.CommonCode}"><text/></field>
         <field name="geoSecCode" title="${uiLabelMap.CommonGeoSecCode}"><text/></field>
         <field name="abbreviation" title="${uiLabelMap.CommonGeoAbbr}"><text/></field>
         <field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><textarea/></field>
@@ -61,8 +99,8 @@
     <form name="ListLookupGeo" extends="ListGeos">
         <field name="geoId" title="${uiLabelMap.CommonGeoId}" widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_value('${geoId}')"/>
-        </field>        
-        <field name="deleteLink"><ignored/></field>        
+        </field>
+        <field name="deleteLink"><ignored/></field>
     </form>
     
     <form name="LinkGeos" type="single" target="linkGeos" title="" focus-field-name="geoId"

Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1667969&r1=1667968&r2=1667969&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Fri Mar 20 09:48:24 2015
@@ -26,6 +26,7 @@
                 <set field="titleProperty" value="WebtoolsGeosFind"/>
                 <set field="currentUrl" value="FindGeo"/>
                 <set field="headerItem" value="Geos"/>
+                <set field="tabButtonItem" value="FindGeo"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonGeoManagementDecorator" location="${parameters.mainDecoratorLocation}">
@@ -45,6 +46,34 @@
             </widgets>
         </section>
     </screen>
+    <screen name="GeoPoints">
+        <section>
+            <actions>
+                <set field="titleProperty" value="WebtoolsGeoPoints"/>
+                <set field="currentUrl" value="geoPoints"/>
+                <set field="headerItem" value="Geos"/>
+                <set field="tabButtonItem" value="GeoPoints"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonGeoManagementDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="no-clear">
+                            <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                <decorator-section name="search-options">
+                                    <include-form name="FindGeoPoint" location="component://webtools/widget/GeoManagementForms.xml"/>
+                                </decorator-section>
+                                <decorator-section name="search-results">
+                                    <screenlet title="${uiLabelMap.WebtoolsGeoPoints}">
+                                        <include-form name="ListGeoPoints" location="component://webtools/widget/GeoManagementForms.xml"/>
+                                    </screenlet>
+                                </decorator-section>
+                            </decorator-screen>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     
     <screen name="EditGeo">
         <section>
@@ -97,6 +126,7 @@
                 <set field="titleProperty" value="WebtoolsGeosLink"/>
                 <set field="currentUrl" value="LinkGeos"/>
                 <set field="headerItem" value="Geos"/>
+                <set field="tabButtonItem" value="LinkGeos"/>
                 
                 <set field="noId" value="true"/><!-- see CommonGeoManagementDecorator -->
                 

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1667969&r1=1667968&r2=1667969&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Fri Mar 20 09:48:24 2015
@@ -262,7 +262,7 @@ under the License.
     <menu name="geoManagement" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <!--menu-container-style="button-bar button-style-2 no-clear"-->
         <menu-item name="FindGeo" title="${uiLabelMap.WebtoolsGeosFind}">
-            <link target="FindGeo"/>            
+            <link target="FindGeo"/>
         </menu-item>
         <menu-item name="EditGeo" title="${uiLabelMap.WebtoolsGeoCreateNew}">
             <link target="EditGeo"/>
@@ -270,6 +270,9 @@ under the License.
         <menu-item name="LinkGeos" title="${uiLabelMap.WebtoolsGeosLink}">
             <link target="LinkGeos"/>
         </menu-item>
+        <menu-item name="GeoPoints" title="${uiLabelMap.WebtoolsGeoPoints}">
+            <link target="geoPoints"/>
+        </menu-item>
     </menu>
     
     <menu name="LayoutDemo" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">