Fixed issue #6474: When viewing answers, "View completed responses on…

…ly" does not work
LimeSurvey · Aug 13, 2012 · c13ecc1 · c13ecc1
1 parent 2c1b640
commit c13ecc1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 31 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -1479,8 +1479,9 @@ public function delete()
     */
     public function update()
     {
+        $aData=array();
         $subaction = Yii::app()->request->getPost('subaction');
-        $surveyid = $_REQUEST['surveyid'];
+        if (isset($_REQUEST['surveyid'])) $surveyid = $_REQUEST['surveyid'];
         if (!empty($_REQUEST['sid'])) $surveyid = (int)$_REQUEST['sid'];
         $surveyid = sanitize_int($surveyid);
         $id = Yii::app()->request->getPost('id');
@@ -1537,9 +1538,8 @@ public function update()
                         $qidattributes = getQuestionAttributeValues($irow['qid'], $irow['type']);
                         $dateformatdetails = getDateFormatDataForQID($qidattributes, $thissurvey);
 
-                        $items = array($thisvalue,$dateformatdetails['phpdate']);
                         $this->getController()->loadLibrary('Date_Time_Converter');
-                        $datetimeobj = new date_time_converter($items) ;
+                        $datetimeobj = new date_time_converter($thisvalue,$dateformatdetails['phpdate']) ;
                         //need to check if library get initialized with new value of constructor or not.
 
                         //$datetimeobj = new Date_Time_Converter($thisvalue,$dateformatdetails['phpdate']);

diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
@@ -187,9 +187,9 @@ public function view($iSurveyId, $iId, $sBrowseLang = '')
         {
             $oCriteria = Survey_dynamic::model($iSurveyId)->addTokenCriteria($oCriteria);
         }
-        if (incompleteAnsFilterState() == 'inc')
+        if (incompleteAnsFilterState() == 'incomplete')
             $oCriteria->addCondition('submitdate = ' . mktime(0, 0, 0, 1, 1, 1980) . ' OR submitdate IS NULL');
-        elseif (incompleteAnsFilterState() == 'filter')
+        elseif (incompleteAnsFilterState() == 'complete')
             $oCriteria->addCondition('submitdate >= ' . mktime(0, 0, 0, 1, 1, 1980));
         if ($iId < 1)
         {
@@ -532,11 +532,11 @@ function browse($iSurveyId)
                 $oCriteria = Survey_dynamic::model($iSurveyId)->addTokenCriteria($oCriteria);
             }
 
-            if (incompleteAnsFilterState() == "inc")
+            if (incompleteAnsFilterState() == "incomplete")
             {
                 $oCriteria->addCondition("`submitdate` IS NULL");
             }
-            elseif (incompleteAnsFilterState() == "filter")
+            elseif (incompleteAnsFilterState() == "complete")
             {
                 $oCriteria->addCondition("`submitdate` IS NOT NULL");
             }
@@ -583,6 +583,8 @@ function browse($iSurveyId)
             }
 
             $aData['dtcount2'] = $dtcount2;
+            $aData['sCompletionStateValue']=incompleteAnsFilterState();
+
             $aData['start'] = $start;
             $aData['limit'] = $limit;
             $aData['last'] = $last;
@@ -613,6 +615,7 @@ function browse($iSurveyId)
             $aViewUrls[] = 'browseallfooter_view';
             $this->_renderWrappedTemplate('',$aViewUrls, $aData);
     }
+
     public function time($iSurveyId)
     {
         $aData = $this->_getData(array('iSurveyId' => $iSurveyId));
@@ -722,22 +725,7 @@ public function time($iSurveyId)
             $end = 0;
         }
 
-        $selectshow = '';
-        $selectinc = '';
-        $selecthide = '';
-
-        if (incompleteAnsFilterState() == "inc")
-        {
-            $selectinc = " selected='selected'";
-        }
-        elseif (incompleteAnsFilterState() == "filter")
-        {
-            $selecthide = " selected='selected'";
-        }
-        else
-        {
-            $selectshow = " selected='selected'";
-        }
+        $aData['sCompletionStateValue']=incompleteAnsFilterState();
         $aData['start'] = $start;
         $aData['limit'] = $limit;
         $aData['last'] = $last;

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -1585,7 +1585,7 @@ function fixSortOrderAnswers($qid,$surveyid=null) //Function rewrites the sortor
 
 /**
 * This function rewrites the sortorder for questions inside the named group
-* REMOVED the 2012-08-08 : replaced by Questions::model()->updateQuestionOrder 
+* REMOVED the 2012-08-08 : replaced by Questions::model()->updateQuestionOrder
 * @param integer $groupid the group id
 * @param integer $surveyid the survey id
 */
@@ -4977,7 +4977,6 @@ function CSVUnquote($field)
 
 function incompleteAnsFilterState()
 {
-    global $filterout_incomplete_answers;
     $letsfilter='';
     $letsfilter = returnGlobal('completionstate'); //read get/post completionstate
 
@@ -4989,7 +4988,7 @@ function incompleteAnsFilterState()
     }
     elseif (empty(Yii::app()->session['incompleteanswers']))
     { // sets default variable value from config file
-        Yii::app()->session['incompleteanswers'] = $filterout_incomplete_answers;
+        Yii::app()->session['incompleteanswers'] = Yii::app()->getConfig('filterout_incomplete_answers');
     }
 
     if  (Yii::app()->session['incompleteanswers']=='complete' || Yii::app()->session['incompleteanswers']=='all' || Yii::app()->session['incompleteanswers']=='incomplete') {

diff --git a/application/views/admin/responses/browseallheader_view.php b/application/views/admin/responses/browseallheader_view.php
@@ -46,11 +46,10 @@
                     <?php $clang->eT("Records displayed:"); ?><input type='text' size='4' value='<?php echo $dtcount2; ?>' name='limit' id='limit' />
                     &nbsp;&nbsp; <?php $clang->eT("Starting from:"); ?><input type='text' size='4' value='<?php echo $start; ?>' name='start' id='start' />
                     &nbsp;&nbsp; <input type='submit' value='<?php $clang->eT("Show"); ?>' />
-                    &nbsp;&nbsp; <?php $clang->eT("Display:"); ?> <select name='completionstate' onchange='javascript:submit();'>
-                        <option value='show' <?php echo $selectshow; ?>><?php $clang->eT("All responses"); ?></option>
-                        <option value='filter' <?php echo $selecthide; ?>><?php $clang->eT("Completed responses only"); ?></option>
-                        <option value='incomplete' <?php echo $selectinc; ?>><?php $clang->eT("Incomplete responses only"); ?></option>
-                    </select>
+                    &nbsp;&nbsp; <?php $clang->eT("Display:"); ?>
+                    <?php echo CHtml::dropDownList('completionstate',$sCompletionStateValue,array('all'=> $clang->gT("All responses"),
+                    'complete'=> $clang->gT("Completed responses only"),
+                    'incomplete'=> $clang->gT("Incomplete responses only")),array('onchange'=>'javascript:submit();')); ?>
                 <input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
                 <input type='hidden' name='action' value='browse' />
                 <input type='hidden' name='subaction' value='all' />