From 447471387b26a2ffd20c2ed1fcb51ac86f2a94c0 Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Wed, 11 Jan 2017 19:24:03 +0200
Subject: [PATCH] -Default statistics done

---
 controllers/StatisticsController.php |  53 +++++++++++++++++++++++++++++++++++++++--------------
 views/statistics/index.php           | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 167 insertions(+), 43 deletions(-)

diff --git a/controllers/StatisticsController.php b/controllers/StatisticsController.php
index 0c4cb96..cd991ab 100755
--- a/controllers/StatisticsController.php
+++ b/controllers/StatisticsController.php
@@ -19,18 +19,18 @@
             if (!empty($date_range)) {
                 $arr = [];
                 preg_match('@(.*)\s:\s(.*)@', $date_range, $arr);
-                $dateFilter =    [
-                        'between',
-                        'created_at',
-                        strtotime($arr[1]),
-                        strtotime($arr[2]),
-                    ];
+                $dateFilter = [
+                    'between',
+                    'created_at',
+                    strtotime($arr[ 1 ]),
+                    strtotime($arr[ 2 ]),
+                ];
             } else {
                 $dateFilter = [];
             }
             
             if (!empty($label)) {
-                $labelFilter = ['label' => $label];
+                $labelFilter = [ 'label' => $label ];
             } else {
                 $labelFilter = [];
             }
@@ -57,20 +57,45 @@
                     /**
                      * @var Label $model
                      */
-                    return $model->getStatistics($dateFilter);}
+                    return $model->getStatistics($dateFilter);
+                }
             );
             
-            $dataProvider = new ActiveDataProvider([
-                'query' => Order::find()->filterWhere($dateFilter)->andFilterWhere($labelFilter),
-                                                   ]);
+            $dataProvider = new ActiveDataProvider(
+                [
+                    'query' => Order::find()
+                                    ->filterWhere($dateFilter)
+                                    ->andFilterWhere($labelFilter),
+                ]
+            );
             
+            $chartData = [];
+            foreach ($labelStatistics as $statistic) {
+                $chartData[] = $statistic[ 'sum' ];
+            }
+            $chartLabels = [];
+            foreach ($labelStatistics as $name => $statistic) {
+                $chartLabels[] = $name;
+            }
+            $labelChartData = [
+                'labels'   => $chartLabels,
+                'datasets' => [
+                    [
+                        'label' => 'На сумму, грн.',
+                        'data'  => $chartData,
+                    ],
+                ],
+            ];
             return $this->render(
                 'index',
                 [
-                    'labels' => $labels,
-                    'labelStatistics' => $labelStatistics,
+                    'labels'              => $labels,
+                    'labelStatistics'     => $labelStatistics,
                     'rejectionStatistics' => Order::getRejectionStatistics($dateFilter),
-                    'dataProvider' => $dataProvider,
+                    'dataProvider'        => $dataProvider,
+                    'labelChartData'      => $labelChartData,
+                    'dateValue'           => empty($date_range) ? '' : $date_range,
+                    'dataLabel'           => empty($label) ? false : $label,
                 ]
             );
         }
diff --git a/views/statistics/index.php b/views/statistics/index.php
index 27dbc71..6b25c1a 100644
--- a/views/statistics/index.php
+++ b/views/statistics/index.php
@@ -1,19 +1,25 @@
 <?php
     use artweb\artbox\ecommerce\models\Label;
+    use artweb\artbox\ecommerce\models\Order;
     use kartik\daterange\DateRangePicker;
     use kartik\grid\GridView;
     use kartik\select2\Select2;
     use yii\data\ActiveDataProvider;
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
+    use yii\helpers\StringHelper;
     use yii\web\View;
+    use yiier\chartjs\ChartJs;
     
     /**
-     * @var View    $this
-     * @var Label[] $labels
-     * @var array   $labelStatistics
-     * @var array   $rejectionStatistics
+     * @var View               $this
+     * @var Label[]            $labels
+     * @var array              $labelStatistics
+     * @var array              $rejectionStatistics
      * @var ActiveDataProvider $dataProvider
+     * @var array              $labelChartData
+     * @var string             $dateValue
+     * @var int | boolean      $dataLabel
      */
 
 ?>
