2.1.14

- make debug sql can show parameter
- fix situation report element cant capture uuid cannot render

Author: kstan79

changelog.md

@@ -9,6 +9,10 @@
 4. added ->debugsql(true)
 5. more reliable algorithm to parse `expression`
 
+## 2.1.14
+- make debug sql can show parameter
+- fix situation report element cant capture uuid cannot render
+
 
 ## 2.1.13
 - make mongodb driver not compulsory

composer.json

@@ -1,14 +1,15 @@
 {
     "name": "simitsdk/phpjasperxml",
     "description": "PHP PDF renderer of open source jasper report studio.",
-    "version": "2.1.13",
+    "version": "2.1.14",
     "require": {
         "php": ">=7.0",
         "tecnickcom/tc-lib-pdf":"*",
         "tecnickcom/tcpdf": "^6.4",
         "fakerphp/faker": "^1.17",
         "phpoffice/phpspreadsheet": "^1.20",
-        "ovidigital/js-object-to-json": "^1.1"         
+        "ovidigital/js-object-to-json": "^1.1",
+        "ramsey/uuid": "^4.9"         
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -39,20 +39,17 @@ public function setDataSource(array $setting):self
         }   
     }
 
-    public function debugsql(bool $isdebug) :self {
-        if($isdebug){
-            echo '<textarea rows=30 cols=100>' . print_r($this->querystring,true) . '</textarea>';
-            die;
-        }
-        return $this;
+    public function debugsql(string $sql) :self {        
+        echo '<textarea rows=30 cols=100>' . print_r($sql,true) . '</textarea>';
+        die;
     }
     public function fetchData() : self
     {
-        if(isset($_GET['debugsql']) && $_GET['debugsql']=='1'){
-            $this->debugsql(true);
-        }
-        $sql = $this->parseExpression($this->querystring);
 
+        $sql = $this->parseExpression($this->querystring);
+        if(!empty($_REQUEST['debugsql'])){
+            $this->debugsql($sql);
+        }
         $data =$this->db->fetchData($sql);
         if($this->debugdata){
             echo "<pre>".print_r($data,true)."</pre>";

src/PHPJasperXML_datasource.php

@@ -368,7 +368,10 @@ public function draw_subreport(string $uuid,array $prop)
             else
             {
                 $subreportExpression = str_replace('.jasper','.jrxml',$subreportExpression);
-                $filename = $this->path.'/'.$subreportExpression;
+                if(substr($subreportExpression,0,1)=='/')
+                    $filename = $subreportExpression;
+                else            
+                    $filename = $this->path.'/'.$subreportExpression;
                 // echo "<pre>".$filename."</pre>";die;
 
                 $subreport->load_xml_file($filename);

src/PHPJasperXML_elements.php

@@ -1,6 +1,6 @@
 <?php
 namespace simitsdk\phpjasperxml;
-
+use Ramsey\Uuid\Uuid;
 use SimpleXMLElement;
 
 trait PHPJasperXML_load
@@ -368,7 +368,7 @@ protected function getBandChildren($els,string $bandname)
 
             $reportelement = $objvalue->reportElement;
             $setting = $this->prop($reportelement);
-            
+            if(empty($setting['uuid']))$setting['uuid']= Uuid::uuid();
             if(!empty($setting['uuid']))
             {                                                
                 $uuid = $setting['uuid'];

src/PHPJasperXML_load.php

@@ -8,4 +8,5 @@
 return array(
     '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
     '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
+    'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php',
 );

vendor/composer/autoload_files.php

@@ -8,6 +8,8 @@
 return array(
     'simitsdk\\phpjasperxml\\' => array($baseDir . '/src'),
     'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
+    'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
+    'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),
     'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
@@ -28,4 +30,5 @@
     'Com\\Tecnick\\File\\' => array($vendorDir . '/tecnickcom/tc-lib-file/src'),
     'Com\\Tecnick\\Color\\' => array($vendorDir . '/tecnickcom/tc-lib-color/src'),
     'Com\\Tecnick\\Barcode\\' => array($vendorDir . '/tecnickcom/tc-lib-barcode/src'),
+    'Brick\\Math\\' => array($vendorDir . '/brick/math/src'),
 );