Fix Table widget's emptyValue for numeric columns

Author: dongnl

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Change Log
 
-## Version 6.6.2
+## Version 6.6.5
 1. Fix KoolReport.js
+2. Add multiple join processes: `LeftJoin`, `RightJoin`, `FullJoin`
+3. Add multiple DataStore's join methods: `rightJoin()`, `fullJoin()`
+4. Fix Table widget's emptyValue for numeric columns
 
 ## Version 6.6.1
 1. Fix KoolReport.js for chart export to work

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "koolreport/core",
-    "version":"6.6.2",
+    "version":"6.6.5",
     "description": "An Open Source PHP Reporting Framework for easier and faster report delivery.",
     "keywords": ["php reporting framework","php reporting tools","data processing","data visualization","charts and graphs"],
     "homepage": "https://www.koolreport.com",

src/processes/FullJoin.php

@@ -29,6 +29,50 @@
  * @license   MIT License https://www.koolreport.com/license#mit-license
  * @link      https://www.koolphp.net
  */
-class FullJoin extends OuterJoin
+class FullJoin extends Join
 {
+    /**
+     * Handle on input end
+     * 
+     * @return null
+     */
+    protected function onInputEnd()
+    {
+        $containerBak = $this->container;
+        foreach ($this->container[0]["data"] as $key => $rows) {
+            if (isset($this->container[1]["data"][$key])) {
+                foreach ($rows as $first) {
+                    foreach ($this->container[1]["data"][$key] as $second) {
+                        $this->next(array_merge($first, $second));
+                    }
+                }
+                unset($this->container[1]["data"][$key]);
+            } else {
+                foreach ($rows as $first) {
+                    foreach ($rows as $first) {
+                        $mergedRow = $first;
+                        foreach ($this->secondSideKeys as $k) {
+                            if (!isset($mergedRow[$k])) $mergedRow[$k] = null;
+                        }
+                        $this->next($mergedRow);
+                    }
+                }
+            }
+            unset($this->container[0]["data"][$key]);
+        }
+
+        $this->container = $containerBak;
+        foreach ($this->container[1]["data"] as $key => $rows) {
+            if (!isset($this->container[0]["data"][$key])) {
+                foreach ($rows as $second) {
+                    foreach ($this->firstSideKeys as $k) {
+                        $mergedRow[$k] = null;
+                    }
+                    $mergedRow = array_merge($mergedRow, $second);
+                    $this->next($mergedRow);
+                }
+            }
+            unset($this->container[1]["data"][$key]);
+        }
+    }
 }

src/processes/OuterJoin.php

@@ -29,51 +29,6 @@
  * @license   MIT License https://www.koolreport.com/license#mit-license
  * @link      https://www.koolphp.net
  */
-class OuterJoin extends Join
-{
-    /**
-     * Handle on input end
-     * 
-     * @return null
-     */
-    protected function onInputEnd()
-    {
-        $containerBak = $this->container;
-        foreach ($this->container[0]["data"] as $key => $rows) {
-            if (isset($this->container[1]["data"][$key])) {
-                foreach ($rows as $first) {
-                    foreach ($this->container[1]["data"][$key] as $second) {
-                        $this->next(array_merge($first, $second));
-                    }
-                }
-                unset($this->container[1]["data"][$key]);
-            } else {
-                foreach ($rows as $first) {
-                    foreach ($rows as $first) {
-                        $mergedRow = $first;
-                        foreach ($this->secondSideKeys as $k) {
-                            if (!isset($mergedRow[$k])) $mergedRow[$k] = null;
-                        }
-                        $this->next($mergedRow);
-                    }
-                }
-            }
-            unset($this->container[0]["data"][$key]);
-        }
-
-        $this->container = $containerBak;
-        foreach ($this->container[1]["data"] as $key => $rows) {
-            if (!isset($this->container[0]["data"][$key])) {
-                foreach ($rows as $second) {
-                    foreach ($this->firstSideKeys as $k) {
-                        $mergedRow[$k] = null;
-                    }
-                    $mergedRow = array_merge($mergedRow, $second);
-                    $this->next($mergedRow);
-                }
-            }
-            unset($this->container[1]["data"][$key]);
-        }
-    }
-
+class OuterJoin extends FullJoin
+{    
 }

src/widgets/koolphp/Table.tpl.php

@@ -135,7 +135,7 @@
                     }
                     ?>
                         <td rv="<?php echo (in_array(gettype($value),array("array")))?"":htmlspecialchars($value);?>" <?php echo ($tdStyle)?"style='$tdStyle'":""; ?> <?php if($tdClass){echo " class='".((gettype($tdClass)=="string")?$tdClass:$tdClass($row,$cKey))."'";} ?>>
-                            <?php echo Table::formatValue($value, $meta["columns"][$cKey], $row, $cKey);?>
+                            <?php echo isset($row[$cKey]) ? Table::formatValue($value, $meta["columns"][$cKey], $row, $cKey) : $this->emptyValue;?>
                         </td>
                     <?php
                 }