apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into update_user_answers

Browse Source 
# Conflicts:
#	frontend-access.log
#	frontend-error.log
This commit is contained in:
iironside
2022-03-15 12:58:15 +03:00
parent 745c53ed39 8a9ddec20c
commit ade80dc859
44 changed files with 5881 additions and 1343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/modules/api/controllers/UserQuestionnaireController.php
View File

@ -33,7 +33,7 @@ class UserQuestionnaireController extends ApiController
/**
* @throws NotFoundHttpException
*/
public function actionQuestionnairesList(): array
public function actionQuestionnairesList()//: array
{
$user_id = Yii::$app->request->get('user_id');
@ -42,21 +42,21 @@ class UserQuestionnaireController extends ApiController
throw new NotFoundHttpException('Incorrect user ID');
}
$userQuestionnaireModel = UserQuestionnaire::findActiveUserQuestionnaires($user_id);
if(empty($userQuestionnaireModel)) {
$userQuestionnaireModels = UserQuestionnaire::findActiveUserQuestionnaires($user_id);
if(empty($userQuestionnaireModels)) {
throw new NotFoundHttpException('Active questionnaire not found');
}
array_walk( $userQuestionnaireModel, function(&$arr){
array_walk( $userQuestionnaireModels, function(&$arr){
unset(
$arr['questionnaire_id'],
$arr['created_at'],
$arr['updated_at'],
// $arr['created_at'],
// $arr['updated_at'],
$arr['id'],
);
});
return $userQuestionnaireModel;
return $userQuestionnaireModels;
}
public function actionQuestionnaireCompleted()