Fix m1ome#3

Author: m1ome

site/app/views/index.volt

@@ -35,7 +35,7 @@
  {{ partial('partials/column_search') }}
  <hr>
  <br><br>
- <h3>ResultSet Examples</h3>
+ <h3>Array&ResultSet Examples</h3>
  <p>
  Usage examples: Basic, Search-by-column<br>
  </p>

spec/suite/Adapters/ArraySpec.php

@@ -120,6 +120,33 @@
 
  });
 
+ it("should search a int", function() {
+
+ $_GET = [
+ 'search' => ['value' => '200'],
+ 'columns' => [
+ [
+ 'data' => 'name',
+ 'searchable' => "true"
+ ],
+ [
+ 'data' => 'balance',
+ 'searchable' => "true"
+ ]
+ ]
+ ];
+
+ $dataTables = new ArrayAdapter(20);
+ $dataTables->setArray($this->array);
+ $dataTables->setColumns(['name', 'email', 'balance']);
+ $dataTables->setParser(new ParamsParser(10));
+
+ $response = $dataTables->getResponse();
+ expect(count($response['data']))->toBe(10);
+ expect($response['recordsFiltered'])->toBe(41);
+
+ });
+
  it("should work with a column search", function() {
 
  $_GET = [

spec/suite/Adapters/ResultSetSpec.php

@@ -152,6 +152,33 @@
 
  });
 
+ it("should search a int", function() {
+
+ $_GET = [
+ 'search' => ['value' => '200'],
+ 'columns' => [
+ [
+ 'data' => 'name',
+ 'searchable' => "true"
+ ],
+ [
+ 'data' => 'balance',
+ 'searchable' => "true"
+ ]
+ ]
+ ];
+
+ $dataTables = new ResultSet(20);
+ $dataTables->setResultSet($this->query);
+ $dataTables->setColumns(['name', 'email', 'balance']);
+ $dataTables->setParser(new ParamsParser(10));
+
+ $response = $dataTables->getResponse();
+ expect(count($response['data']))->toBe(10);
+ expect($response['recordsFiltered'])->toBe(41);
+
+ });
+
  it("should work with a column&global search", function() {
 
  $_GET = [

src/Adapters/ArrayAdapter.php

@@ -5,7 +5,8 @@
 class ArrayAdapter extends AdapterInterface {
 
  protected $array = [];
- protected $filter = [];
+ protected $column = [];
+ protected $global = [];
  protected $order = [];
 
  public function setArray(array $array) {
@@ -18,25 +19,38 @@ public function getResponse() {
  $total = count($this->array);
 
  $this->bind('global_search', function($column, $search) {
- $this->filter[$column][] = $search;
+ $this->global[$column][] = $search;
  });
 
  $this->bind('column_search', function($column, $search) {
- $this->filter[$column][] = $search;
+ $this->column[$column][] = $search;
  });
 
  $this->bind('order', function($order) {
  $this->order = $order;
  });
 
- if(count($this->filter)) {
+ if(count($this->global) || count($this->column)) {
  $items = array_filter($this->array, function($item) {
- $check = true;
+ $check = false;
+
+ if (count($this->global)) {
+ foreach($this->global as $column=>$filters) {
+ foreach($filters as $search) {
+ $check = (strpos($item[$column], $search) !== false);
+ if ($check) break 2;
+ }
+ }
+ } else {
+ $check = true;
+ }
 
- foreach($this->filter as $column=>$filters) {
- foreach($filters as $search) {
- $check = (strpos($item[$column], $search) !== false);
- if (!$check) break 2;
+ if (count($this->column) && $check) {
+ foreach($this->column as $column=>$filters) {
+ foreach($filters as $search) {
+ $check = (strpos($item[$column], $search) !== false);
+ if (!$check) break 2;
+ }
  }
  }
 

src/Adapters/ResultSet.php

@@ -6,7 +6,8 @@
 class ResultSet extends AdapterInterface {
 
  protected $resultSet;
- protected $filter = [];
+ protected $column = [];
+ protected $global = [];
  protected $order = [];
 
  public function getResponse() {
@@ -15,25 +16,38 @@ public function getResponse() {
  $total = $this->resultSet->count();
 
  $this->bind('global_search', function($column, $search) {
- $this->filter[$column][] = $search;
+ $this->global[$column][] = $search;
  });
 
  $this->bind('column_search', function($column, $search) {
- $this->filter[$column][] = $search;
+ $this->column[$column][] = $search;
  });
 
  $this->bind('order', function($order) {
  $this->order = $order;
  });
 
- if(count($this->filter)) {
+ if(count($this->global) || count($this->column)) {
  $filter = $this->resultSet->filter(function($item){
- $check = true;
+ $check = false;
+
+ if (count($this->global)) {
+ foreach($this->global as $column=>$filters) {
+ foreach($filters as $search) {
+ $check = (strpos($item->$column, $search) !== false);
+ if ($check) break 2;
+ }
+ }
+ } else {
+ $check = true;
+ }
 
- foreach($this->filter as $column=>$filters) {
- foreach($filters as $search) {
- $check = (strpos($item->$column, $search) !== false);
- if (!$check) break 2;
+ if (count($this->column) && $check) {
+ foreach($this->column as $column=>$filters) {
+ foreach($filters as $search) {
+ $check = (strpos($item->$column, $search) !== false);
+ if (!$check) break 2;
+ }
  }
  }