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

fix merge conflicts

Browse Source
This commit is contained in:
Roland Schneider
2016-03-09 20:24:31 +01:00
parent 0f973170d2 b51028ab1d
commit 8f85d99a0a
40 changed files with 1800 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/views/card/recalculate.php Normal file
View File

@@ -0,0 +1,15 @@
<?php
use yii\helpers\Html;
?>
<p>
Bérletek kapu flag -jének újraszámolása
</p>
<?php
echo Html::a("Újra számolás", ['recalculate'], [
'class' => 'btn btn-danger',
'data' => [
'method' => 'post',
],
]) ?>

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

@@ -61,6 +61,13 @@ $this->params['breadcrumbs'][] = $this->title;
'value' => function ($model, $key, $index, $column){
return Helper::getArrayValue(DoorLog::getDirectionTypes(), $model['door_log_direction'],"-" );
}
],
[
'attribute' => 'door_log_card_flag',
'label' => 'Info',
'value' => function ($model, $key, $index, $column){
return Helper::getArrayValue(DoorLog::getCardFlagTexts(), $model['door_log_card_flag'],"-" );
}
],
[
'attribute' => 'door_log_source_app',

27
backend/views/inventory-item/_form.php Normal file
View File

@@ -0,0 +1,27 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model common\models\InventoryItem */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="inventory-item-form">
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($model, 'name')->textInput(['autocomplete' => 'off']) ?>
<?= $form->field($model, 'id_product')->hiddenInput()->label(false) ?>
<?= $form->field($model, 'type')->hiddenInput()->label(false) ?>
<?= $form->field($model, 'count')->textInput() ?>
<div class="form-group">
<?= Html::submitButton( Yii::t('common/inventory-item', 'Mentés') , ['class' => 'btn btn-success' ]) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

48
backend/views/inventory-item/_search.php Normal file
View File

@@ -0,0 +1,48 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model backend\models\InventoryItemSearch */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="inventory-item-search">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
<?= $form->field($model, 'id_inventory_item') ?>
<?= $form->field($model, 'id_inventory') ?>
<?= $form->field($model, 'count_in') ?>
<?= $form->field($model, 'count_sold') ?>
<?= $form->field($model, 'count') ?>
<?php // echo $form->field($model, 'type') ?>
<?php // echo $form->field($model, 'id_product') ?>
<?php // echo $form->field($model, 'id_inventory_group') ?>
<?php // echo $form->field($model, 'id_user') ?>
<?php // echo $form->field($model, 'created_at') ?>
<?php // echo $form->field($model, 'updated_at') ?>
<div class="form-group">
<?= Html::submitButton(Yii::t('common/inventory-item', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('common/inventory-item', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

33
backend/views/inventory-item/create.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
use yii\helpers\Html;
use backend\assets\InventoryItemCreateAsset;
use yii\helpers\Url;
/* @var $this yii\web\View */
/* @var $model common\models\InventoryItem */
$this->title = Yii::t('common/inventory-item', 'Új leltár elem');
$this->params['breadcrumbs'][] = ['label' => 'Leltár' , 'url' => ['inventory/view', 'id' => $model->inventory->id_inventory]];
$this->params['breadcrumbs'][] = $this->title;
InventoryItemCreateAsset::register($this);
$options = [];
$options['products'] = $model->productOptions;
$options['url_product_find'] = Url::toRoute(['product/find']);
$this->registerJs('inventoryItemCreate.init( '. json_encode($options) .' );');
?>
<div class="inventory-item-create">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>

103
backend/views/inventory-item/index.php Normal file
View File

@@ -0,0 +1,103 @@
<?php
use yii\helpers\Html;
use yii\grid\GridView;
use yii\widgets\DetailView;
use yii\helpers\Url;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\InventoryItemSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = Yii::t('common/inventory-item', 'Leltár részletei');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="inventory-item-index">
<h1><?= Html::encode($this->title) ?></h1>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id_inventory',
['attribute'=>'id_user',
'value'=>$model->userName
],
'created_at:datetime',
],
]) ?>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?= Html::a(Yii::t('common/inventory', 'Új termék'), ['inventory-item/create','id' =>$model->id_inventory], ['class' => 'btn btn-success']) ?>
</p>
<?php
echo GridView::widget( [
'dataProvider' => $dataProvider,
'columns' =>[
[
'attribute' => 'item_created_at',
'label' => 'Létrehozva',
'format' => 'datetime'
],
[
'attribute' => 'item_name',
'label' => 'Név',
],
[
'attribute' => 'user_username',
'label' => 'Felhasználó',
],
[
'attribute' => 'item_count_prev',
'label' => 'Előzö leltár (db)'
],
[
'attribute' => 'item_count_in',
'label' => 'Beszerzett mennyiség (db)'
],
[
'attribute' => 'item_count_sold',
'label' => 'Eladott mennyiség (db)',
],
[
'attribute' => 'item_count',
'label' => 'Leltározott mennyiség (db)',
],
[
'attribute' => 'item_difference',
'label' => 'Különbség (db)',
],
['class' => 'yii\grid\ActionColumn',
'template' => '{delete}',
'urlCreator' => function ($action, $model, $key, $index){
return Url::to(['inventory-item/delete', 'id' => $model['item_id_inventory_item' ] ]) ;
},
'buttons' =>[
'delete' =>function ($url, $model, $key) {
return Html::a('Törlés', $url,['class' => 'btn btn-xs btn-danger',
'data' => [
'confirm' => Yii::t('common/inventory-item', 'Biztosan törlöd ezt az elemet?'),
'method' => 'post',
],
]) ;
}
]
]
]
]);
?>
</div>

23
backend/views/inventory-item/update.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\models\InventoryItem */
$this->title = Yii::t('common/inventory-item', 'Update {modelClass}: ', [
'modelClass' => 'Inventory Item',
]) . ' ' . $model->id_inventory_item;
$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory-item', 'Inventory Items'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->id_inventory_item, 'url' => ['view', 'id' => $model->id_inventory_item]];
$this->params['breadcrumbs'][] = Yii::t('common/inventory-item', 'Update');
?>
<div class="inventory-item-update">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>

45
backend/views/inventory-item/view.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model common\models\InventoryItem */
$this->title = $model->id_inventory_item;
$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory-item', 'Inventory Items'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="inventory-item-view">
<h1><?= Html::encode($this->title) ?></h1>
<p>
<?= Html::a(Yii::t('common/inventory-item', 'Update'), ['update', 'id' => $model->id_inventory_item], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('common/inventory-item', 'Delete'), ['delete', 'id' => $model->id_inventory_item], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('common/inventory-item', 'Are you sure you want to delete this item?'),
'method' => 'post',
],
]) ?>
</p>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id_inventory_item',
'id_inventory',
'count_in',
'count_sold',
'count',
'type',
'id_product',
'id_inventory_group',
'id_user',
'created_at',
'updated_at',
],
]) ?>
</div>

