diff --git a/common/models/Key.php b/common/models/Key.php index a7d9445..afd941a 100644 --- a/common/models/Key.php +++ b/common/models/Key.php @@ -12,6 +12,7 @@ use common\components\Helper; * * @property integer $id_key * @property string $number + * @property string $rfid_key * @property integer $status * @property integer $type * @property string $created_at @@ -97,18 +98,30 @@ class Key extends \yii\db\ActiveRecord /** - * @param yii\db\Query $query + * @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 + * @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 ] ]); } - + + public function beforeSave($insert) + { + if ( parent::beforeSave($insert) ){ + + $this->rfid_key = Helper::fixAsciiChars($this->rfid_key); + + return true; + } + return false; + } + + }