Add backend ticket changes
This commit is contained in:
@@ -27,6 +27,7 @@ class TicketController extends \backend\controllers\BackendController
|
||||
{
|
||||
$searchModel = new TicketSearch();
|
||||
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
|
||||
$searchModel->searchTotals();
|
||||
|
||||
$searchModel->users = User::read();
|
||||
$searchModel->accounts = Account::read();
|
||||
|
||||
@@ -8,6 +8,7 @@ use yii\data\ActiveDataProvider;
|
||||
use common\models\Ticket;
|
||||
use common\components\Helper;
|
||||
use yii\db\ActiveRecord;
|
||||
use yii\helpers\ArrayHelper;
|
||||
|
||||
/**
|
||||
* TicketSearch represents the model behind the search form about `common\models\Ticket`.
|
||||
@@ -26,6 +27,9 @@ class TicketSearch extends Ticket
|
||||
public $created_in_interval;
|
||||
public $expire_in_interval;
|
||||
|
||||
public $statistics;
|
||||
public $statisticsTotal;
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
@@ -48,7 +52,29 @@ class TicketSearch extends Ticket
|
||||
// bypass scenarios() implementation in the parent class
|
||||
return Model::scenarios();
|
||||
}
|
||||
|
||||
public function attributeLabels(){
|
||||
return ArrayHelper::merge(parent::attributeLabels(), [
|
||||
'start' => Yii::t('backend/ticket','Start of interval'),
|
||||
'end' => Yii::t('backend/ticket','End of interval'),
|
||||
'valid_in_interval' => Yii::t('backend/ticket','Valid in interval'),
|
||||
'created_in_interval' => Yii::t('backend/ticket','Created in interval'),
|
||||
'expire_in_interval' => Yii::t('backend/ticket','Expire in interval'),
|
||||
]);
|
||||
}
|
||||
|
||||
public function afterValidate(){
|
||||
|
||||
if ( !isset($this->timestampStart)) {
|
||||
$this->timestampStart ='1900-01-01';
|
||||
}
|
||||
|
||||
if ( !isset($this->timestampEnd)) {
|
||||
$this->timestampEnd ='3000-01-01';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates data provider instance with search query applied
|
||||
*
|
||||
@@ -64,6 +90,9 @@ class TicketSearch extends Ticket
|
||||
|
||||
$query->with('ticketType' );
|
||||
$query->with('user');
|
||||
$query->with('customer');
|
||||
|
||||
|
||||
|
||||
$dataProvider = new ActiveDataProvider([
|
||||
'query' => $query,
|
||||
@@ -74,8 +103,9 @@ class TicketSearch extends Ticket
|
||||
|
||||
if (!$this->validate()) {
|
||||
$query->where('0=1');
|
||||
// return $dataProvider;
|
||||
return $query;
|
||||
}
|
||||
|
||||
|
||||
$query->andFilterWhere([
|
||||
'id_user' => $this->id_user,
|
||||
@@ -91,7 +121,6 @@ class TicketSearch extends Ticket
|
||||
$dateConditions = [];
|
||||
$start = $this->timestampStart;
|
||||
$end = $this->timestampEnd;
|
||||
Yii::info('valid all: ' .$all);
|
||||
|
||||
if( $all || $this->created_in_interval ){
|
||||
$dateConditions[] = Helper::queryInIntervalRule('ticket.created_at', $start, $end);
|
||||
@@ -117,4 +146,71 @@ class TicketSearch extends Ticket
|
||||
|
||||
return $dataProvider;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function searchTotals(){
|
||||
$query = Ticket::mkStatisticQuery($this->timestampStart, $this->timestampEnd);
|
||||
$this->statistics = $query->all();
|
||||
|
||||
$this->statisticsTotal =[
|
||||
'valid' => 0,
|
||||
'created' => 0,
|
||||
'created_at_money' => 0,
|
||||
'expired' => 0,
|
||||
];
|
||||
|
||||
$this->statisticsTotal['valid'] = array_sum(array_column($this->statistics, 'valid'));
|
||||
$this->statisticsTotal['created'] = array_sum(array_column($this->statistics, 'created'));
|
||||
$this->statisticsTotal['created_money'] = array_sum(array_column($this->statistics, 'created_money'));
|
||||
$this->statisticsTotal['expired'] = array_sum(array_column($this->statistics, 'expired'));
|
||||
}
|
||||
|
||||
|
||||
public static function mkSearchCondition( $timestampStart, $timestampEnd, $id_user,$id_ticket_tpye,$id_account,$valid_in_interval ,$expire_in_interval,$created_in_interval ){
|
||||
$query = Ticket::find();
|
||||
|
||||
Helper::queryAccountConstraint($query, 'ticket.id_account');
|
||||
|
||||
$query->with('ticketType' );
|
||||
$query->with('user');
|
||||
$query->with('customer');
|
||||
|
||||
$query->andFilterWhere([
|
||||
'id_user' => $id_user,
|
||||
'id_ticket_type' => $id_ticket_type,
|
||||
'id_account' => $id_account,
|
||||
]);
|
||||
|
||||
$all = (!($valid_in_interval) && !($expire_in_interval) && !($created_in_interval) )
|
||||
||
|
||||
($valid_in_interval == true && $expire_in_interval == true && $created_in_interval);
|
||||
|
||||
$dateConditions = [];
|
||||
$start = $timestampStart;
|
||||
$end = $timestampEnd;
|
||||
|
||||
if( $all || $created_in_interval ){
|
||||
$dateConditions[] = Helper::queryInIntervalRule('ticket.created_at', $start, $end);
|
||||
}
|
||||
|
||||
if ( $all || $valid_in_interval ){
|
||||
$dateConditions[] = Helper::queryValidRule('ticket.start', 'ticket.end', $start, $end);
|
||||
}
|
||||
|
||||
if ( $all || $expire_in_interval ){
|
||||
$dateConditions[] = Helper::queryExpireRule('ticket.start', 'ticket.end', $start, $end);
|
||||
}
|
||||
|
||||
if ( count($dateConditions) == 1 ){
|
||||
$query->andWhere($dateConditions[0]);
|
||||
}else if ( count($dateConditions) > 1 ){
|
||||
$cond = ['or'];
|
||||
foreach ($dateConditions as $c){
|
||||
$cond[] = $c;
|
||||
}
|
||||
$query->andWhere($cond);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
use yii\helpers\Html;
|
||||
use yii\grid\GridView;
|
||||
use yii\helpers\ArrayHelper;
|
||||
use yii\data\ArrayDataProvider;
|
||||
|
||||
/* @var $this yii\web\View */
|
||||
/* @var $searchModel backend\models\TicketSearch */
|
||||
@@ -20,11 +21,72 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
<h1><?= Html::encode($this->title) ?></h1>
|
||||
<?php echo $this->render('_search', ['model' => $searchModel]); ?>
|
||||
|
||||
|
||||
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Bérlet statisztika</div>
|
||||
<div class="panel-body">
|
||||
<p>Bérlet statisztika a kiválasztott időszakra</p>
|
||||
<?php
|
||||
|
||||
echo GridView::widget([
|
||||
'dataProvider' => new ArrayDataProvider([
|
||||
'allModels' => $searchModel->statistics,
|
||||
'sort' => false,
|
||||
'pagination' => false,
|
||||
]),
|
||||
'showFooter'=>TRUE,
|
||||
'footerRowOptions'=>['style'=>'font-weight:bold; '],
|
||||
'columns' =>[
|
||||
[
|
||||
'attribute' => 'name',
|
||||
'label' => 'Bérlet',
|
||||
'footer' => 'Összesen'
|
||||
],
|
||||
[
|
||||
'attribute' => 'created',
|
||||
'label' => 'Kiadva (Db)',
|
||||
'footer' => $searchModel->statisticsTotal['created']
|
||||
],
|
||||
[
|
||||
'attribute' => 'created_money',
|
||||
'label' => 'Kiadott érték (Ft)',
|
||||
'footer' => $searchModel->statisticsTotal['created_money']
|
||||
],
|
||||
[
|
||||
'attribute' => 'valid',
|
||||
'label' => 'Érvényes (Db)',
|
||||
'footer' => $searchModel->statisticsTotal['valid']
|
||||
|
||||
],
|
||||
[
|
||||
'attribute' => 'expired',
|
||||
'label' => 'Lejár az adott időszakban (Db)',
|
||||
'footer' => $searchModel->statisticsTotal['expired']
|
||||
]
|
||||
|
||||
]
|
||||
]);
|
||||
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<?= GridView::widget([
|
||||
'dataProvider' => $dataProvider,
|
||||
'columns' => [
|
||||
|
||||
[
|
||||
'attribute' => 'id_customer',
|
||||
'value' => 'customerName'
|
||||
],
|
||||
[
|
||||
'attribute' => 'id_card',
|
||||
'value' => 'cardNumber'
|
||||
],
|
||||
'start:date',
|
||||
'end:date',
|
||||
[
|
||||
'attribute' => 'id_user',
|
||||
'value' => 'userName'
|
||||
@@ -37,10 +99,8 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
'attribute' => 'id_account',
|
||||
'value' => 'accountName'
|
||||
],
|
||||
'start:date',
|
||||
'end:date',
|
||||
'max_usage_count',
|
||||
'usage_count',
|
||||
// 'max_usage_count',
|
||||
// 'usage_count',
|
||||
|
||||
['class' => 'yii\grid\ActionColumn',
|
||||
'template' => '{view}'
|
||||
|
||||
Reference in New Issue
Block a user