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
commit 15c9bc9d01
14 changed files with 148 additions and 35 deletions
Show Stats 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(); ?>

19
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 */
@ -10,28 +11,34 @@ 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,

32
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 */
@ -11,28 +12,41 @@ $this->title = Yii::t('backend/key', 'Keys');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="key-index">
asdf
<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 */

14
common/messages/hu/backend/key.php Normal file
View File

@ -0,0 +1,14 @@
<?php
return [
'Keys' => 'Kulcsok',
'Key' => 'Kulcs',
'Create Key' => 'Új kulcs',
'Search' => 'Keresés',
'Reset' => 'Mégsem',
'Update {modelClass}: ' => 'Szerkesztés {modelClass}: ',
'Update' => 'Szerkesztés',
'Update Save' => 'Mentés',
'Create Save' => 'Mentés',
];
?>

1
common/messages/hu/common/card.php
View File

@ -37,4 +37,5 @@ return [
'Update' => 'Módosítás',
'Update {modelClass}: ' => '{modelClass} módosítása:',
'Updated At' => 'Módosítás ideje',
'OLD' => 'Régi Rendszer'
];

11
common/messages/hu/common/key.php Normal file
View File

@ -0,0 +1,11 @@
<?php
return [
'Active' => 'Aktív',
'Inactive' => 'Inaktív',
'Number' => 'Név, szám',
'Status' => 'Státusz',
'Search' => 'Keresés',
'Type' => 'Típus',
'Created At' => 'Létrehozva',
];
?>

2
common/models/Card.php
View File

@ -23,6 +23,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
const TYPE_RFID = 10;
const TYPE_QRCODE = 20;
const TYPE_BARCODE = 30;
const TYPE_OLD = 40;
/**
* @inheritdoc
@ -82,6 +83,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
self::TYPE_RFID => Yii::t('common/card', 'RFID'),
self::TYPE_QRCODE => Yii::t('common/card', 'QRCODE'),
self::TYPE_BARCODE => Yii::t('common/card', 'BARCODE'),
self::TYPE_OLD => Yii::t('common/card', 'OLD'),
];
}

40
common/models/Key.php
View File

@ -3,6 +3,7 @@
namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior;
/**
* This is the model class for table "key".
@ -16,6 +17,10 @@ use Yii;
*/
class Key extends \yii\db\ActiveRecord
{
const STATUS_DELETED = 0;
const STATUS_ACTIVE = 10;
const TYPE_NORMAL = 10;
const TYPE_DEFAULT = self::TYPE_NORMAL;
/**
* @inheritdoc
*/
@ -30,15 +35,26 @@ class Key extends \yii\db\ActiveRecord
public function rules()
{
return [
[['status', 'type'], 'integer'],
[['created_at', 'updated_at'], 'required'],
[['created_at', 'updated_at'], 'safe'],
[['number'], 'string', 'max' => 255]
[['status', 'type'], 'integer'], //csak szám
//[['created_at', 'updated_at'], 'required'],//kötelezőek
//[['created_at', 'updated_at'], 'safe'], //bármi lehet
[['number'], 'string', 'max' => 255],
[['number' ], 'unique'],
];
}
public function behaviors()
{
return [
[ 'class' => TimestampBehavior::className(), //mentés előtt kitölti a save methódus meghívása előtt kitölti a created... mezőket
'value' => function(){ return date('Y-m-d H:i:s' ); }
]
];
}
/**
* @inheritdoc
* @inheritdoc Minden modelnak van egy Attribut labels függvénye ami modelhez tartalmazza a fordítások
*/
public function attributeLabels()
{
@ -51,4 +67,18 @@ class Key extends \yii\db\ActiveRecord
'updated_at' => Yii::t('common/key', 'Updated At'),
];
}
static function statuses() {
return [
self::STATUS_ACTIVE => Yii::t('common/key', 'Active'), // t - translate a key a kategoria common/messages/hu/common/key.php mappa (létre kell hozni a fájlt)
self::STATUS_DELETED => Yii::t('common/key', 'Inactive'),
];
}
public static function types(){
return [
self::TYPE_NORMAL => Yii::t('common/key', 'Key'),
];
}
}

30
console/migrations/m151208_212339_alter__table__customer__add__column__key.php Normal file
View File

@ -0,0 +1,30 @@
<?php
use yii\db\Schema;
use yii\db\Migration;
class m151208_212339_alter__table__customer__add__column__key extends Migration
{
public function up()
{
$this->addColumn("customer", "id_key", "int");
}
public function down()
{
echo "m151208_212339_alter__table__customer__add__column__key cannot be reverted.\n";
return false;
}
/*
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
}
public function safeDown()
{
}
*/
}

4
frontend/views/account-state/_notes.php
View File

@ -6,9 +6,9 @@
<?= $form->field($model, 'banknote_10_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '10']) ?>
<?= $form->field($model, 'banknote_20_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '15']) ?>
<?= $form->field($model, 'banknote_20_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '20']) ?>
<?= $form->field($model, 'banknote_50_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '20']) ?>
<?= $form->field($model, 'banknote_50_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '50']) ?>
</div>
<div class='col-md-4'>
<?= $form->field($model, 'banknote_100_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '100']) ?>