fix TestingQuestionPassing and AdminGrid

backend/web/js/table-manage-colvis.demo.js

@@ -7,8 +7,8 @@ Website: http://www.seantheme.com/color-admin-v1.6/admin/
 
 var handleDataTableColVis = function() {
 	"use strict";
-    $('table.table.table-striped.table-bordered .empty').closest('tr').remove();
-    if ($('table.table.table-striped.table-bordered').length !== 0) {
+    $('.dataTable .empty').closest('tr').remove();
+    if ($('.dataTable').length !== 0) {
         var table = $('table.table.table-striped.table-bordered').DataTable({
             dom: 'C<"clear">lfrtip',
             paging: false,

common/components/AdminController.php

@@ -10,7 +10,7 @@ abstract class AdminController extends \common\components\BaseController
 	
 	public static function getLocalId() {
 		
-		return str_replace('Controller','',self::className());
+		return str_replace('Controller', '', self::className());
 	}
 
     public function init()
@@ -32,69 +32,8 @@ abstract class AdminController extends \common\components\BaseController
             $this->redirect($admin_url);
         }
 
-        $this->initTabs();
         $this->view->registerJsFile('/js/packages/adminBaseClasses/buttonSet.js');
 		$this->view->registerJsFile('/js/packages/adminBaseClasses/gridBase.js');
 
     }
-
-	
-	private function initTabs()
-    {
- /*       $tabs = array();
-
-        $actions_titles = call_user_func(array(get_class(Yii::app()->controller), 'actionsTitles'));
-        foreach ($actions_titles as $action => $title)
-        {
-            if (in_array($action, array('Delete', 'Update', 'View')))
-            {
-                continue;
-            }
-
-            $tabs[$title] = $this->createUrl($action);
-        }
-
-        $this->tabs = $tabs;*/
-    }
-
-    private function initAssets()
-    {
-/*        $assets_dir = MODULES_PATH . Yii::app()->controller->module->id . '/assets/';
-        if (!is_dir($assets_dir))
-        {
-            return;
-        }
-
-        $dir_names = array('css', 'js');
-        foreach ($dir_names as $dir_name)
-        {
-            $dir = $assets_dir . $dir_name . '/';
-            if (!is_dir($dir))
-            {
-                continue;
-            }
-
-            $asset_dir = Yii::app()->getAssetManager()->publish($dir) . '/';
-
-            $scripts = scandir($dir);
-            foreach ($scripts as $script)
-            {
-                if ($script[0] == '.')
-                {
-                    continue;
-                }
-
-                if ($dir_name == 'js')
-                {
-                    echo $asset_dir . $script . "<br>";
-                    
-                    Yii::app()->clientScript->registerScriptFile($asset_dir . $script);
-                }
-                else if ($dir_name == 'css')
-                {
-                    Yii::app()->clientScript->registerCssFile($asset_dir . $script);
-                }
-            }
-        }*/
-    }
 }

common/modules/testings/controllers/TestingPassingAdminController.php

@@ -11,6 +11,7 @@ use common\modules\testings\models\TestingTest;
 use common\modules\testings\models\TestingPassing;
 use common\modules\testings\models\SearchTestingPassing;
 use common\modules\testings\models\TestingSession;
+use common\modules\testings\models\SearchTestingQuestionPassing;
 use common\modules\testings\models\TestingQuestionPassing;
 
 class TestingPassingAdminController extends AdminController
@@ -44,12 +45,13 @@ class TestingPassingAdminController extends AdminController
 
 	public function actionView($id)
 	{
-		// $questions = new TestingQuestionPassing('search');
-		// $questions->unsetAttributes();
+		$searchModel = new SearchTestingQuestionPassing();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams, null, null, $id);
 
 		return $this->render('view', [
             'model' => $this->findModel($id),
-            'questions' => $questions,
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
 			'time' => $this->showPeriod($model->time),
         ]);
 	}
@@ -223,7 +225,7 @@ class TestingPassingAdminController extends AdminController
      */
     protected function findModel($id)
     {
-        if (($model = TestingAnswer::findOne($id)) !== null) {
+        if (($model = TestingPassing::findOne($id)) !== null) {
             return $model;
         } else {
             throw new NotFoundHttpException('The requested page does not exist.');

common/modules/testings/models/SearchTestingQuestionPassing.php

+<?php
+
+namespace common\modules\testings\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+
+use common\modules\testings\models\TestingQuestionPassing;
+
+class SearchTestingQuestionPassing extends TestingQuestionPassing
+{
+	/**
+     * @inheritdoc
+     */
+	public function rules()
+	{
+		return [
+			[['id', 'passing_id', 'question_id', 'answer_time'], 'integer'],
+			[['id', 'passing_id', 'question_id', 'user_answer', 'answer_time'], 'safe'],
+        ];
+	}
+
+	/**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params, $order = null, $limit = null, $passing_id = null)
+    {
+        $query = TestingQuestionPassing::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+            'pagination' => ['pageSize' => self::PAGE_SIZE],
+            'sort'=>array(
+                'defaultOrder'=>'create_date DESC',
+            ),
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id' => $this->id,
+            'passing_id' => $this->passing_id,
+            'question_id' => $this->question_id,
+            'answer_time' => $this->answer_time,
+        ]);
+
+        $query->andFilterWhere(['like', 'user_answer', $this->user_answer]);
+
+        if($passing_id)
+        {
+        	$query->andWhere(['passing_id' => $passing_id]);
+        }
+
+        if(!empty($order))
+            $query->orderBy($order);
+
+        if(!empty($limit))
+            $query->limit($limit);
+
+        return $dataProvider;
+    }
+}
\ No newline at end of file

common/modules/testings/models/TestingPassing.php

@@ -109,38 +109,19 @@ class TestingPassing extends \common\components\ActiveRecordModel
         return $this->hasMany(TestingQuestionPassing::className(), ['passing_id' => 'id']);
     }
 
-    public function search() {
-		
-		$criteria = $this->buildSearchCriteria();
-
-		return new ActiveDataProvider(get_class($this), array(
-			'criteria' => $criteria
-		));
-	}
-
-    public function getCountPassedQuestions() {
-        //Получаем все вопросы
-        $questions = TestingQuestionPassing::model()->findAllByAttributes(
-            array('passing_id' => $this->id)
-        );
+    public function getCountPassedQuestions() 
+    {
         $count = 0;
-        foreach($questions as $question) {
-            if($question->isRight) {
+
+        foreach($this->questions as $question) 
+        {
+            if($question->isRight) 
+            {
                 $count++;
             }
         }
+
         return $count;
-        /*
-        $sql = 'SELECT count(*) FROM testings_questions q 
-            INNER JOIN testings_answers a ON q.id = a.question_id 
-            WHERE q.test_id = :test_id AND a.is_right = :is_right';
-        $count = Yii::app()->db->createCommand($sql)->queryScalar(array(
-            'test_id' => $this->id,
-            'is_right' => TestingAnswer::IS_RIGHT,
-        ));
-        return $count;
-         * 
-         */
     }
 
 	

common/modules/testings/models/TestingQuestion.php

@@ -114,33 +114,52 @@ class TestingQuestion extends \common\components\ActiveRecordModel
 
 	public function getRightAnswer() 
 	{
-		switch ($this->type) {
-			case self::ONE_OPTION :
-				$answerModel = TestingAnswer::model()->find('question_id = :question and is_right = 1',array(':question' => $this->id));
-				if ($answerModel) {
-					$answer = trim(preg_replace('/\s+/', ' ', $answerModel->text));
-				} else {
+		$query = TestingAnswer::find()->where(['question_id' => $this->id]);
+
+		switch ($this->type) 
+		{
+			case self::ONE_OPTION:
+				$model = $query->andWhere(['is_right' => 1])->one();
+
+				if($model)
+				{
+					$answer = trim(preg_replace('/\s+/', ' ', $model->text));
+				} 
+				else 
+				{
 					$answer = null;
 				}
 				break;
-			case self::FEW_OPTIONS :
-				$answerModel = TestingAnswer::model()->findAll('question_id = :question and is_right = 1',array(':question' => $this->id));
-				if ($answerModel) {
+
+			case self::FEW_OPTIONS:
+				$models = $query->andWhere(['is_right' => 1])->all();
+
+				if ($models) 
+				{
 					$arr = array();
-					foreach ($answerModel as $answerItem) {
-						$arr[] = trim(preg_replace('/\s+/', ' ', $answerItem->text));
+
+					foreach ($models as $model)
+					{
+						$arr[] = trim(preg_replace('/\s+/', ' ', $model->text));
 					}
+
 					sort($arr);
-					$answer = implode(self::DELIMITER,$arr);
-				} else {
+					$answer = implode(self::DELIMITER, $arr);
+				} 
+				else 
+				{
 					$answer = null;
 				}
 				break;
-			case self::USER_ANSWER :
-				$answerModel = TestingAnswer::model()->find('question_id = :question',array(':question' => $this->id));
-				if ($answerModel) {
-					$answer = trim(preg_replace('/\s+/', ' ', $answerModel->text));
-				} else {
+
+			case self::USER_ANSWER:
+				$models = $query->one();
+				if ($model) 
+				{
+					$answer = trim(preg_replace('/\s+/', ' ', $model->text));
+				} 
+				else 
+				{
 					$answer = null;
 				}
 				break;

common/modules/testings/models/TestingQuestionPassing.php

 <?php
 
-class TestingQuestionPassing extends ActiveRecordModel
-{
-    const PAGE_SIZE = 10;
+namespace common\modules\testings\models;
 
-	public static function model($className=__CLASS__)
-	{
-		return parent::model($className);
-	}
+use Yii;
+use yii\behaviors\TimestampBehavior;
+use yii\db\Expression;
+
+use common\modules\testings\models\TestingQuestion;
+use common\modules\testings\models\TestingPassing;
 
+class TestingQuestionPassing extends \common\components\ActiveRecordModel
+{
+    const PAGE_SIZE = 10;
 
-	public function tableName()
+	public static function tableName()
 	{
 		return 'testings_questions_passings';
 	}
@@ -18,49 +21,59 @@ class TestingQuestionPassing extends ActiveRecordModel
 
     public function name()
     {
-        return 'Модель TestingsQuestionsPassings';
+        return 'Назначенные вопросы';
     }
 
-	public function behaviors(){
-		return array(
-			'CTimestampBehavior' => array(
-				'class' => 'zii.behaviors.CTimestampBehavior',
-				'createAttribute' => 'create_date',
-				'updateAttribute' => null,
-			)
-		);
-	}
+	/**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            [
+	            'class' => TimestampBehavior::className(),
+	            'createdAtAttribute' => 'create_date',
+	            'updatedAtAttribute' => null,
+	            'value' => new Expression('NOW()'),
+	        ],
+        ];
+    }
 
+	/**
+     * @inheritdoc
+     */
 	public function rules()
 	{
-		return array(
-			array('passing_id, question_id', 'required'),
-			array('passing_id, answer_time', 'numerical', 'integerOnly' => true),
-			array('question_id', 'length', 'max' => 11),
-			array('user_answer', 'length', 'max' => 3000),
-
-			array('id, passing_id, question_id, user_answer, answer_time', 'safe', 'on' => 'search'),
-		);
+		return [
+			[['passing_id', 'question_id'], 'required'],
+			[['passing_id', 'answer_time'], 'integer'],
+			[['question_id'], 'string', 'max' => 11],
+			[['user_answer'], 'string', 'max' => 3000],
+			// array('id, passing_id, question_id, user_answer, answer_time', 'safe', 'on' => 'search'),
+        ];
 	}
 
-	public function attributeLabels() {
-		return array(
+	public function attributeLabels() 
+	{
+		return [
 			'question_id' => 'Наименование вопроса',
 			'user_answer' => 'Ответ пользователя',
 			'answer_time' => 'Время прохождения, секунд',
 			'create_date' => 'Дата создания',
 			'question_text' => 'Текст вопроса',
 			'answer_text' => 'Правильный ответ',
-		);
+		];
 	}
 
-	public function relations()
-	{
-		return array(
-			'question' => array(self::BELONGS_TO, 'TestingQuestion', 'question_id'),
-			'passing' => array(self::BELONGS_TO, 'TestingPassing', 'passing_id'),
-		);
-	}
+	public function getQuestion()
+    {
+        return $this->hasOne(TestingQuestion::className(), ['id' => 'question_id']);
+    }
+
+    public function getPassing()
+    {
+        return $this->hasOne(TestingPassing::className(), ['passing_id' => 'id']);
+    }
 
 	public function search($passing = null)
 	{
@@ -82,31 +95,39 @@ class TestingQuestionPassing extends ActiveRecordModel
 		));
 	}
 
-	public function getIsRight() {
+	public function getIsRight() 
+	{
 		$right = false;
-		switch ($this->question->type) {
-			case TestingQuestion::ONE_OPTION :
+
+		switch ($this->question->type) 
+		{
+			case TestingQuestion::ONE_OPTION:
 				$right = (trim($this->answer_text) == trim($this->user_answer));
 				break;
-			case TestingQuestion::FEW_OPTIONS :
+
+			case TestingQuestion::FEW_OPTIONS:
 				$arr = explode(TestingQuestion::DELIMITER, $this->answer_text);
-				foreach ($arr as $index => $item) {
+				foreach ($arr as $index => $item) 
+				{
 					$arr[$index] = trim(preg_replace('/\s+/', ' ', mb_strtolower($item)));
 				}
 				$arr2 = explode(TestingQuestion::DELIMITER, $this->user_answer);
-				foreach ($arr2 as $index => $item) {
+				foreach ($arr2 as $index => $item) 
+				{
 					$arr2[$index] = trim(preg_replace('/\s+/', ' ', mb_strtolower($item)));
 				}
 				sort($arr);
 				sort($arr2);
 				$right = ($arr == $arr2); // TRUE в случае, если $a и $b содержат одни и те же элементы
 				break;
-			case TestingQuestion::USER_ANSWER :
+
+			case TestingQuestion::USER_ANSWER:
 				$opt1 = str_replace(';', ',', preg_replace('/\s+/', '', mb_strtolower($this->answer_text)));
 				$opt2 = str_replace(';', ',', preg_replace('/\s+/', '', mb_strtolower($this->user_answer)));
 				$right = (trim($opt1) == trim($opt2));
 				break;
 		}
+
 		return $right;
 	}
 

common/modules/testings/views/testing-answer-admin/view.php

@@ -7,8 +7,6 @@ use common\modules\testings\models\TestingAnswer;
 
 /* @var $this yii\web\View */
 
-$this->title = $model->text;
-
 ?>
 
 <div class="faq-view">

common/modules/testings/views/testing-passing-admin/view.php

@@ -2,15 +2,25 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use \common\components\zii\AdminGrid;
 
-use common\modules\testings\models\TestingQuestion;
+use common\modules\testings\models\TestingPassing;
 
 /* @var $this yii\web\View */
 
-$this->title = $model->text;
-
 ?>
 
+<style type="text/css">
+	.STATE1 {
+		font-weight: bold;
+		color: #449944;
+	}
+	.STATE {
+		font-weight: bold;
+		color: #ee4444;
+	}
+</style>
+
 <div class="faq-view">
 
     <?= DetailView::widget([
@@ -18,42 +28,23 @@ $this->title = $model->text;
         'attributes' => [
         	[
 				'attribute' => 'user_id',
-				'value' => function($model)
-				{
-					if($model->user)
-					{
-						return Html::a($model->user->fio, ["/testings/testing-user-admin/view", "id" => $model->user->id]);
-					}
-					else
-					{
-						return "Пользователь удалён";
-					}
-				},
+				'value' => ($model->user) ? Html::a($model->user->fio, ["/testings/testing-user-admin/view", "id" => $model->user->id]) : "Пользователь удалён",
 				'format' => 'html',
 			],
 			[
 				'attribute' => 'session_id',
-				'value' => function($model)
-				{
-					return Html::a($model->test->session->name, ["/testings/testing-session-admin/view", "id" => $model->test->session_id]);
-				},
+				'value' => Html::a($model->test->session->name, ["/testings/testing-session-admin/view", "id" => $model->test->session_id]),
 				'format' => 'html',
 			],
 			[
 				'attribute' => 'test_id',
-				'value' => function($model)
-				{
-					return Html::a($model->test->name, ["/testings/testing-test-admin/view", "id" => $model->test_id]);
-				},
+				'value' => Html::a($model->test->name, ["/testings/testing-test-admin/view", "id" => $model->test_id]),
 				'format' => 'html',
 			],
 			[
 				'attribute' => 'is_passed',
 	            'format' => 'raw',
-	            'value' =>   function($model)
-	            {
-	            	return TestingPassing::$state_list[$model->is_passed] . " ({$model->CountPassedQuestions} - {$model->percent_rights}%)";
-	            },
+	            'value' => TestingPassing::$state_list[$model->is_passed] . " ({$model->CountPassedQuestions} - {$model->percent_rights}%)",
 			],
 			'pass_date',
         ],
@@ -62,76 +53,43 @@ $this->title = $model->text;
 </div>
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<style type="text/css">
-	.STATE1 {
-		font-weight: bold;
-		color: #449944;
-	}
-	.STATE {
-		font-weight: bold;
-		color: #ee4444;
-	}
-</style>
-
 <br /><br />
 <h1>Подробная статистика по ответам</h1>
 <h3>(Всего времени затрачено: <?php echo $time; ?>)</h3>
 
-<?php
-	$this->widget('AdminGrid', array(
-		'id' => 'testing-question-passing-grid',
-		'dataProvider' => $questions->search($model->id),
-		'filter' => $questions,
-		'columns' => array(
-			array(
-				'name' => 'question_id',
-				'value' => '$data->question->text',
-				'filter' => false,
-			),
-			array(
-				'header' => 'Правильный ответ',
-				'value' => '$data->question->rightAnswer',
-				'filter' => false,
-			),
-			array(
-				'name' => 'user_answer',
-				'filter' => false,
-			),
-			array(
-				'header' => 'Ответ',
-				'value' => 'CHtml::tag("span",array("class"=>"STATE".$data->isRight),TestingPassing::$answer_list[$data->isRight])." ".'
-					.'CHtml::link("Изменить на обратное",array("/testings/testingPassingAdmin/changeAnswerStatus","qp_id"=>$data->id))',
-				'filter' => false,
-				'type' => 'html',
-			),
-			array(
-				'name' => 'answer_time',
-				'filter' => false,
-			),
-		),
-		'emptyText'=>'Подробная статистика появится тут после того, как пользователь начнёт тестирование',
-	));
+
+<?php echo AdminGrid::widget([
+    'dataProvider' => $dataProvider,
+    // 'emptyText'=>'Подробная статистика появится тут после того, как пользователь начнёт тестирование',
+	'filterModel' => $searchModel,
+    'columns' => [
+       	// ['class' => 'yii\grid\SerialColumn'],
+
+    	[
+            'attribute' => 'question_id',
+            'value' => function($model)
+            {
+            	return $model->question->text;
+            }
+        ],
+        [
+            'header' => 'Правильный ответ',
+            'value' => function($model)
+            {
+            	return $model->question->rightAnswer;
+            }
+        ],
+        'user_answer',
+        [
+            'header' => 'Ответ',
+            'value' => function($model)
+            {
+            	return Html::tag("span", TestingPassing::$answer_list[$model->isRight], ["class"=>"STATE".$model->isRight]) . " " . Html::a("Изменить на обратное", ["/testings/testing-passing-admin/change-answer-status", "qp_id" => $model->id]);
+            },
+            'format' => 'html'
+        ],
+        'answer_time',
+    ],
+]); ?>
+
 

common/modules/testings/views/testing-question-admin/view.php

@@ -7,8 +7,6 @@ use common\modules\testings\models\TestingQuestion;
 
 /* @var $this yii\web\View */
 
-$this->title = $model->text;
-
 ?>
 
 <div class="faq-view">

common/modules/testings/views/testing-session-admin/view.php

@@ -6,25 +6,15 @@ use yii\widgets\DetailView;
 /* @var $this yii\web\View */
 /* @var $model common\modules\faq\models\Faq */
 
-$this->title = $model->name;
-
-$this->params['breadcrumbs'][] = ['label' => 'Список сессий', 'url' => ['/testings/testing-session-admin/manage']];
-$this->params['breadcrumbs'][] = 'Сессия "' . $model->name;
 ?>
 
 <div class="faq-view">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <h1><?= Html::encode($model->name) ?></h1>
 
     <p>
         <?= Html::a(Yii::t('content', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <!-- <?= Html::a(Yii::t('content', 'Delete'), ['delete', 'id' => $model->id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('content', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?> -->
+        <?= Html::a("Экспорт результатов", ['testings/testing-session-admin/export-session-result', 'id' => $model->id], ['class' => 'btn btn-info']) ?>        
     </p>
 
     <?= DetailView::widget([

common/modules/testings/views/testing-test-admin/view.php

@@ -6,13 +6,11 @@ use yii\widgets\DetailView;
 /* @var $this yii\web\View */
 /* @var $model common\modules\faq\models\Faq */
 
-$this->title = $model->name;
-
 ?>
 
 <div class="faq-view">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <h1><?= Html::encode($model->name) ?></h1>
 
     <p>
         <?= Html::a(Yii::t('content', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>

common/modules/testings/views/testing-user-admin/view.php

@@ -8,13 +8,11 @@ use common\modules\testings\models\TestingUser;
 /* @var $this yii\web\View */
 /* @var $model common\modules\faq\models\Faq */
 
-$this->title = $model->fio;
-
 ?>
 
 <div class="faq-view">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <h1><?= Html::encode($model->fio) ?></h1>
 
     <p>
         <?= Html::a(Yii::t('content', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>