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

17
backend/models/AccountStateSearch.php
View File

@@ -7,6 +7,7 @@ use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\AccountState;
use common\components\RoleDefinition;
use common\models\Account;
/**
* AccountStateSearch represents the model behind the search form about `common\models\AccountState`.
@@ -54,10 +55,16 @@ class AccountStateSearch extends AccountState
{
$query = AccountState::find();
$query->innerJoinWith('account');
if ( !RoleDefinition::isAdmin() ){
$query->innerJoin("user_account_assignment",'account_state.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 ]);
}
}
$dataProvider = new ActiveDataProvider([
@@ -76,13 +83,13 @@ class AccountStateSearch extends AccountState
$query->orderBy(['created_at' => SORT_DESC]);
$query->andFilterWhere([
'id_user' => $this->id_user,
'id_account' => $this->id_account,
'type' => $this->type,
'account_state.id_user' => $this->id_user,
'account_state.id_account' => $this->id_account,
'account_state.type' => $this->type,
]);
$query->andFilterWhere([ '>=', 'created_at', $this->timestampStart ] );
$query->andFilterWhere([ '<', 'created_at', $this->timestampEnd ] );
$query->andFilterWhere([ '>=', 'account_state.created_at', $this->timestampStart ] );
$query->andFilterWhere([ '<', 'account_state.created_at', $this->timestampEnd ] );
return $dataProvider;
}