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

add transfer#list pdf download, fix helper#fixascii function

Browse Source
This commit is contained in:
Roland Schneider
2016-01-06 16:18:15 +01:00
parent 932f071c13
commit 39ae361505
29 changed files with 1519 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/models/TransferListSearch.php
View File

@@ -12,17 +12,23 @@ use common\models\Account;
class TransferListSearch extends \common\models\TransferListSearch
{
public function init(){
parent::init();
$this->mode = 'admin';
}
protected function addAccountConstraint($query){
if ( !RoleDefinition::isAdmin() ){
$query->innerJoin("user_account_assignment",'transfer.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::isAdmin() ){
// $query->innerJoin("user_account_assignment",'transfer.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 ]);
}
// if ( RoleDefinition::isReception()){
// $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]);
// }
}
// }
}
}

43
backend/models/TransferListUserGroupedSearch.php Normal file
View File

@@ -0,0 +1,43 @@
<?php
namespace backend\models;
use Yii;
use common\models\Transfer;
use common\components\RoleDefinition;
use common\models\Account;
use common\components\DailyListing;
/**
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferListUserGroupedSearch extends \common\models\TransferListSearch
{
public $ticketMoneyByUser;
public function init(){
parent::init();
$this->mode = 'admin';
}
public function search($params)
{
$this->load($params);
if (!$this->validate()) {
}
$listing = new DailyListing();
$listing->mode = $this->mode;
$listing->loadFilters($this);
$this->ticketMoneyByUser = $listing->readTicketMoneyByUser();
}
}