Table buttons remove clear selection, add toggle buton to enable/disa…

…ble table for only features inside map extent Fix for QGIS Server 3 Loading of CSS file fixed for Editing plugin
level2-gis · Jan 13, 2019 · 38469da · 38469da
1 parent 1de956a
commit 38469da
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 9 deletions.
diff --git a/admin/class.Helpers.php b/admin/class.Helpers.php
@@ -525,6 +525,18 @@ public static function getEqwcVersion() {
         return $version;
     }
 
+    public static function getPluginVersion($name) {
+        $version = '0';
+        $dir = dirname(dirname(__FILE__)) . "/plugins/";
+        if (self::checkModulexist($name)) {
+            if (file_exists($dir . $name . '/changelog.txt')) {
+                $version = trim(file_get_contents($dir . $name . '/changelog.txt',null,null,null,5));
+            }
+        }
+        return $version;
+    }
+
+
     public static function getClientPath() {
         $root = filter_input(INPUT_SERVER,'DOCUMENT_ROOT',FILTER_SANITIZE_STRING);
         if (basename($root)=='gisportal') {

diff --git a/client/site/css/contextMenu.css b/client/site/css/contextMenu.css
@@ -30,6 +30,13 @@
     background-image:url(../gis_icons/mActionClear.png);
 }
 
+.x-extent-icon {
+    background-image:url(../gis_icons/extents.png);
+    height:16px;
+    background-position:center right;
+}
+
+
 .x-exclamation-icon {
     background-image:url(../libs/ext/resources/images/access/form/exclamation.gif);
     height:16px;

diff --git a/client/site/gis_icons/extents.png b/client/site/gis_icons/extents.png
diff --git a/client/site/js/LayerActions.js b/client/site/js/LayerActions.js
@@ -445,6 +445,12 @@ function loadMore() {
     grid.onSubmit();
 }
 
+function switchBbox(btn,state) {
+    var grid = this;
+    grid.useBbox = state;
+    grid.onSubmit(true);
+}
+
 function applyWMSFilter(item) {
     var idx = item.itemId.split('_')[1]-1;
     var node = layerTree.getSelectionModel().getSelectedNode();

diff --git a/client/site/js/QGISExtensions.js b/client/site/js/QGISExtensions.js
@@ -919,9 +919,10 @@ QGIS.SearchPanel = Ext.extend(Ext.Panel, {
         if(this.gridLocation=='bottom') {
             maskElement = Ext.getCmp('BottomPanel');
         }
+        //moved
         // Make sure it's shown and expanded
-        maskElement.show();
-        maskElement.collapsible && maskElement.expand();
+        //maskElement.show();
+        //maskElement.collapsible && maskElement.expand();
 
         if (this.useWmsRequest) {
             //alert(maskElement.id);
@@ -990,11 +991,21 @@ QGIS.SearchPanel = Ext.extend(Ext.Panel, {
             'QUERY_LAYERS': layerId,
             'FEATURE_COUNT': this.gridResults,
             'INFO_FORMAT': 'text/xml',
-            'SRS': authid,
-            'FILTER': filter
+            'CRS': authid
+            //'FILTER': filter
         };
         if (this.useBbox) {
-            params.BBOX=geoExtMap.map.calculateBounds().left+","+geoExtMap.map.calculateBounds().bottom+","+geoExtMap.map.calculateBounds().right+","+geoExtMap.map.calculateBounds().top;
+            //qgis3 workaround
+            if(Eqwc.settings.qgisVersion && parseInt(Eqwc.settings.qgisVersion)>2) {
+                var xx = geoExtMap.map.getExtent().toGeometry();
+                params.FILTER_GEOM = xx.toString();
+            } else {
+                params.FILTER = filter;
+                params.BBOX=geoExtMap.map.calculateBounds().left+","+geoExtMap.map.calculateBounds().bottom+","+geoExtMap.map.calculateBounds().right+","+geoExtMap.map.calculateBounds().top;
+            }
+
+        } else {
+            params.FILTER = filter;
         }
 
         if (fieldsValidate) {

diff --git a/client/site/js/WebgisInit_functions.js b/client/site/js/WebgisInit_functions.js
@@ -1589,6 +1589,11 @@ function showSearchPanelResults(searchPanelInstance, features) {
                 searchPanelId = 'table_'+searchPanelInstance.queryLayer;
                 collapsible = false; // No collapsible in bottom
                 autoHeight = false;
+
+                // Make sure it's shown and expanded
+                targetComponent.show();
+                targetComponent.collapsible && targetComponent.expand();
+
                 break;
             case 'popup':
                 if (typeof(Ext.getCmp('SearchResultsPopUp')) == 'undefined') {
@@ -1759,12 +1764,22 @@ function showSearchPanelResults(searchPanelInstance, features) {
                 }
             },
                 {
-                    iconCls: 'x-clear-icon',
-                    tooltip: TR.clearSelection,
+                    iconCls: 'x-extent-icon',
+                    tooltip: TR.tableUseExtent,
+                    pressed: Eqwc.settings.syncAttributeTableWithView,
                     //scale: 'medium',
                     //disabled: true,
-                    handler: clearTableSelection
+                    enableToggle: true,
+                    toggleHandler: switchBbox,
+                    scope: searchPanelInstance
                 },
+                //{
+                //    iconCls: 'x-clear-icon',
+                //    tooltip: TR.clearSelection,
+                //    //scale: 'medium',
+                //    //disabled: true,
+                //    handler: clearTableSelection
+                //},
                 {
                     itemId: 'loadmore',
                     iconCls: 'x-exclamation-icon',

diff --git a/index.php b/index.php
@@ -219,6 +219,7 @@ function goMobile($lang) {
 if ($login_check->isValidUserProj($helpers->getMapFromUrl())) {
 
     $edit = $helpers->checkModulexist("editing");
+    $editVer = $helpers->getPluginVersion("editing");
     $google = $helpers->loadGoogle();
 
 	//OK open application
@@ -244,7 +245,7 @@ function goMobile($lang) {
                 <link rel="stylesheet" type="text/css" href="client/site/css/contextMenu.css?v=20180320"/>
 
                 <?php if ($edit) {
-                    echo '<link rel="stylesheet" type="text/css" href="plugins/editing/theme/geosilk/geosilk.css?v=20181107"/>';
+                    echo '<link rel="stylesheet" type="text/css" href="plugins/editing/theme/geosilk/geosilk.css?v='.$editVer.'"/>';
                 }?>
 
                 <script type="text/javascript" src="client_common/load.php"></script>