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

implement registration in backend

Browse Source
This commit is contained in:
Roland Schneider
2018-12-30 23:04:06 +01:00
parent b2bb210cee
commit e3b6bc08a7
32 changed files with 794 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/models/Collection.php
View File

@@ -123,13 +123,20 @@ class Collection extends \common\models\BaseFitnessActiveRecord
return $result;
}
/**
*
* */
*
* @param string $mode
* @param $start
* @param $end
* @param $idUser
* @param $types
* @param $idAccount
* @return Query
*/
public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$types,$idAccount){
$query = new Query();
$query->innerJoin("account",'account.id_account = collection.id_account' );
@@ -168,7 +175,7 @@ public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$ty
}
public static function mkTotalsResultWithAllAvailableAccount($queryResult,$accounts,$accountMap,$idAccount){
public static function mkTotalsResultWithAllAvailableAccount($queryResult,$accounts,$idAccount){
$totals = [];
$totals['total'] = 0;
@@ -228,7 +235,7 @@ public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$ty
public static function mkReceptionTotal( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
$result = [];
$queryResult = self::exTotalQuery('reception', $start, $end, $idUser, $types, $idAccount );
$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $idAccount);
return $result;
}
}