rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add door log changes, direction types, and manual reading event

Browse Source
This commit is contained in:
Roland Schneider
2016-02-16 18:37:16 +01:00
parent f81af9e5bb
commit 769b5d16de
8 changed files with 230 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/components/AdminMenuStructure.php
View File

@@ -130,12 +130,12 @@ class AdminMenuStructure{
// Kap lug megbízások
/////////////////////////////
$items = [];
$items[] = ['label' => 'Mozgások', 'url' => ['/door-log/index' , 'DoorLogSearch[start]' =>$today,'DoorLogSearch[end]' => $tomorrow ] ];
$items[] = ['label' => 'Kártya események', 'url' => ['/door-log/index' , 'DoorLogSearch[start]' =>$todayDatetime,'DoorLogSearch[end]' => $tomorrowDatetime ] ];
// $items[] = ['label' => 'Részletek aktiválása', 'url' => ['/ugiro/parts' ] ];
// $items[] = ['label' => 'Bevétel', 'url' => ['/transfer/summary' , 'TransferSummarySearch[start]' =>$today,'TransferSummarySearch[end]' => $tomorrow ] ];
// $items[] = ['label' => 'Napi bevételek', 'url' => ['/transfer/list', 'TransferListSearch[start]' =>$todayDatetime,'TransferListSearch[end]' => $tomorrowDatetime ] ];
// $items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
$this->menuItems[] = ['label' => 'Forgóvilla', 'url' => $this->emptyUrl,
$this->menuItems[] = ['label' => 'Események', 'url' => $this->emptyUrl,
'items' => $items
];

65
backend/models/DoorLogSearch.php
View File

@@ -6,6 +6,7 @@ use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\DoorLog;
use yii\db\Query;
/**
* DoorLogSearch represents the model behind the search form about `common\models\DoorLog`.
@@ -32,8 +33,10 @@ class DoorLogSearch extends DoorLog
[[ 'direction', 'type'], 'integer'],
[['created_at'], 'safe'],
[['searchCardNumber','searchCustomerName','searchKeyName'], 'safe'],
[[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
[[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
// [[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
// [[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
[[ 'start', ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
[[ 'end' , ], 'date' ,'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
];
}
@@ -44,7 +47,7 @@ class DoorLogSearch extends DoorLog
'searchCustomerName' => 'Vendég',
'searchKeyName' => 'Kulcs szám',
'type' => 'Típus',
'direction' => 'Irány',
'direction' => 'Esemény',
'start' => 'Időszak kezdete',
'end' => 'Időszak vége'
];
@@ -68,33 +71,61 @@ class DoorLogSearch extends DoorLog
*/
public function search($params)
{
$query = DoorLog::find();
$query = new Query();
$query->select([
'door_log.id_door_log as door_log_id',
'card.number as card_number',
'door_log.type as door_log_type',
'key.number as key_number',
'customer.name as customer_name',
'customer.id_customer as customer_id_customer',
'door_log.direction as door_log_direction',
'door_log.created_at as door_log_created_at',
'door_log.source_app as door_log_source_app'
]);
$query->from('door_log');
$query->innerJoin('card','card.id_card = door_log.id_card');
$query->leftJoin('key','key.id_key = door_log.id_key');
$query->leftJoin('customer','customer.id_customer = door_log.id_customer');
$dataProvider = new ActiveDataProvider([
'query' => $query,
'sort' =>[
'defaultOrder' =>[ 'door_log_created_at' => SORT_DESC ],
'attributes' => [
// 'age',
'id_card' => [
'card_number' => [
'asc' => ['card.number' => SORT_ASC ],
'desc' => ['card.number' => SORT_DESC],
],
'id_key' => [
'key_number' => [
'asc' => ['key.number' => SORT_ASC ],
'desc' => ['key.number' => SORT_DESC],
],
'id_customer' => [
'customer_name' => [
'asc' => ['customer.name' => SORT_ASC ],
'desc' => ['customer.name' => SORT_DESC],
],
'direction' => [
'customer_id_customer' => [
'asc' => ['customer.id_customer' => SORT_ASC ],
'desc' => ['customer.id_customer' => SORT_DESC],
],
'door_log_direction' => [
'asc' => ['door_log.direction' => SORT_ASC ],
'desc' => ['door_log.direction' => SORT_DESC],
],
'created_at' => [
'door_log_created_at' => [
'asc' => ['door_log.created_at' => SORT_ASC ],
'desc' => ['door_log.created_at' => SORT_DESC],
],
'door_log_source_app' => [
'asc' => ['door_log.source_app' => SORT_ASC ],
'desc' => ['door_log.source_app' => SORT_DESC],
],
'door_log_type' =>[
'asc' => ['door_log.type' => SORT_ASC ],
'desc' => ['door_log.type' => SORT_DESC],
]
],
]
]);
@@ -103,7 +134,7 @@ class DoorLogSearch extends DoorLog
if (!$this->validate()) {
// uncomment the following line if you do not want to return any records when validation fails
// $query->where('0=1');
$query->where('0=1');
return $dataProvider;
}
@@ -112,7 +143,9 @@ class DoorLogSearch extends DoorLog
// 'id_card' => $this->id_card,
// 'id_customer' => $this->id_customer,
// 'id_key' => $this->id_key,
'direction' => $this->direction,
'direction' => $this->direction,
'id_customer' => $this->id_customer
// 'type' => $this->type,
// 'created_at' => $this->created_at,
]);
@@ -120,9 +153,6 @@ class DoorLogSearch extends DoorLog
$query->andFilterWhere(['>=', 'door_log.created_at', $this->timestampStart]);
$query->andFilterWhere(['<', 'door_log.created_at', $this->timestampEnd]);
$query->innerJoin('card','card.id_card = door_log.id_card');
$query->leftJoin('key','key.id_key = door_log.id_key');
$query->leftJoin('customer','customer.id_customer = door_log.id_customer');
if ( !empty($this->searchCardNumber)){
$query->andWhere(['or',
@@ -144,4 +174,11 @@ class DoorLogSearch extends DoorLog
return $dataProvider;
}
public static function getAllDoorLog(){
$result = DoorLog::getDirectionTypes();
$result = $result + [ 0 => "Kézi olvasás" ];
return $result;
}
}

27
backend/views/door-log/_search.php
View File

@@ -3,6 +3,8 @@
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use kartik\widgets\DatePicker;
use backend\models\DoorLogSearch;
use kartik\widgets\DateTimePicker;
/* @var $this yii\web\View */
/* @var $model backend\models\DoorLogSearch */
@@ -26,11 +28,13 @@ use kartik\widgets\DatePicker;
</div>
<div class="col-md-3">
<?= $form->field($model, 'searchKeyName') ?>
<?= $form->field($model, 'id_customer')->label("Vendég azon.") ?>
</div>
<div class="col-md-3">
<?= $form->field($model, 'direction')->dropDownList(['' => 'Mind' ] + []) ?>
<?= $form->field($model, 'searchKeyName') ?>
</div>
</div>
@@ -39,26 +43,31 @@ use kartik\widgets\DatePicker;
<?php // echo $form->field($model, 'created_at') ?>
<div class="row">
<div class="col-md-3">
<?= $form->field($model, 'direction')->dropDownList(['' => 'Mind' ] + DoorLogSearch::getAllDoorLog() ) ?>
</div>
<div class="col-md-3">
<?= $form->field($model, 'start')->widget(DatePicker::classname(), [
<?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
'pluginOptions' => [
'autoclose'=>true,
'format' => 'yyyy.mm.dd'
'format' => 'yyyy.mm.dd hh:ii'
]
]) ?>
]) ?>
</div>
<div class="col-md-3">
<?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
<?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
'pluginOptions' => [
'autoclose'=>true,
'format' => 'yyyy.mm.dd'
'format' => 'yyyy.mm.dd hh:ii'
]
]) ?>
]) ?>
</div>
</div>
<div class="form-group">
<?= Html::submitButton(Yii::t('common/door_log', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::submitButton(Yii::t('common/door_log', 'Keresés'), ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>

55
backend/views/door-log/index.php
View File

@@ -2,12 +2,15 @@
use yii\helpers\Html;
use yii\grid\GridView;
use common\components\Helper;
use common\models\DoorLog;
use common\models\Card;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\DoorLogSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = Yii::t('common/door_log', 'Mozgások');
$this->title = Yii::t('common/door_log', 'Kártya események');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="door-log-index">
@@ -19,26 +22,52 @@ $this->params['breadcrumbs'][] = $this->title;
<?= GridView::widget([
'dataProvider' => $dataProvider,
'columns' => [
['class' => 'yii\grid\SerialColumn'],
[
'attribute' => 'id_card',
'value' => 'cardNumber'
[
'attribute' => 'door_log_created_at',
'label' => "Időpont",
'value' => 'door_log_created_at',
'format' => 'datetime'
],
[
'attribute' => 'id_key',
'value' => 'keyNumber'
'attribute' => 'card_number',
'label' => 'Kártya szám'
],
[
'attribute' => 'id_customer',
'value' => 'customerName'
'attribute' => 'door_log_type',
'label' => 'Kártya típus',
'value' => function ($model, $key, $index, $column){
return Helper::getArrayValue(Card::types(), $model['door_log_type'], "-");
}
],
[
'attribute' => 'direction',
'value' => 'directionName'
'attribute' => 'key_number',
'label' => 'Kulcs'
],
[
'attribute' => 'customer_id_customer',
'label' => 'Vendég azon.'
],
[
'attribute' => 'customer_name',
'label' => 'Vendég'
],
[
'attribute' => 'door_log_direction',
'label' => 'Esemény',
'value' => function ($model, $key, $index, $column){
return Helper::getArrayValue(DoorLog::getDirectionTypes(), $model['door_log_direction'],"-" );
}
],
[
'attribute' => 'door_log_source_app',
'label' => 'Forrás alkalmazás',
'value' => function ($model, $key, $index, $column){
return DoorLog::getSourceAppName($model['door_log_source_app']);
}
],
/*
// 'type',
'created_at:datetime',
*/
],
]); ?>