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

add indexes, add messagedetsta

Browse Source
This commit is contained in:
Roland Schneider
2016-01-29 17:13:33 +01:00
parent ad59cbb940
commit a00331ce7c
65 changed files with 3195 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/models/Card.php
View File

@@ -89,6 +89,12 @@ class Card extends \common\models\BaseFitnessActiveRecord
}
return $result;
}
public static function toStatusName($status , $def = ""){
return Helper::getArrayValue(self::statuses(), $status, $def);
}
public static function toTypeName($type , $def = ""){
return Helper::getArrayValue(self::types(), $type, $def);
}
static function types() {
return [

19
common/models/Key.php
View File

@@ -4,6 +4,8 @@ namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior;
use yii\db\Query;
use common\components\Helper;
/**
* This is the model class for table "key".
@@ -91,5 +93,20 @@ class Key extends \yii\db\ActiveRecord
}
return $result;
}
/**
* @param yii\db\Query $query
* */
public static function addKeyCondition($query, $number , $fieldNumber = "key.number",$fieldRfid = "key.rfid_key"){
$number = Helper::fixAsciiChars($number);
$query->andWhere( ['or' , [$fieldNumber =>$number ],[$fieldRfid =>$number ] ]);
}
/**
* @param yii\db\Query $query
* */
public static function addKeyConditionOptional($query, $number , $fieldNumber = "key.number",$fieldRfid = "key.rfid_key"){
$number = Helper::fixAsciiChars($number);
$query->andFilterWhere( ['or' , [$fieldNumber =>$number ],[$fieldRfid =>$number ] ]);
}
}

61
common/models/MessageDetsta.php Normal file
View File

@@ -0,0 +1,61 @@
<?php
namespace common\models;
use Yii;
use common\components\giro\GiroDETSTA;
/**
* This is the model class for table "message_detsta".
*
* @property integer $id_message
* @property string $path
* @property integer $id_user
* @property string $created_at
* @property string $updated_at
*/
class MessageDetsta extends \yii\db\ActiveRecord
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'message_detsta';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id_message' => Yii::t('common/message_detsta', 'Id Message'),
'path' => Yii::t('common/message_detsta', 'Path'),
'id_user' => Yii::t('common/message_detsta', 'Id User'),
'created_at' => Yii::t('common/message_detsta', 'Created At'),
'updated_at' => Yii::t('common/message_detsta', 'Updated At'),
];
}
public function getFej( ) {
return $this->hasOne(MessageDetstaFej::className(), ['id_message' => 'id_message']);
}
public function getLab( ) {
return $this->hasOne(MessageDetstaLab::className(), ['id_message' => 'id_message']);
}
public function getTetelek( ) {
return $this->hasMany(MessageDetstaTetel::className(), ['id_message' => 'id_message']);
}
}

64
common/models/MessageDetstaFej.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
namespace common\models;
use Yii;
/**
* This is the model class for table "message_detsta_fej".
*
* @property integer $id_message_detsta_fej
* @property integer $id_message
* @property string $record_tipus
* @property string $uzenet_tipus
* @property string $jelentes_jelzo
* @property string $kezdemenyezo_azonosito
* @property integer $csoportos_uzenet_sorszam
* @property string $csoportos_uzenet_datum
* @property integer $detsta_uzenet_sorszam
* @property string $detsta_uzenet_datum
* @property string $ido
*/
class MessageDetstaFej extends \yii\db\ActiveRecord
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'message_detsta_fej';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['id_message', 'csoportos_uzenet_sorszam', 'detsta_uzenet_sorszam'], 'integer'],
[['csoportos_uzenet_datum', 'detsta_uzenet_datum'], 'safe'],
[['record_tipus', 'uzenet_tipus', 'jelentes_jelzo', 'ido'], 'string', 'max' => 10],
[['kezdemenyezo_azonosito'], 'string', 'max' => 20]
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id_message_detsta_fej' => Yii::t('common/message_detsta', 'Id Message Detsta Fej'),
'id_message' => Yii::t('common/message_detsta', 'Id Message'),
'record_tipus' => Yii::t('common/message_detsta', 'Record Tipus'),
'uzenet_tipus' => Yii::t('common/message_detsta', 'Uzenet Tipus'),
'jelentes_jelzo' => Yii::t('common/message_detsta', 'Jelentes Jelzo'),
'kezdemenyezo_azonosito' => Yii::t('common/message_detsta', 'Kezdemenyezo Azonosito'),
'csoportos_uzenet_sorszam' => Yii::t('common/message_detsta', 'Csoportos Uzenet Sorszam'),
'csoportos_uzenet_datum' => Yii::t('common/message_detsta', 'Csoportos Uzenet Datum'),
'detsta_uzenet_sorszam' => Yii::t('common/message_detsta', 'Detsta Uzenet Sorszam'),
'detsta_uzenet_datum' => Yii::t('common/message_detsta', 'Detsta Uzenet Datum'),
'ido' => Yii::t('common/message_detsta', 'Ido'),
];
}
}

