New feature: Check question order during integrity check

LimeSurvey · Mar 9, 2018 · f069b55 · f069b55
1 parent 8877379
commit f069b55
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 2 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -13,7 +13,7 @@
 
 
 $config['versionnumber'] = '3.4.4'; //The current version of this branch, LS3
-$config['dbversionnumber'] = 348;
+$config['dbversionnumber'] = 347;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '30020';

diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
@@ -826,6 +826,11 @@ protected function _checkintegrity()
         /**********************************************************************/
         $aDelete['groupOrderDuplicates'] = $this->checkGroupOrderDuplicates();
 
+        /**********************************************************************/
+        /*     Check question sort order duplicates                           */
+        /**********************************************************************/
+        $aDelete['questionOrderDuplicates'] = $this->checkQuestionOrderDuplicates();
+
         /**********************************************************************/
         /*     CHECK CPDB SURVEY_LINKS TABLE FOR REDUNDENT Survey participants tableS       */
         /**********************************************************************/
@@ -852,7 +857,7 @@ protected function _checkintegrity()
 
     /**
      * Check group order duplicates.
-     * @return array Result.
+     * @return array
      */
     protected function checkGroupOrderDuplicates()
     {
@@ -880,6 +885,52 @@ protected function checkGroupOrderDuplicates()
         return $result;
     }
 
+    /**
+     * Check question order duplicates.
+     * @return array
+     */
+    protected function checkQuestionOrderDuplicates()
+    {
+        $sQuery = "
+            SELECT
+                q.question_order,
+                q.qid,
+                q.gid,
+                q.sid,
+                q.parent_qid,
+                COUNT(DISTINCT q.question_order) AS question_order,
+                COUNT(q.qid) AS qid
+            FROM lime_questions q
+            JOIN lime_groups g ON q.gid = g.gid
+            GROUP BY sid, gid, parent_qid
+            HAVING question_order != qid;
+            ";
+        $result = Yii::app()->db->createCommand($sQuery)->queryAll();
+        if (!empty($result)) {
+            foreach ($result as &$info) {
+                $info['viewSurveyLink'] = Yii::app()->getController()->createUrl(
+                    'admin/survey',
+                    [
+                        'sa' => 'view',
+                        'surveyid' => $info['sid'],
+                    ]
+                );
+                if ($info['parent_qid'] != 0) {
+                    $info['questionSummaryLink'] = Yii::app()->getController()->createUrl(
+                        'admin/questions',
+                        [
+                            'sa' => 'subquestions',
+                            'surveyid' => $info['sid'],
+                            'gid' => $info['gid'],
+                            'qid' => $info['parent_qid']
+                        ]
+                    );
+                }
+            }
+        }
+        return $result;
+    }
+
     /**
      * Renders template(s) wrapped in header and footer
      *

diff --git a/application/views/admin/checkintegrity/check_view.php b/application/views/admin/checkintegrity/check_view.php
@@ -168,6 +168,24 @@
                     <li><?php eT("All questions meet consistency standards."); ?></li><?php
                 } ?>
 
+                <?php if (isset($questionOrderDuplicates) && !empty($questionOrderDuplicates)): ?>
+                    <li><?php eT("The following surveys have an errorneous question order. Please go to each question respectively, check the question order and save it."); ?>
+                        <ul>
+                            <?php foreach ($questionOrderDuplicates as $info): ?>
+                            <li>
+                                SID: <a href="<?php echo $info['viewSurveyLink']; ?>"><?php echo $info['sid']; ?></a>
+                                GID: <?php echo $info['sid']; ?>
+                                QID: <?php echo $info['qid']; ?>
+                                <?php if ($info['parent_qid'] != 0): ?>
+                                    Parent QID: <a href="<?php echo $info['questionSummaryLink']; ?>"><?php echo $info['parent_qid']; ?></a>
+                                <?php endif; ?>
+                            </li>
+                            <?php endforeach; ?>
+                        </ul>
+                <?php else: ?>
+                    <li><?php eT("No issues with question order found."); ?></li>
+                <?php endif; ?>
+
                 <?php
                     if (isset($groups))
                     {?>