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

Finish #58

Browse Source 
# Conflicts:
#	backend/config/main.php
This commit is contained in:
Roland Schneider
2015-12-11 23:27:16 +01:00
parent 9962a35059 b42e6f78e6
commit 15c9bc9d01
14 changed files with 148 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/controllers/KeyController.php
View File

@@ -38,7 +38,7 @@ class KeyController extends Controller
// backend/views/kex/index.php
return $this->render('index', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
'dataProvider' => $dataProvider, //csomagoló osztály a queryhez
]);
}

6
backend/models/KeySearch.php
View File

@@ -18,8 +18,9 @@ class KeySearch extends Key
public function rules()
{
return [
[['id_key', 'status', 'type'], 'integer'],
[['number', 'created_at', 'updated_at'], 'safe'],
/*[['id_key', 'status', 'type'], 'integer'],
[['number', 'created_at', 'updated_at'], 'safe'],*/
[['number'], 'safe']
];
}
@@ -57,6 +58,7 @@ class KeySearch extends Key
$query->andFilterWhere([
'id_key' => $this->id_key,
'number' => $this->number,
'status' => $this->status,
'type' => $this->type,
'created_at' => $this->created_at,

11
backend/views/key/_form.php
View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use common\models\Key;
/* @var $this yii\web\View */
/* @var $model common\models\Key */
@@ -14,16 +15,16 @@ use yii\widgets\ActiveForm;
<?= $form->field($model, 'number')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'status')->textInput() ?>
<?= $form->field($model, 'status')->dropDownList( Key::statuses() ) /*->textInput()*/ ?>
<?= $form->field($model, 'type')->textInput() ?>
<?= $form->field($model, 'type')->dropDownList( Key::types() /* array(10=>"kulcs") // <--ez így ok */ ) /* $form->field($model, 'type')->textInput() */ ?>
<?= $form->field($model, 'created_at')->textInput() ?>
<?php //echo $form->field($model, 'created_at')->textInput() ?>
<?= $form->field($model, 'updated_at')->textInput() ?>
<?php //echo $form->field($model, 'updated_at')->textInput() ?>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend/key', 'Create') : Yii::t('backend/key', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend/key', 'Create Save') : Yii::t('backend/key', 'Update Save'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>

23
backend/views/key/_search.php
View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use common\models\Key;
/* @var $this yii\web\View */
/* @var $model backend\models\KeySearch */
@@ -9,29 +10,35 @@ use yii\widgets\ActiveForm;
?>
<div class="key-search">
<div class="row">
<div class="col-md-4">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
<?= $form->field($model, 'id_key') ?>
<?php //echo $form->field($model, 'id_key') ?>
<?= $form->field($model, 'number') ?>
<?php echo $form->field($model, 'number') ?>
<?php //$form->field($model, 'status')->dropDownList( Key::statuses() ) /*->textInput()*/ ?>
<?= $form->field($model, 'status') ?>
<?php //echo $form->field($model, 'status') ?>
<?= $form->field($model, 'type') ?>
<?php //echo $form->field($model, 'type') ?>
<?= $form->field($model, 'created_at') ?>
<?php //echo $form->field($model, 'created_at') ?>
<?php // echo $form->field($model, 'updated_at') ?>
<div class="form-group">
<?= Html::submitButton(Yii::t('backend/key', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']) ?>
<?php //echo Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']); /* Reset gomb */ ?>
</div>
<?php ActiveForm::end(); ?>
</div><!-- col-md-4 END -->
</div><!-- row END -->
</div>

4
backend/views/key/create.php
View File

@@ -1,7 +1,7 @@
<?php
use yii\helpers\Html;
use common\models\Key;
/* @var $this yii\web\View */
/* @var $model common\models\Key */
@@ -12,7 +12,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="key-create">
<h1><?= Html::encode($this->title) ?></h1>
<h1>Új kulcs létrehozás <?php /*echo Html::encode($this->title)*/ ?></h1>
<?= $this->render('_form', [
'model' => $model,

34
backend/views/key/index.php
View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\grid\GridView;
use common\models\Key;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\KeySearch */
@@ -10,29 +11,42 @@ use yii\grid\GridView;
$this->title = Yii::t('backend/key', 'Keys');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="key-index">
asdf
<div class="key-index">
<h1><?= Html::encode($this->title) ?></h1>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<?php echo $this->render('_search', ['model' => $searchModel]); /* ezt megcsinálni hogy csak numberre lehessen itt a fitness-web/backend/views/key/_search.php töltődik be */?>
<p>
<?= Html::a(Yii::t('backend/key', 'Create Key'), ['create'], ['class' => 'btn btn-success']) ?>
<?php
// Új kulcs gomb kigenerálása a Yii::t('backend/key' a fitness-web/common/messages/hu/backend/key.php-ba lesz (miután létrehoztam)
echo Html::a(Yii::t('backend/key', 'Create Key'), ['create'], ['class' => 'btn btn-success']);
?>
</p>
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
//'filterModel' => $searchModel, // ezt nem szeretjük
'columns' => [
['class' => 'yii\grid\SerialColumn'],
'id_key',
// ['class' => 'yii\grid\SerialColumn'],
// 'id_key',
'number',
'status',
[
'attribute' => 'status',
'value' => function ($model, $key, $index, $column){
$statuszok = Key::statuses();
$result = $statuszok[$model->status];
return $result;
}
],
//'status',
'type',
'created_at',
// 'updated_at',
['class' => 'yii\grid\ActionColumn'],
[
'class' => 'yii\grid\ActionColumn',
'template' => '{view} {update}',
],
],
]); ?>

1
backend/views/key/update.php
View File

@@ -1,6 +1,7 @@
<?php
use yii\helpers\Html;
use common\models\Key;
/* @var $this yii\web\View */
/* @var $model common\models\Key */