@@ -35,6 +41,7 @@
           <?= DateRangePicker::widget(
               [
                   'name'          => 'date_range',
+                  'value'         => $dateValue,
                   'pluginOptions' => [
                       'locale' => [
                           'format'    => 'DD-MM-Y',
@@ -48,6 +55,7 @@
           <?= Select2::widget(
               [
                   'name'    => 'label',
+                  'value'   => $dataLabel,
                   'data'    => ArrayHelper::map(
                       $labels,
                       function($model) {
@@ -60,6 +68,9 @@
                   'options' => [
                       'placeholder' => 'Все',
                   ],
+                  'pluginOptions' => [
+                    'allowClear' => true,
+                  ],
               ]
           ) ?>
       </div>
@@ -94,16 +105,40 @@
       </tr>
         <?php
             foreach ($labelStatistics as $name => $statistic) {
-                ?>
-              <tr>
-                <td><?= $name ?></td>
-                <td><?= $statistic[ 'count' ] ?></td>
-                <td><?= $statistic[ 'sum' ] ?></td>
-                <td><?= $statistic[ 'products' ] ?></td>
-                <td><?= $statistic[ 'unique' ] ?></td>
-              </tr>
-            <?php } ?>
+                echo Html::tag(
+                    'tr',
+                    Html::tag('td', $name) . Html::tag('td', $statistic[ 'count' ]) . Html::tag(
+                        'td',
+                        $statistic[ 'sum' ]
+                    ) . Html::tag('td', $statistic[ 'products' ]) . Html::tag('td', $statistic[ 'unique' ])
+                );
+            } ?>
     </table>
+      
+      <?= ChartJs::widget(
+          [
+              'type'          => 'bar',
+              'options'       => [
+                  'height' => 200,
+                  'width'  => 600,
+              ],
+              'data'          => $labelChartData,
+              'clientOptions' => [
+                  'title'  => [
+                      'display' => true,
+                      'text'    => 'Custom Chart Title',
+                  ],
+                  'scales' => [
+                      'xAxes' => [
+                          [
+                              'display' => false,
+                          ],
+                      ],
+                  ],
+              ],
+          ]
+      ); ?>
+
   </div><!-- /.box-body -->
 </div><!-- /.box -->
 
@@ -123,24 +158,88 @@
       </tr>
         <?php
             foreach ($rejectionStatistics as $name => $statistic) {
-                ?>
-              <tr>
-                <td><?= $name ?></td>
-                <td><?= $statistic[ 'count' ] ?></td>
-                <td><?= $statistic[ 'sum' ] ?></td>
-              </tr>
-            <?php } ?>
+                echo Html::tag(
+                    'tr',
+                    Html::tag('td', $name) . Html::tag('td', $statistic[ 'count' ]) . Html::tag(
+                        'td',
+                        $statistic[ 'sum' ]
+                    )
+                );
+            }
+        ?>
     </table>
   </div><!-- /.box-body -->
 </div><!-- /.box -->
 
-<?=GridView::widget([
-                        'dataProvider' => $dataProvider,
-                        'columns' => [
-                          'id',
-                          'created_at:datetime',
-                          'name',
-                          'city',
-                          
+<?= GridView::widget(
+    [
+        'dataProvider' => $dataProvider,
+        'columns'      => [
+            'id',
+            'created_at:datetime',
+            'name',
+            'city',
+            [
+                'attribute' => 'orderLabel.label',
+                'label'     => 'Метка',
+            ],
+            'total',
+            [
+                'attribute' => 'reason',
+                'content'   => function($model) {
+                    /**
+                     * @var Order $model
+                     */
+                    if (empty($model->reason)) {
+                        return '';
+                    } else {
+                        return Order::REASONS[ $model->reason ];
+                    }
+                },
+            ],
+            [
+                'attribute' => 'manager.username',
+                'label'     => 'Менеджер',
+            ],
+            [
+                'attribute' => 'body',
+                'content'   => function($model) {
+                    /**
+                     * @var Order $model
+                     */
+                    if (empty($model->body)) {
+                        return '';
+                    } else {
+                        return Html::a(
+                            StringHelper::truncate($model->body, 10, '...'),
+                            '#',
+                            [
+                                'data-toggle' => 'tooltip',
+                                'title'       => $model->body,
+                                'onclick'     => 'event.preventDefault();',
+                            ]
+                        );
+                    }
+                },
+            ],
+            [
+                'content' => function($model) {
+                    /**
+                     * @var Order $model
+                     */
+                    return Html::a(
+                        Html::tag('i', '', [ 'class' => 'glyphicon glyphicon-eye-open' ]),
+                        [
+                            '/ecommerce/order/view',
+                            'id' => $model->id,
                         ],
-                    ])?>
+                        [
+                            'target'    => '_blank',
+                            'data-pjax' => '0',
+                        ]
+                    );
+                },
+            ],
+        ],
+    ]
+) ?>
--
libgit2 0.21.4