From 84767bd54d7879317d02997bc9520afa7a9add37 Mon Sep 17 00:00:00 2001
From: captainbeer <kennen.md@gmail.com>
Date: Wed, 12 Sep 2018 15:15:54 +0300
Subject: [PATCH] -Export small fixes

---
 backend/controllers/ExportController.php |  17 +++++++++--------
 backend/views/export/index.php           | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
 2 files changed, 90 insertions(+), 51 deletions(-)

diff --git a/backend/controllers/ExportController.php b/backend/controllers/ExportController.php
index bec2733..f5d3487 100644
--- a/backend/controllers/ExportController.php
+++ b/backend/controllers/ExportController.php
@@ -3,12 +3,9 @@ namespace backend\controllers;
 
 
 
-use yii\base\Model;
 use yii\web\Controller;
 use common\models\Customer;
 use yii\filters\VerbFilter;
-use backend\actions\Index;
-use yii\base\DynamicModel;
 use common\models\dummy\DateModel;
 use Yii;
 
@@ -53,11 +50,15 @@ class ExportController extends Controller{
 		#die(var_dump($model->attributes));
 		$date1=(new \DateTime($model->timeFrom))->getTimestamp();
 		$date2=(new \DateTime($model->timeTo))->getTimestamp();
-		die(var_dump($date1,$date2));
-
-		$data=Customer::find()
-			->where(['>','create_at',$date1 ])
-			->andWhere(['<','create_at',$date2 ])
+//		die(var_dump($date1,$date2));
+
+		$data = Customer::find()
+			->where([
+			    'between',
+                'created_at',
+                $date1,
+                $date2
+                    ])
 			->all();
 		die(var_dump($_POST));
 	}
diff --git a/backend/views/export/index.php b/backend/views/export/index.php
index 26721ac..1fbf052 100644
--- a/backend/views/export/index.php
+++ b/backend/views/export/index.php
@@ -1,50 +1,88 @@
 <?php
-/**
- * @var $model object yii\base\DynamicModel
- */
-use yii\widgets\ActiveForm;
-use common\helpers\datePickerData;
-use yii\web\View;
-use yii\helpers\Html;
-
-$this->registerJsFile('/js/script.js', ['depends' => 'yii\web\JqueryAsset']);
-$this->registerJsFile('/js/jquery-ui.min.js', ['depends' => 'yii\web\JqueryAsset']);
-$this->registerCssFile('/css/style.css');
-$dp=new datePickerData();
-$js=$dp->getDatepickerJs();
-
-
-$this->registerJs($js, View::POS_LOAD);
-
-
+    /**
+     * @var $model object yii\base\DynamicModel
+     */
+    
+    use artbox\core\admin\assets\DateRangePicker;
+    use yii\widgets\ActiveForm;
+    use yii\web\View;
+    use yii\helpers\Html;
+    use yiister\gentelella\widgets\Panel;
+    
+    DateRangePicker::register($this);
+    
+    $js = <<<JS
+var dateRangeInputTo = $('#datemodel-timeto');
+var dateRangeInputFrom = $('#datemodel-timefrom');
+var dateFormat = 'DD.MM.YY';
+dateRangeInputFrom.daterangepicker({
+  singleDatePicker: true,
+      autoUpdateInput: true,
+      locale: {
+          cancelLabel: 'Clear',
+          format: dateFormat
+      }
+});
+dateRangeInputTo.daterangepicker({
+  singleDatePicker: true,
+      autoUpdateInput: true,
+      locale: {
+          cancelLabel: 'Clear',
+          format: dateFormat
+      }
+});
+dateRangeInputFrom.on('cancel.daterangepicker', function() {
+  //do something, like clearing an input
+  dateRangeInputFrom.val('');
+});
+dateRangeInputTo.on('cancel.daterangepicker', function() {
+  //do something, like clearing an input
+  dateRangeInputTo.val('');
+});
+dateRangeInputFrom.val('');
+dateRangeInputTo.val('');
+JS;
+    
+    $this->registerJs($js, View::POS_READY);
 
 ?>
 
-
-
-<div class="form-admin-sort-wr">
+<?php
+    $panel = Panel::begin(
+        [
+            'header' => 'asdasda',
+        ]
+    )
+?>
+  
+  <div class="form-admin-sort-wr">
     <div class="form-admin-sort">
-	    <?php $form=ActiveForm::begin(
-		    [
-			    'action'        => '/admin/export/view',
-			    'method'        => 'POST',
-		    ]
-	    );?>
-        <div class="input-wr">
-		    <?=$form->field($model,'timeFrom')->textInput(['class' => '_datepicer']);?>
-        </div>
-
-
-        <div class="input-wr">
-		    <?=$form->field($model,'timeTo')->textInput(['class' => '_datepicer']);?>
-
-        </div>
-        <div class="form-search-btn-wr">
-	        <?=Html::submitButton('test1',['class'=> 'btn btn-success'])?>
-        </div>
-
-
-	    <?php ActiveForm::end() ?>
+        <?php $form = ActiveForm::begin(
+            [
+                'action' => [ '/export/view' ],
+                'method' => 'POST',
+            ]
+        ); ?>
+      <div class="input-wr">
+          <?= $form->field($model, 'timeFrom')
+                   ->textInput([ 'class' => '_datepicer' ]); ?>
+      </div>
+      
+      
+      <div class="input-wr">
+          <?= $form->field($model, 'timeTo')
+                   ->textInput([ 'class' => '_datepicer' ]); ?>
+      
+      </div>
+      <div class="form-search-btn-wr">
+          <?= Html::submitButton('test1', [ 'class' => 'btn btn-success' ]) ?>
+      </div>
+        
+        
+        <?php ActiveForm::end() ?>
     </div>
-</div>
+  </div>
 
+<?php
+    $panel::end();
+?>
\ No newline at end of file
--
libgit2 0.21.4