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

add filters, update api, update api docs

Browse Source
This commit is contained in:
iIronside
2021-11-12 14:30:01 +03:00
parent 560de1c05e
commit 12914e9f8f
27 changed files with 8734 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/modules/questionnaire/controllers/AnswerController.php
View File

@@ -2,9 +2,12 @@
namespace backend\modules\questionnaire\controllers;
use console\controllers\MovingController;
use Yii;
use backend\modules\questionnaire\models\Answer;
use backend\modules\questionnaire\models\AnswerSearch;
use yii\helpers\Console;
use yii\helpers\Html;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;

31
backend/modules/questionnaire/controllers/QuestionController.php
View File

@@ -83,12 +83,10 @@ class QuestionController extends Controller
if ($model->load(Yii::$app->request->post()) && $model->save()) {
if ($questionnaire_id !== null )
{
if ($questionnaire_id !== null) {
return $this->redirect(['questionnaire/view', 'id' => $questionnaire_id]);
}
elseif ($question_type_id !== null)
{
elseif ($question_type_id !== null) {
return $this->redirect(['question-type/view', 'id' => $question_type_id]);
}
@@ -113,12 +111,10 @@ class QuestionController extends Controller
if ($model->load(Yii::$app->request->post()) && $model->save()) {
if ($questionnaire_id !== null)
{
if ($questionnaire_id !== null) {
return $this->redirect(['questionnaire/view', 'id' => $questionnaire_id]);
}
elseif ($question_type_id !== null)
{
elseif ($question_type_id !== null) {
return $this->redirect(['question-type/view', 'id' => $question_type_id]);
}
@@ -139,15 +135,12 @@ class QuestionController extends Controller
*/
public function actionDelete(int $id, $questionnaire_id = null, $question_type_id = null)
{
$this->findModel($id)->delete();
if ($questionnaire_id !== null)
{
if ($questionnaire_id !== null) {
return $this->redirect(['questionnaire/view', 'id' => $questionnaire_id]);
}
elseif ($question_type_id !== null)
{
elseif ($question_type_id !== null) {
return $this->redirect(['question-type/view', 'id' => $question_type_id]);
}
@@ -169,4 +162,16 @@ class QuestionController extends Controller
throw new NotFoundHttpException('The requested page does not exist.');
}
// protected function goToView($questionnaire_id = null, $question_type_id = null)
// {
// if ($questionnaire_id !== null)
// {
// return $this->redirect(['questionnaire/view', 'id' => $questionnaire_id]);
// }
// elseif ($question_type_id !== null)
// {
// return $this->redirect(['question-type/view', 'id' => $question_type_id]);
// }
// }
}

2
backend/modules/questionnaire/controllers/UserQuestionnaireController.php
View File

@@ -153,7 +153,7 @@ class UserQuestionnaireController extends Controller
$parents = $_POST['depdrop_parents'];
if ($parents != null) {
$cat_id = $parents[0];
$categories = Questionnaire::questionnairesOfCategoryArr($cat_id);
$categories = Questionnaire::questionnairesByCategoryArr($cat_id);
$formattedCatArr = array();
foreach ($categories as $key => $value){