Anastasia / energyforum

Commit 84767bd54d7879317d02997bc9520afa7a9add37

Authored by Alexey Boroda
1 parent 80a6eda8

-Export small fixes

Showing 2 changed files with 90 additions and 51 deletions   Show diff stats
Inline Side-by-side
backend/controllers/ExportController.php
  Show/Hide comments   View file @84767bd
@@ -3,12 +3,9 @@ namespace backend\controllers; @@ -3,12 +3,9 @@ namespace backend\controllers;
3 3
4 4
5 5
6 -use yii\base\Model;  
7 use yii\web\Controller; 6 use yii\web\Controller;
8 use common\models\Customer; 7 use common\models\Customer;
9 use yii\filters\VerbFilter; 8 use yii\filters\VerbFilter;
10 -use backend\actions\Index;  
11 -use yii\base\DynamicModel;  
12 use common\models\dummy\DateModel; 9 use common\models\dummy\DateModel;
13 use Yii; 10 use Yii;
14 11
@@ -53,11 +50,15 @@ class ExportController extends Controller{ @@ -53,11 +50,15 @@ class ExportController extends Controller{
53 #die(var_dump($model->attributes)); 50 #die(var_dump($model->attributes));
54 $date1=(new \DateTime($model->timeFrom))->getTimestamp(); 51 $date1=(new \DateTime($model->timeFrom))->getTimestamp();
55 $date2=(new \DateTime($model->timeTo))->getTimestamp(); 52 $date2=(new \DateTime($model->timeTo))->getTimestamp();
56 - die(var_dump($date1,$date2));  
57 -  
58 - $data=Customer::find()  
59 - ->where(['>','create_at',$date1 ])  
60 - ->andWhere(['<','create_at',$date2 ]) 53 +// die(var_dump($date1,$date2));
  54 +
  55 + $data = Customer::find()
  56 + ->where([
  57 + 'between',
  58 + 'created_at',
  59 + $date1,
  60 + $date2
  61 + ])
61 ->all(); 62 ->all();
62 die(var_dump($_POST)); 63 die(var_dump($_POST));
63 } 64 }
backend/views/export/index.php
  Show/Hide comments   View file @84767bd
1 <?php 1 <?php
2 -/**  
3 - * @var $model object yii\base\DynamicModel  
4 - */  
5 -use yii\widgets\ActiveForm;  
6 -use common\helpers\datePickerData;  
7 -use yii\web\View;  
8 -use yii\helpers\Html;  
9 -  
10 -$this->registerJsFile('/js/script.js', ['depends' => 'yii\web\JqueryAsset']);  
11 -$this->registerJsFile('/js/jquery-ui.min.js', ['depends' => 'yii\web\JqueryAsset']);  
12 -$this->registerCssFile('/css/style.css');  
13 -$dp=new datePickerData();  
14 -$js=$dp->getDatepickerJs();  
15 -  
16 -  
17 -$this->registerJs($js, View::POS_LOAD);  
18 -  
19 - 2 + /**
  3 + * @var $model object yii\base\DynamicModel
  4 + */
  5 +
  6 + use artbox\core\admin\assets\DateRangePicker;
  7 + use yii\widgets\ActiveForm;
  8 + use yii\web\View;
  9 + use yii\helpers\Html;
  10 + use yiister\gentelella\widgets\Panel;
  11 +
  12 + DateRangePicker::register($this);
  13 +
  14 + $js = <<<JS
  15 +var dateRangeInputTo = $('#datemodel-timeto');
  16 +var dateRangeInputFrom = $('#datemodel-timefrom');
  17 +var dateFormat = 'DD.MM.YY';
  18 +dateRangeInputFrom.daterangepicker({
  19 + singleDatePicker: true,
  20 + autoUpdateInput: true,
  21 + locale: {
  22 + cancelLabel: 'Clear',
  23 + format: dateFormat
  24 + }
  25 +});
  26 +dateRangeInputTo.daterangepicker({
  27 + singleDatePicker: true,
  28 + autoUpdateInput: true,
  29 + locale: {
  30 + cancelLabel: 'Clear',
  31 + format: dateFormat
  32 + }
  33 +});
  34 +dateRangeInputFrom.on('cancel.daterangepicker', function() {
  35 + //do something, like clearing an input
  36 + dateRangeInputFrom.val('');
  37 +});
  38 +dateRangeInputTo.on('cancel.daterangepicker', function() {
  39 + //do something, like clearing an input
  40 + dateRangeInputTo.val('');
  41 +});
  42 +dateRangeInputFrom.val('');
  43 +dateRangeInputTo.val('');
  44 +JS;
  45 +
  46 + $this->registerJs($js, View::POS_READY);
20 47
21 ?> 48 ?>
22 49
23 -  
24 -  
25 -<div class="form-admin-sort-wr"> 50 +<?php
  51 + $panel = Panel::begin(
  52 + [
  53 + 'header' => 'asdasda',
  54 + ]
  55 + )
  56 +?>
  57 +
  58 + <div class="form-admin-sort-wr">
26 <div class="form-admin-sort"> 59 <div class="form-admin-sort">
27 - <?php $form=ActiveForm::begin(  
28 - [  
29 - 'action' => '/admin/export/view',  
30 - 'method' => 'POST',  
31 - ]  
32 - );?>  
33 - <div class="input-wr">  
34 - <?=$form->field($model,'timeFrom')->textInput(['class' => '_datepicer']);?>  
35 - </div>  
36 -  
37 -  
38 - <div class="input-wr">  
39 - <?=$form->field($model,'timeTo')->textInput(['class' => '_datepicer']);?>  
40 -  
41 - </div>  
42 - <div class="form-search-btn-wr">  
43 - <?=Html::submitButton('test1',['class'=> 'btn btn-success'])?>  
44 - </div>  
45 -  
46 -  
47 - <?php ActiveForm::end() ?> 60 + <?php $form = ActiveForm::begin(
  61 + [
  62 + 'action' => [ '/export/view' ],
  63 + 'method' => 'POST',
  64 + ]
  65 + ); ?>
  66 + <div class="input-wr">
  67 + <?= $form->field($model, 'timeFrom')
  68 + ->textInput([ 'class' => '_datepicer' ]); ?>
  69 + </div>
  70 +
  71 +
  72 + <div class="input-wr">
  73 + <?= $form->field($model, 'timeTo')
  74 + ->textInput([ 'class' => '_datepicer' ]); ?>
  75 +
  76 + </div>
  77 + <div class="form-search-btn-wr">
  78 + <?= Html::submitButton('test1', [ 'class' => 'btn btn-success' ]) ?>
  79 + </div>
  80 +
  81 +
  82 + <?php ActiveForm::end() ?>
48 </div> 83 </div>
49 -</div> 84 + </div>
50 85
  86 +<?php
  87 + $panel::end();
  88 +?>
51 \ No newline at end of file 89 \ No newline at end of file