58
common/models/MessageDetstaLab.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
namespace common\models;
use Yii;
/**
* This is the model class for table "message_detsta_lab".
*
* @property integer $id_message_detsta_lab
* @property integer $id_message
* @property string $record_tipus
* @property integer $teljesitett_tetelek_szama
* @property integer $teljesitett_tetelek_osszerteke
* @property integer $visszautasitott_tetelek_szama
* @property integer $visszautasitott_tetelek_osszerteke
* @property integer $megnemvalaszolt_tetelek_szama
* @property integer $megnemvalaszolt_tetelek_osszerteke
*/
class MessageDetstaLab extends \yii\db\ActiveRecord
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'message_detsta_lab';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['id_message', 'teljesitett_tetelek_szama', 'teljesitett_tetelek_osszerteke', 'visszautasitott_tetelek_szama', 'visszautasitott_tetelek_osszerteke', 'megnemvalaszolt_tetelek_szama', 'megnemvalaszolt_tetelek_osszerteke'], 'integer'],
[['record_tipus'], 'string', 'max' => 10]
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id_message_detsta_lab' => Yii::t('common/message_detsta', 'Id Message Detsta Lab'),
'id_message' => Yii::t('common/message_detsta', 'Id Message'),
'record_tipus' => Yii::t('common/message_detsta', 'Record Tipus'),
'teljesitett_tetelek_szama' => Yii::t('common/message_detsta', 'Teljesitett Tetelek Szama'),
'teljesitett_tetelek_osszerteke' => Yii::t('common/message_detsta', 'Teljesitett Tetelek Osszerteke'),
'visszautasitott_tetelek_szama' => Yii::t('common/message_detsta', 'Visszautasitott Tetelek Szama'),
'visszautasitott_tetelek_osszerteke' => Yii::t('common/message_detsta', 'Visszautasitott Tetelek Osszerteke'),
'megnemvalaszolt_tetelek_szama' => Yii::t('common/message_detsta', 'Megnemvalaszolt Tetelek Szama'),
'megnemvalaszolt_tetelek_osszerteke' => Yii::t('common/message_detsta', 'Megnemvalaszolt Tetelek Osszerteke'),
];
}
}

73
common/models/MessageDetstaTetel.php Normal file
View File

