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

change version to v.0.0.14 , add admin menu changes, add collection change

Browse Source
This commit is contained in:
Roland Schneider
2016-01-03 19:16:44 +01:00
parent 76ec26039f
commit dcb4e862b3
6 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/models/Collection.php
View File

@@ -68,6 +68,22 @@ class Collection extends \common\models\BaseFitnessActiveRecord
[['start', 'end', 'created_at', 'updated_at'], 'safe']
];
}
public function getAccount(){
return $this->hasOne( Account::className(), ["id_account" =>"id_account" ] ) ;
}
public function getAccountName(){
$result = "";
$account = $this->account;
if (isset($account)){
$result = $account->name;
}
return $result;
}
/**
* @inheritdoc
@@ -116,9 +132,18 @@ public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$ty
$query = new Query();
$query->innerJoin("account",'account.id_account = collection.id_account' );
if ( !RoleDefinition::isAdmin() ){
$query->innerJoin("user_account_assignment",'collection.id_account = user_account_assignment.id_account' );
$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
$query->andWhere(['account.type' => Account::TYPE_ALL ]);
if ( RoleDefinition::isReception()){
$query->andWhere(['transfer.id_user' => Yii::$app->user->id ]);
}
}
$query->addSelect( [
@@ -129,7 +154,7 @@ public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$ty
$query->from('collection');
$query->andFilterWhere([
'id_account' => $idAccount,
'collection.id_account' => $idAccount,
]);
$query->andFilterWhere(['collection.id_user' => $idUser]);