Fixed issue #11434: The numbers of the statistics are wrong (no compl…

…etion selector) New feature: Completion selector for simple stats
LimeSurvey · Jul 18, 2016 · 9ff5371 · 9ff5371
1 parent 2b62e51
commit 9ff5371
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 2 deletions.
diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
@@ -803,6 +803,17 @@ public function simpleStatistics($surveyid)
         echo $this->_renderWrappedTemplate('export', 'statistics_user_view', $aData);
      }
 
+
+    public function setIncompleteanswers()
+    {
+        $sIncompleteAnswers = Yii::app()->request->getPost('state');
+        if (in_array($sIncompleteAnswers,array('all', 'complete', 'incomplete')))
+        {
+            Yii::app()->session['incompleteanswers']= $sIncompleteAnswers;            
+        }
+
+    }
+
     /**
      * Renders template(s) wrapped in header and footer
      *

diff --git a/application/views/admin/export/statistics_subviews/_dataselection.php b/application/views/admin/export/statistics_subviews/_dataselection.php
@@ -9,7 +9,7 @@
             <label for='completionstate' class="col-sm-4 control-label"><?php eT("Include:"); ?> </label>
             <?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
                 'name' => 'completionstate',
-                'value'=> 'all' ,
+                'value'=> incompleteAnsFilterState(),
                 'selectOptions'=>array(
                     "all"=>gT("All responses",'unescaped'),
                     "complete"=>gT("Complete only",'unescaped'),

diff --git a/application/views/admin/export/statistics_user_view.php b/application/views/admin/export/statistics_user_view.php
@@ -13,6 +13,26 @@
         <span class="glyphicon glyphicon-stats"></span> &nbsp;&nbsp;&nbsp;
         <?php eT("Statistics"); ?>
     </h3>
+    <div class="panel panel-primary" id="pannel-1">
+        <div class="panel-heading">
+            <h4 class="panel-title"><?php eT("Data selection"); ?></h4>
+        </div>
+        <div class="panel-body">
+            <div class='form-group'>
+                <input type="hidden" id="completionstateSimpleStat" data-grid-display-url="<?php echo App()->createUrl('/admin/statistics/sa/setIncompleteanswers/');?>"  />
+                <label for='completionstate' class="col-sm-4 control-label"><?php eT("Include:"); ?> </label>
+                <?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
+                    'name' => 'completionstate',
+                    'value'=> incompleteAnsFilterState(),
+                    'selectOptions'=>array(
+                        "all"=>gT("All responses",'unescaped'),
+                        "complete"=>gT("Complete only",'unescaped'),
+                        "incomplete"=>gT("Incomplete only",'unescaped'),
+                    ),
+                ));?>
+            </div>
+        </div>
+    </div>
 
     <div class="row">
         <div class="col-lg-12 content-right">

diff --git a/scripts/admin/listresponse.js b/scripts/admin/listresponse.js
@@ -23,7 +23,6 @@ $(document).ready(function(){
         $that = $(this);
         $actionUrl = $(this).data('url');
         $display = ($that.val()=='extended')?'extended':'compact';
-        console.log('select value:'+$display);
         $postDatas  = {state:$display};
         $.ajax({
             url : $actionUrl,

diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js
@@ -182,6 +182,32 @@ function init_chart_js_graph_with_datas($type,$qid)
 
 $(document).ready(function() {
 
+    if ($('#completionstateSimpleStat').length>0)
+    {
+        $actionUrl = $('#completionstateSimpleStat').data('grid-display-url');
+        $("#completionstate > .btn").on("click", function(){
+            $display = $(this).find('input').val();
+            $postDatas = {state:$display};
+
+            $.ajax({
+                url : $actionUrl,
+                type : 'POST',
+                data :  $postDatas,
+
+                // html contains the buttons
+                success : function(html, statut){
+                    // Reload page
+                    location.reload();
+                },
+                error :  function(html, statut){
+                    console.log('error');
+                    console.log(html);
+                }
+            });
+
+        });
+    }
+
     if($('.chartjs-container').length>0)
     {
         $elChartJsContainer = $('.chartjs-container').first();