@@ -0,0 +1,73 @@
<?php
namespace common\models;
use Yii;
/**
* This is the model class for table "message_detsta_tetel".
*
* @property integer $id_message_detsta_tetel
* @property integer $id_message
* @property integer $id_ticket_installment_request
* @property string $record_tipus
* @property integer $tetel_sorszam
* @property integer $osszeg
* @property string $eredeti_tetel_elszamolasi_datuma
* @property string $visszajelzes_informacio
* @property string $feldolgozas_datum
* @property string $terhelesi_datum
* @property string $valasz_hivatkozasi_kod
* @property string $eredeti_hivatkozasi_kod
* @property string $ugyfel_azonosito
*/
class MessageDetstaTetel extends \yii\db\ActiveRecord
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'message_detsta_tetel';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['id_message', 'id_ticket_installment_request', 'tetel_sorszam', 'osszeg'], 'integer'],
[['eredeti_tetel_elszamolasi_datuma', 'feldolgozas_datum', 'terhelesi_datum'], 'safe'],
[['record_tipus', 'visszajelzes_informacio'], 'string', 'max' => 10],
[['valasz_hivatkozasi_kod', 'eredeti_hivatkozasi_kod', 'ugyfel_azonosito'], 'string', 'max' => 50]
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id_message_detsta_tetel' => Yii::t('common/message_detsta', 'Id Message Detsta Tetel'),
'id_message' => Yii::t('common/message_detsta', 'Id Message'),
'id_ticket_installment_request' => Yii::t('common/message_detsta', 'Id Ticket Installment Request'),
'record_tipus' => Yii::t('common/message_detsta', 'Record Tipus'),
'tetel_sorszam' => Yii::t('common/message_detsta', 'Tetel Sorszam'),
'osszeg' => Yii::t('common/message_detsta', 'Osszeg'),
'eredeti_tetel_elszamolasi_datuma' => Yii::t('common/message_detsta', 'Eredeti Tetel Elszamolasi Datuma'),
'visszajelzes_informacio' => Yii::t('common/message_detsta', 'Visszajelzes Informacio'),
'feldolgozas_datum' => Yii::t('common/message_detsta', 'Feldolgozas Datum'),
'terhelesi_datum' => Yii::t('common/message_detsta', 'Terhelesi Datum'),
'valasz_hivatkozasi_kod' => Yii::t('common/message_detsta', 'Valasz Hivatkozasi Kod'),
'eredeti_hivatkozasi_kod' => Yii::t('common/message_detsta', 'Eredeti Hivatkozasi Kod'),
'ugyfel_azonosito' => Yii::t('common/message_detsta', 'Ugyfel Azonosito'),
];
}
public function getRequest(){
return $this->hasOne(TicketInstallmentRequest::className(), ['id_ticket_installment_request' => 'id_ticket_installment_request']);
}
}

18
common/models/Procurement.php
View File

@@ -3,6 +3,7 @@
namespace common\models;
use Yii;
use common\components\Helper;
/**
* This is the model class for table "procurement".
@@ -22,6 +23,7 @@ class Procurement extends \common\models\BaseFitnessActiveRecord
{
public $productIdentifier;
public $id_account;
/**
* @inheritdoc
@@ -38,8 +40,8 @@ class Procurement extends \common\models\BaseFitnessActiveRecord
{
return [
[['id_warehouse', 'count', 'purchase_price' ], 'required'],
[['id_warehouse', 'count', 'productIdentifier', 'purchase_price' ], 'required' , 'on' => 'create_general'],
[['id_warehouse', 'id_user', 'id_product', 'count', 'stock', 'purchase_price'], 'integer'],
[['id_warehouse', 'count', 'productIdentifier', 'purchase_price' ,'id_account'], 'required' , 'on' => 'create_general'],
[['id_warehouse', 'id_user', 'id_product', 'count', 'stock', 'purchase_price','id_account'], 'integer'],
[['description'], 'string', 'max' => 255],
[['productIdentifier'], 'string', 'max' => 128],
[['productIdentifier'] ,'validateProductIdentifier', 'on' => 'create_general']
@@ -70,11 +72,17 @@ class Procurement extends \common\models\BaseFitnessActiveRecord
$product = null;
if ( isset($this->productIdentifier)){
$id = $this->productIdentifier;
$conditionProductName = ['name' =>$id];
$name = $this->productIdentifier;
$id = Helper::fixAsciiChars( $this->productIdentifier );
// $conditionProductName = ['name' =>$id];
$conditionProductNumber = ['product_number' =>$id];
$conditionBarcode= ['barcode' =>$id];
$products = Product::find()->andWhere(['or', ['name' =>$id] , ['product_number' =>$id] ,['barcode' =>$id] ] )->all();
$query = Product::find()
->andWhere(['or', ['product_number' =>$id] ,['barcode' =>$id] ] );
if ( Helper::isProductVisibilityAccount() ){
$query->andWhere(['id_account' => $this->id_account]);
}
$products = $query->all();
if ( count($products) == 1 ){
$product = $products[0];
$this->id_product = $product->id_product;

4
common/models/Ugiro.php
View File

@@ -71,6 +71,10 @@ class Ugiro extends \yii\db\ActiveRecord
public function getUser(){
return $this->hasOne( User::className(), ["id" =>"id_user" ] );
}
public function getMessageDetsta(){
return $this->hasOne( MessageDetsta::className(), ["id_ugiro" =>"id_ugiro" ] );
}
public function getRequests()