From 61080006620ab81366bdbcd20179f9d70d249cd7 Mon Sep 17 00:00:00 2001
From: Imants Horsts <DarkSide666@users.noreply.github.com>
Date: Wed, 1 Apr 2020 15:40:41 +0300
Subject: [PATCH] fix compatibility (#7)

---
 demo/{demo.php => index.php} | 19 +++++++++++++------
 src/Chart.php                |  4 ++--
 src/PieChart.php             |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)
 rename demo/{demo.php => index.php} (62%)

diff --git a/demo/demo.php b/demo/index.php
similarity index 62%
rename from demo/demo.php
rename to demo/index.php
index c9020cd..8f41f57 100644
--- a/demo/demo.php
+++ b/demo/index.php
@@ -1,28 +1,35 @@
 <?php
 require '../vendor/autoload.php';
 
+use atk4\chart\ChartBox;
+use atk4\chart\BarChart;
+use atk4\chart\PieChart;
+use atk4\data\Model;
+use atk4\data\Persistence\Array_;
+use atk4\ui\App;
+
 $p = ['t'=>[
     [ 'name'=>'January', 'sales'=>20000, 'purchases'=>10000, ],
     [ 'name'=>'February', 'sales'=>23000, 'purchases'=>12000, ],
     [ 'name'=>'March', 'sales'=>16000, 'purchases'=>11000, ],
     [ 'name'=>'April', 'sales'=>14000, 'purchases'=>13000, ],
 ]];
-$m = new \atk4\data\Model(new \atk4\data\Persistence_Array($p), 't');
+$m = new Model(new Array_($p), 't');
 $m->addFields(['name', 'sales', 'purchases', 'profit']);
 $m->addHook('afterLoad', function($m) { $m['profit'] = $m['sales'] - $m['purchases']; });
-$app = new \atk4\ui\App('Chart Demo');
+$app = new App('Chart Demo');
 $app->initLayout('Centered');
 
 // Lets put your chart into a box:
 $columns = $app->layout->add('Columns');
-$cb = $columns->addColumn(10)->add(new \atk4\chart\ChartBox(['label'=>['Demo Chart', 'icon'=>'book']]));
-$chart = $cb->add(new \atk4\chart\BarChart());
+$cb = $columns->addColumn(10)->add(new ChartBox(['label'=>['Demo Chart', 'icon'=>'book']]));
+$chart = $cb->add(new BarChart());
 $chart->setModel($m, ['name', 'sales', 'purchases','profit']);
 $chart->withCurrency('$');
 
 // Tweak our chart to support currencies better
 
-$cb = $columns->addColumn(6)->add(new \atk4\chart\ChartBox(['label'=>['Demo Chart', 'icon'=>'book']]));
-$chart = $cb->add(new \atk4\chart\PieChart());
+$cb = $columns->addColumn(6)->add(new ChartBox(['label'=>['Demo Chart', 'icon'=>'book']]));
+$chart = $cb->add(new PieChart());
 $chart->setModel($m, ['name', 'profit']);
 $chart->withCurrency('$');
diff --git a/src/Chart.php b/src/Chart.php
index c9f1ee6..c66f8e0 100644
--- a/src/Chart.php
+++ b/src/Chart.php
@@ -290,10 +290,10 @@ public function summarize($model, $options = []) {
 
         // next we need to group
         if ($options['by'] ?? null) {
-            $qq->field($model->getElement($options['by']), 'by');
+            $qq->field($model->getField($options['by']), 'by');
             $qq->group('by');
         } else {
-            $qq->field($model->getElement($model->title_field), 'by');
+            $qq->field($model->getField($model->title_field), 'by');
         }
 
         $this->setSource($qq->get(), $fields);
diff --git a/src/PieChart.php b/src/PieChart.php
index 48585c4..3acca2c 100644
--- a/src/PieChart.php
+++ b/src/PieChart.php
@@ -39,7 +39,7 @@ public function setModel(\atk4\data\Model $model, $columns = [])
 
 
             $this->dataSets[$column] = [
-                //'label'=>$model->getElement($column)->getCaption(),
+                //'label'=>$model->getField($column)->getCaption(),
                 'data'=>[],
                 'backgroundColor'=>[], //$colors[0],
                 //'borderColor'=>[], //$colors[1],