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

add collection changes

Browse Source
This commit is contained in:
Roland Schneider
2015-11-04 08:59:20 +01:00
parent 931b83040b
commit ed9c1e77cd
12 changed files with 210 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/models/Collection.php
View File

@@ -24,6 +24,9 @@ use yii\behaviors\TimestampBehavior;
*/
class Collection extends \common\models\BaseFitnessActiveRecord
{
const TYPE_RECEPTION = 10;
/**
* @inheritdoc
*/
@@ -86,17 +89,17 @@ class Collection extends \common\models\BaseFitnessActiveRecord
/**
* @param \common\models\User $user the user
* */
public static function readLast($user){
public static function readLast($user,$types = [Collection::TYPE_RECEPTION]){
$result = null;
$query = Collection::find();
if ( isset($user)){
$query->andWhere($user->id);
$query->andWhere(['id_user' =>$user->id]);
}
$query->andFilterWhere([ 'in', 'type' ,$types]);
$query->orderBy(['end' => SORT_DESC]);
$query->limit(1);
$result = $query->one();
return $result;