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

add inventory changes

Browse Source
This commit is contained in:
Roland Schneider
2016-03-23 08:15:37 +01:00
parent 7db129de92
commit e7b16f20ce
15 changed files with 413 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
backend/assets/InventoryItemIndexAsset.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace backend\assets;
use yii\web\AssetBundle;
/**
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class InventoryItemIndexAsset extends AssetBundle
{
public $basePath = '@webroot';
public $baseUrl = '@web';
public $css = [
];
public $js = [
'js/app.js',
'js/inventory.item.index.js',
];
public $depends = [
'backend\assets\AppAsset',
'yii\jui\JuiAsset',
'common\assets\TypeAheadAsset',
];
}

4
backend/controllers/InventoryController.php
View File

@@ -86,12 +86,12 @@ class InventoryController extends Controller
$model->id_user = \Yii::$app->user->id;
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->id_inventory]);
// return $this->redirect(['view', 'id' => $model->id_inventory]);
} else {
}
return $this->render('create', [
'model' => $model,
]);
}
}
/**

94
backend/controllers/InventoryItemController.php
View File

@@ -10,6 +10,8 @@ use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use backend\models\InventoryItemForm;
use common\models\Inventory;
use yii\helpers\Url;
use common\models\Product;
/**
* InventoryItemController implements the CRUD actions for InventoryItem model.
@@ -42,14 +44,95 @@ class InventoryItemController extends Controller
$searchModel = new InventoryItemSearch(['inventory' => $inventory]);
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
$productOptions = Product::buildProductAndInventoryGroupList();
if ($searchModel->output == 'xls') {
$this->downloadIndexXls($dataProvider);
}else{
Url::remember(Url::current(),"inventory-item-index");
}
return $this->render('index', [
'model' => $inventory,
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
'productOptions' =>$productOptions
]);
}
protected function downloadIndexXls($dataProvider){
$defs = [['item_created_at', 'Létrehozva'],
['item_name', 'Termék/Termék csoport'],
['user_username', 'Felhasználó'],
['item_count_prev', 'Előző leltár (db)'],
['item_count_sold', 'Eladott mennyiség (db)'],
['item_count_in', 'Beszerzett mennyiség (db)'],
['item_count', 'Leltározott mennyiség (db)'],
['item_difference', 'Különbség (db)'],
['item_count_system', 'Rendszer szerinti mennyiség (db)'],
];
$cols = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P'];
$models = $dataProvider->getModels ();
$objPHPExcel = new \PHPExcel ();
$sheet = $objPHPExcel->setActiveSheetIndex ( 0 );
/**
* Termék azonosító Termék neve Termék szám Termék vonalkód Termék raktáron Termék eladva
*/
$row = 1;
$col = 0;
foreach ( $defs as $def ) {
$sheet->setCellValue ( $cols [$col] . $row, $def [1] );
$col ++;
}
foreach ( $models as $model ) {
$row ++;
$col = 0;
foreach ( $defs as $def ) {
$sheet->setCellValue ( $cols [$col] . $row, $model[$def [0]] );
$col ++;
}
}
$styleArray = array (
'font' => array (
'bold' => true
)
);
// 'color' => array('rgb' => 'FF0000'),
// 'size' => 15,
// 'name' => 'Verdana'
foreach ( range ( 'A', 'I' ) as $columnID ) {
$sheet->getColumnDimension ( $columnID )->setAutoSize ( true );
$sheet->getStyle ( $columnID . '1' )->applyFromArray ( $styleArray );
}
// Redirect output to a client’s web browser (Excel5)
header ( 'Content-Type: application/vnd.ms-excel' );
header ( 'Content-Disposition: attachment;filename="leltar.xls"' );
header ( 'Cache-Control: max-age=0' );
// If you're serving to IE 9, then the following may be needed
header ( 'Cache-Control: max-age=1' );
// If you're serving to IE over SSL, then the following may be needed
header ( 'Expires: Mon, 26 Jul 1997 05:00:00 GMT' ); // Date in the past
header ( 'Last-Modified: ' . gmdate ( 'D, d M Y H:i:s' ) . ' GMT' ); // always modified
header ( 'Cache-Control: cache, must-revalidate' ); // HTTP/1.1
header ( 'Pragma: public' ); // HTTP/1.0
$objWriter = \PHPExcel_IOFactory::createWriter ( $objPHPExcel, 'Excel5' );
$objWriter->save ( 'php://output' );
exit ();
}
/**
* Displays a single InventoryItem model.
* @param integer $id
@@ -93,12 +176,21 @@ class InventoryItemController extends Controller
public function actionUpdate($id)
{
$model = $this->findModel($id);
$inventory = Inventory::findOne($model->id_inventory);
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->id_inventory_item]);
$prev = Url::previous("inventory-item-index");
if ( isset($prev)){
return $this->redirect($prev);
}else{
return $this->redirect([ 'index', 'id' => $inventory->id_inventory ]);
}
} else {
return $this->render('update', [
'model' => $model,
'inventory' => $inventory,
]);
}
}

4
backend/models/InventoryItemForm.php
View File

@@ -89,7 +89,6 @@ class InventoryItemForm extends Model{
}
public function save(){
if ( $this->validate()) {
$this->loadLastInventory();
@@ -128,10 +127,9 @@ class InventoryItemForm extends Model{
$this->inventory_item = $item;
return true;
}
return false;
}
protected function loadProductIn(){
$query = new Query();
$query->select(['sum(procurement.count) as total_in']);

45
backend/models/InventoryItemSearch.php
View File

@@ -20,7 +20,10 @@ use common\models\Inventory;
class InventoryItemSearch extends InventoryItem
{
public $inventory;
public $output;
public $item_name;
public $item_type;
public $item_id;
/**
* @inheritdoc
*/
@@ -28,6 +31,10 @@ class InventoryItemSearch extends InventoryItem
{
return [
[['id_inventory_item', 'id_inventory', 'count_in', 'count_sold', 'count', 'type', 'id_product', 'id_inventory_group', 'id_user'], 'integer'],
['output', 'string'],
['item_name', 'string'],
['item_type', 'string'],
['item_id', 'integer'],
];
}
@@ -50,6 +57,7 @@ class InventoryItemSearch extends InventoryItem
public function search($params)
{
$query = new Query();
$query->select([
'inventory_item.id_inventory_item as item_id_inventory_item',
'inventory_item.created_at as item_created_at',
@@ -65,6 +73,7 @@ class InventoryItemSearch extends InventoryItem
'inventory_prev.name as inventory_prev_name',
new Expression('(inventory_item.count - ( inventory_item.count_prev + inventory_item.count_in - inventory_item.count_sold )) as item_difference'),
]);
$query->from(InventoryItem::tableName());
@@ -78,9 +87,19 @@ class InventoryItemSearch extends InventoryItem
$query->andWhere( ['inventory_item.id_inventory' => $this->inventory->id_inventory] );
$this->load($params);
if (!$this->validate()) {
// uncomment the following line if you do not want to return any records when validation fails
// $query->where('0=1');
return $dataProvider;
}
$dataProvider = new ActiveDataProvider(
['query' => $query ,
'pagination' => ( empty($this->output) ? [] : false ),
'sort' => [
'defaultOrder' => ['item_name' => SORT_ASC],
'attributes' => Helper::mkYiiSortItems([
['item_created_at', 'item_created_at'],
['item_name', 'item_name'],
@@ -100,22 +119,16 @@ class InventoryItemSearch extends InventoryItem
]
]
);
$this->load($params);
if (!$this->validate()) {
// uncomment the following line if you do not want to return any records when validation fails
// $query->where('0=1');
return $dataProvider;
}
$query->andFilterWhere([
'inventory_item.id_inventory_item' => $this->id_inventory_item,
'inventory_item.type' => $this->type,
'inventory_item.id_product' => $this->id_product,
'inventory_item.id_inventory_group' => $this->id_inventory_group,
'inventory_item.id_user' => $this->id_user,
'inventory_item.created_at' => $this->created_at,
]);
if ( !empty($this->item_type) && is_numeric($this->item_id) ){
if ( $this->item_type == 'product'){
$query->andFilterWhere(['product.id_product' => $this->item_id]);
}else if ( $this->item_type == 'group' ){
$query->andFilterWhere(['inventory_group.id_inventory_group' => $this->item_id]);
}
}
return $dataProvider;
}

2
backend/views/inventory-item/_form.php
View File

@@ -12,8 +12,6 @@ use yii\widgets\ActiveForm;
<?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() ?>

32
backend/views/inventory-item/_search.php
View File

@@ -11,36 +11,22 @@ use yii\widgets\ActiveForm;
<div class="inventory-item-search">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'action' => ['index','id' => $model->inventory->id_inventory],
'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') ?>
<?= $form->field($model, 'item_type')->hiddenInput()->label(false) ?>
<?= $form->field($model, 'item_id')->hiddenInput()->label(false) ?>
<div class="row">
<div class="col-md-4">
<?= $form->field($model, 'item_name')->label("Termék/Termék csoport neve") ?>
</div>
</div>
<?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']) ?>
<?= Html::submitButton(Yii::t('common/inventory-item', 'Keresés'), ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>

32
backend/views/inventory-item/index.php
View File

@@ -4,6 +4,7 @@ use yii\helpers\Html;
use yii\grid\GridView;
use yii\widgets\DetailView;
use yii\helpers\Url;
use backend\assets\InventoryItemIndexAsset;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\InventoryItemSearch */
@@ -11,6 +12,15 @@ use yii\helpers\Url;
$this->title = Yii::t('common/inventory-item', 'Leltár részletei');
$this->params['breadcrumbs'][] = $this->title;
InventoryItemIndexAsset::register($this);
$options = [];
$options['products'] = $productOptions;
$this->registerJs('inventoryItemIndex.init( '. json_encode($options) .' );');
?>
<div class="inventory-item-index">
@@ -23,17 +33,17 @@ $this->params['breadcrumbs'][] = $this->title;
'name',
['attribute'=>'id_user',
'value'=>$model->userName
],
['attribute'=>'id_account',
'value'=>$model->accountName
],
'created_at:datetime',
],
]) ?>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<?php echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?= Html::a(Yii::t('common/inventory', 'Új termék felvétele a leltárba'), ['inventory-item/create','id' =>$model->id_inventory], ['class' => 'btn btn-success']) ?>
</p>
<p>
Magyarázat:
@@ -59,6 +69,10 @@ $this->params['breadcrumbs'][] = $this->title;
</ul>
</p>
<p>
<?php echo Html::a("XLS letöltése", Url::current(['InventoryItemSearch[output]' =>'xls']),['class' =>'btn btn-primary'])?>
</p>
<?php
echo GridView::widget( [
'dataProvider' => $dataProvider,
@@ -114,16 +128,14 @@ $this->params['breadcrumbs'][] = $this->title;
],
['class' => 'yii\grid\ActionColumn',
'template' => '{delete}',
'template' => '{update}',
'urlCreator' => function ($action, $model, $key, $index){
return Url::to(['inventory-item/delete', 'id' => $model['item_id_inventory_item' ] ]) ;
return Url::to(['inventory-item/update', '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',
'update' =>function ($url, $model, $key) {
return Html::a('Módosítás', $url,['class' => 'btn btn-xs btn-success',
'data' => [
'confirm' => Yii::t('common/inventory-item', 'Biztosan törlöd ezt az elemet?'),
'method' => 'post',
],
]) ;
}

36
backend/views/inventory-item/update.php
View File

@@ -1,13 +1,12 @@
<?php
use yii\helpers\Html;
use yii\widgets\DetailView;
/* @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->title = Yii::t('common/inventory-item', 'Leltár termék');
$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');
@@ -16,6 +15,37 @@ $this->params['breadcrumbs'][] = Yii::t('common/inventory-item', 'Update');
<h1><?= Html::encode($this->title) ?></h1>
<h2>Leltár</h2>
<?= DetailView::widget([
'model' => $inventory,
'attributes' => [
'id_inventory',
'name',
['attribute'=>'id_user',
'value'=>$inventory->userName
],
['attribute'=>'id_account',
'value'=>$inventory->accountName
],
'created_at:datetime',
],
]) ?>
<h2>Termék</h2>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
[
'value' => $model->name,
'label' =>"Név"
],
],
]) ?>
<?= $this->render('_form', [
'model' => $model,
]) ?>

9
backend/views/inventory/_form.php
View File

@@ -2,18 +2,27 @@
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use common\models\Account;
use common\components\Helper;
use frontend\components\HtmlHelper;
/* @var $this yii\web\View */
/* @var $model common\models\Inventory */
/* @var $form yii\widgets\ActiveForm */
?>
<?php
$accounts = ['' =>'Mind'] + HtmlHelper::mkAccountOptions( Account::readAccounts() );
?>
<div class="inventory-form">
<?php $form = ActiveForm::begin(); ?>
<div class="form-group">
<?php echo $form->field($model, "id_account")->dropDownList($accounts)?>
<?php echo $form->field($model, "name")->textInput()?>
<?= 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>

58
backend/web/js/inventory.item.index.js Normal file
View File

@@ -0,0 +1,58 @@
var inventoryItemIndex = {
defaults : {
products: [],
selector_type : '#inventoryitemsearch-item_type',
selector_name : '#inventoryitemsearch-item_name',
selector_id : '#inventoryitemsearch-item_id',
},
product: null,
init: function(o){
this.defaults = $.extend( this.defaults, o );
this.initAutocomplete();
},
initAutocomplete : function (){
var self = this;
var $input = $(self.defaults.selector_name);
$input.typeahead({source : self.defaults.products,
autoSelect: true,
items: 20,
minLength: 3,
});
$input.change(function() {
var current = $input.typeahead("getActive");
$("#filter_text").val('');
if (current) {
// Some item from your model is active!
if (current.name == $input.val()) {
self.product = current;
} else {
self.product = null;
}
} else {
self.product = null;
}
self.productChange();
});
},
productChange: function( ){
this.clearProductData();
this.setProductData();
},
clearProductData: function(){
$(this.defaults.selector_type).val('');
$(this.defaults.selector_id).val('');
},
setProductData: function(){
if ( this.product ){
$(this.defaults.selector_type).val( this.product.type);
$(this.defaults.selector_id ).val( this.product.id);
}
}
}