22
backend/views/inventory/_form.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model common\models\Inventory */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="inventory-form">
<?php $form = ActiveForm::begin(); ?>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? Yii::t('common/inventory', 'Létrehoz') : Yii::t('common/inventory', 'Módosít'), [ 'name'=>'Inventory[submit]' ,'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

33
backend/views/inventory/_search.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model backend\models\InventorySearch */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="inventory-search">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
<?= $form->field($model, 'id_inventory') ?>
<?= $form->field($model, 'id_user') ?>
<?= $form->field($model, 'created_at') ?>
<?= $form->field($model, 'updated_at') ?>
<div class="form-group">
<?= Html::submitButton(Yii::t('common/inventory', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('common/inventory', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

21
backend/views/inventory/create.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\models\Inventory */
$this->title = Yii::t('common/inventory', 'Új leltár');
$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory', 'Leltár lista'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="inventory-create">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>

43
backend/views/inventory/index.php Normal file
View File

@@ -0,0 +1,43 @@
<?php
use yii\helpers\Html;
use yii\grid\GridView;
use yii\helpers\Url;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\InventorySearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = Yii::t('common/inventory', 'Leltár lista');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="inventory-index">
<h1><?= Html::encode($this->title) ?></h1>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?= Html::a(Yii::t('common/inventory', 'Új leltár'), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?= GridView::widget([
'dataProvider' => $dataProvider,
'columns' => [
'id_inventory',
'id_user',
'created_at:datetime',
['class' => 'yii\grid\ActionColumn',
'template' => '{view}',
'urlCreator' => function( $action, $model, $key, $index ){
if ( $action == 'view' ){
return Url::to(['inventory-item/index' , 'id'=> $model->id_inventory]);
}
}
],
],
]); ?>
</div>

23
backend/views/inventory/update.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\models\Inventory */
$this->title = Yii::t('common/inventory', 'Update {modelClass}: ', [
'modelClass' => 'Inventory',
]) . ' ' . $model->id_inventory;
$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory', 'Inventories'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->id_inventory, 'url' => ['view', 'id' => $model->id_inventory]];
$this->params['breadcrumbs'][] = Yii::t('common/inventory', 'Update');
?>
<div class="inventory-update">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>

88
backend/views/inventory/view.php Normal file
View File

@@ -0,0 +1,88 @@
<?php
use yii\helpers\Html;
use yii\widgets\DetailView;
use yii\grid\GridView;
use yii\base\Widget;
/* @var $this yii\web\View */
/* @var $model common\models\Inventory */
$this->title = $model->id_inventory;
$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory', 'Leltár lista'), 'url' => ['index']];
$this->params['breadcrumbs'][] = "Leltár";
?>
<div class="inventory-view">
<h1><?= Html::encode("Leltár") ?></h1>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id_inventory',
['attribute'=>'id_user',
'value'=>$model->userName
],
'created_at:datetime',
],
]) ?>
</div>
<p>
<?= Html::a(Yii::t('common/inventory', 'Új termék'), ['inventory-item/create','id' =>$model->id_inventory], ['class' => 'btn btn-success']) ?>
</p>
<?php
echo GridView::widget( [
'dataProvider' => $dataProvider,
'columns' =>[
[
'attribute' => 'item_created_at',
'label' => 'Létrehozva',
'format' => 'datetime'
],
[
'attribute' => 'item_name',
'label' => 'Név',
],
[
'attribute' => 'user_username',
'label' => 'Felhasználó',
],
[
'attribute' => 'item_count_prev',
'label' => 'Előzö leltár (db)'
],
[
'attribute' => 'item_count_in',
'label' => 'Beszerzett mennyiség (db)'
],
[
'attribute' => 'item_count_sold',
'label' => 'Eladott mennyiség (db)',
],
[
'attribute' => 'item_count',
'label' => 'Leltározott mennyiség (db)',
],
[
'attribute' => 'item_difference',
'label' => 'Különbség (db)',
],
]
]);
?>