From 7b775f8408f3f76d249ca938c17f1ac79886c649 Mon Sep 17 00:00:00 2001
From: jcleeland <jason@cleeland.org>
Date: Sun, 22 Jul 2012 11:51:04 +1000
Subject: [PATCH] Fixed issue #6363 Statistics repsonse filters don't display
 speaker icon, show question text twice New feature Statistics output screen
 cleaned up, placed inside collapsible divs

---
 .../views/admin/export/statistics_view.php    | 263 ++++++++++--------
 scripts/admin/statistics.js                   |  15 +-
 styles/gringegreen/adminstyle.css             |  13 +-
 3 files changed, 168 insertions(+), 123 deletions(-)

diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php
index 98607dab8b2..b22252b6c82 100644
--- a/application/views/admin/export/statistics_view.php
+++ b/application/views/admin/export/statistics_view.php
@@ -10,131 +10,138 @@
     var graphUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/graph"); ?>";
 </script>
 <form method='post' name='formbuilder' action='<?php echo Yii::app()->getController()->createUrl("admin/statistics/index/surveyid/$surveyid"); ?>#start'>
-    <div class='header ui-widget-header'><?php $clang->eT("General filters"); ?></div>
-    <div id='statistics_general_filter'>
-        <?php
-            $error = '';
-            if (!function_exists("gd_info")) {
-                $error .= '<br />'.$clang->gT('You do not have the GD Library installed. Showing charts requires the GD library to function properly.');
-                $error .= '<br />'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'<br />';
-            }
-            else if (!function_exists("imageftbbox")) {
-                    $error .= '<br />'.$clang->gT('You do not have the Freetype Library installed. Showing charts requires the Freetype library to function properly.');
+    <div class='header ui-widget-header header_statistics'>
+        <div style='float:right;'><img src='<?php echo $sImageURL; ?>/maximize.png' id='showgfilter' alt='<?php $clang->eT("Maximize"); ?>'/><img src='<?php echo $sImageURL; ?>/minimize.png' id='hidegfilter' alt='<?php $clang->eT("Minimize"); ?>'/></div>
+        <?php $clang->eT("General filters"); ?>
+    </div>
+    <!-- AUTOSCROLLING DIV CONTAINING GENERAL FILTERS -->
+    <div id='statisticsgeneralfilters' class='statisticsfilters' <?php if ($filterchoice_state!='') { echo " style='display:none' "; } ?>>
+
+        <div id='statistics_general_filter'>
+            <?php
+                $error = '';
+                if (!function_exists("gd_info")) {
+                    $error .= '<br />'.$clang->gT('You do not have the GD Library installed. Showing charts requires the GD library to function properly.');
                     $error .= '<br />'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'<br />';
                 }
-        ?>
-        <fieldset style='clear:both;'>
-            <legend><?php $clang->eT("Data selection"); ?></legend>
-            <ul>
-                <li>
-                    <label for='completionstate'><?php $clang->eT("Include:"); ?> </label>
-                    <select name='completionstate' id='completionstate'>
-                        <option value='all' <?php echo $selectshow; ?>><?php $clang->eT("All responses"); ?></option>
-                        <option value='complete' <?php echo $selecthide; ?> > <?php $clang->eT("Completed responses only"); ?></option>
-                        <option value='incomplete' <?php echo $selectinc; ?> > <?php $clang->eT("Incomplete responses only"); ?></option>
-                    </select>
-                </li>
-                <li>
-                    <label for='viewsummaryall'><?php $clang->eT("View summary of all available fields"); ?></label>
-                    <input type='checkbox' id='viewsummaryall' name='viewsummaryall' <?php if (isset($_POST['viewsummaryall'])) { echo "checked='checked'";} ?> />
-                </li>
-                <li id='vertical_slide'>
-                    <label id='noncompletedlbl' for='noncompleted' title='<?php $clang->eT("Count stats for each question based only on the total number of responses for which the question was displayed"); ?>'><?php $clang->eT("Subtotals based on displayed questions"); ?></label>
-                    <input type='checkbox' id='noncompleted' name='noncompleted' <?php if (isset($_POST['noncompleted'])) {echo "checked='checked'"; } ?> />
-                </li>
-                <?php
-
-                    $language_options="";
-                    foreach ($survlangs as $survlang)
-                    {
-                        $language_options .= "\t<option value=\"{$survlang}\"";
-                        if ($sStatisticsLanguage == $survlang)
+                else if (!function_exists("imageftbbox")) {
+                        $error .= '<br />'.$clang->gT('You do not have the Freetype Library installed. Showing charts requires the Freetype library to function properly.');
+                        $error .= '<br />'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'<br />';
+                    }
+            ?>
+            <fieldset style='clear:both;'>
+                <legend><?php $clang->eT("Data selection"); ?></legend>
+                <ul>
+                    <li>
+                        <label for='completionstate'><?php $clang->eT("Include:"); ?> </label>
+                        <select name='completionstate' id='completionstate'>
+                            <option value='all' <?php echo $selectshow; ?>><?php $clang->eT("All responses"); ?></option>
+                            <option value='complete' <?php echo $selecthide; ?> > <?php $clang->eT("Completed responses only"); ?></option>
+                            <option value='incomplete' <?php echo $selectinc; ?> > <?php $clang->eT("Incomplete responses only"); ?></option>
+                        </select>
+                    </li>
+                    <li>
+                        <label for='viewsummaryall'><?php $clang->eT("View summary of all available fields"); ?></label>
+                        <input type='checkbox' id='viewsummaryall' name='viewsummaryall' <?php if (isset($_POST['viewsummaryall'])) { echo "checked='checked'";} ?> />
+                    </li>
+                    <li id='vertical_slide'>
+                        <label id='noncompletedlbl' for='noncompleted' title='<?php $clang->eT("Count stats for each question based only on the total number of responses for which the question was displayed"); ?>'><?php $clang->eT("Subtotals based on displayed questions"); ?></label>
+                        <input type='checkbox' id='noncompleted' name='noncompleted' <?php if (isset($_POST['noncompleted'])) {echo "checked='checked'"; } ?> />
+                    </li>
+                    <?php
+
+                        $language_options="";
+                        foreach ($survlangs as $survlang)
                         {
-                            $language_options .= " selected=\"selected\" " ;
-                        }
-                        $temp = getLanguageNameFromCode($survlang,true);
-                        $language_options .= ">".$temp[1]."</option>\n";
+                            $language_options .= "\t<option value=\"{$survlang}\"";
+                            if ($sStatisticsLanguage == $survlang)
+                            {
+                                $language_options .= " selected=\"selected\" " ;
+                            }
+                            $temp = getLanguageNameFromCode($survlang,true);
+                            $language_options .= ">".$temp[1]."</option>\n";
 
-                    }
+                        }
 
-                ?>
-                <li>
-                    <label for='statlang'><?php $clang->eT("Statistics report language"); ?></label>
-                    <select name="statlang" id="statlang"><?php echo $language_options; ?></select>
-                </li>
-            </ul>
-        </fieldset>
-
-        <fieldset id='left'>
-            <legend><?php $clang->eT("Response ID"); ?></legend>
-            <ul>
-                <li>
-                    <label for='idG'><?php $clang->eT("Greater than:"); ?></label>
-                    <input type='text' id='idG' name='idG' size='10' value='<?php if (isset($_POST['idG'])){ echo  sanitize_int($_POST['idG']);} ?>' onkeypress="return goodchars(event,'0123456789')" />
-                </li>
-                <li>
-                    <label for='idL'><?php $clang->eT("Less than:"); ?></label>
-                    <input type='text' id='idL' name='idL' size='10' value='<?php if (isset($_POST['idL'])) { echo sanitize_int($_POST['idL']);} ?>' onkeypress="return goodchars(event,'0123456789')" />
-                </li>
-            </ul>
-        </fieldset>
-
-        <input type='hidden' name='summary[]' value='idG' />
-        <input type='hidden' name='summary[]' value='idL' />
+                    ?>
+                    <li>
+                        <label for='statlang'><?php $clang->eT("Statistics report language"); ?></label>
+                        <select name="statlang" id="statlang"><?php echo $language_options; ?></select>
+                    </li>
+                </ul>
+            </fieldset>
+
+            <fieldset id='left'>
+                <legend><?php $clang->eT("Response ID"); ?></legend>
+                <ul>
+                    <li>
+                        <label for='idG'><?php $clang->eT("Greater than:"); ?></label>
+                        <input type='text' id='idG' name='idG' size='10' value='<?php if (isset($_POST['idG'])){ echo  sanitize_int($_POST['idG']);} ?>' onkeypress="return goodchars(event,'0123456789')" />
+                    </li>
+                    <li>
+                        <label for='idL'><?php $clang->eT("Less than:"); ?></label>
+                        <input type='text' id='idL' name='idL' size='10' value='<?php if (isset($_POST['idL'])) { echo sanitize_int($_POST['idL']);} ?>' onkeypress="return goodchars(event,'0123456789')" />
+                    </li>
+                </ul>
+            </fieldset>
+
+            <input type='hidden' name='summary[]' value='idG' />
+            <input type='hidden' name='summary[]' value='idL' />
 
-        <?php
+            <?php
 
-            if (isset($datestamp) && $datestamp == "Y") {
-                echo "<fieldset id='right'><legend>".$clang->gT("Submission date")."</legend><ul><li>"
-                ."<label for='datestampE'>".$clang->gT("Equals:")."</label>\n"
-                ."<input class='popupdate' id='datestampE' name='datestampE' type='text' value='";
-                if (isset($_POST['datestampE'])) { echo  $_POST['datestampE']; }
-                echo "' /></li><li><label for='datestampG'>\n"
-                ."&nbsp;&nbsp;".$clang->gT("Later than:")."</label>\n"
-                ."<input class='popupdatetime' id='datestampG' name='datestampG' value='";
-                if (isset($_POST['datestampG'])) { echo $_POST['datestampG']; }
-                echo "' type='text' /></li><li><label for='datestampL'> ".$clang->gT("Earlier than:")."</label><input  class='popupdatetime' id='datestampL' name='datestampL' value='";
-                if (isset($_POST['datestampL'])) { echo $_POST['datestampL']; }
-                echo "' type='text' /></li></ul></fieldset>\n";
-                echo "<input type='hidden' name='summary[]' value='datestampE' />";
-                echo "<input type='hidden' name='summary[]' value='datestampG' />";
-                echo "<input type='hidden' name='summary[]' value='datestampL' />";
-            }
+                if (isset($datestamp) && $datestamp == "Y") {
+                    echo "<fieldset id='right'><legend>".$clang->gT("Submission date")."</legend><ul><li>"
+                    ."<label for='datestampE'>".$clang->gT("Equals:")."</label>\n"
+                    ."<input class='popupdate' id='datestampE' name='datestampE' type='text' value='";
+                    if (isset($_POST['datestampE'])) { echo  $_POST['datestampE']; }
+                    echo "' /></li><li><label for='datestampG'>\n"
+                    ."&nbsp;&nbsp;".$clang->gT("Later than:")."</label>\n"
+                    ."<input class='popupdatetime' id='datestampG' name='datestampG' value='";
+                    if (isset($_POST['datestampG'])) { echo $_POST['datestampG']; }
+                    echo "' type='text' /></li><li><label for='datestampL'> ".$clang->gT("Earlier than:")."</label><input  class='popupdatetime' id='datestampL' name='datestampL' value='";
+                    if (isset($_POST['datestampL'])) { echo $_POST['datestampL']; }
+                    echo "' type='text' /></li></ul></fieldset>\n";
+                    echo "<input type='hidden' name='summary[]' value='datestampE' />";
+                    echo "<input type='hidden' name='summary[]' value='datestampG' />";
+                    echo "<input type='hidden' name='summary[]' value='datestampL' />";
+                }
 
-        ?>
+            ?>
 
-        <fieldset>
-            <legend><?php $clang->eT("Output options"); ?></legend>
-            <ul>
-                <li>
-                    <label for='usegraph'><?php $clang->eT("Show graphs"); ?></label>
-                    <input type='checkbox' id='usegraph' name='usegraph' <?php if (isset($usegraph) && $usegraph == 1) { echo "checked='checked'"; } ?> /><br />
-                    <?php if($error != '') { echo "<span id='grapherror' style='display:none'>$error<hr /></span>"; } ?>
-                </li>
-
-                <li>
-                    <label><?php $clang->eT("Select output format"); ?>:</label>
-                    <input type='radio' id="outputtypehtml" name='outputtype' value='html' checked='checked' />
-                    <label for='outputtypehtml'>HTML</label>
-                    <input type='radio' id="outputtypepdf" name='outputtype' value='pdf' />
-                    <label for='outputtypepdf'>PDF</label>
-                    <input type='radio' id="outputtypexls" onclick='nographs();' name='outputtype' value='xls' />
-                    <label for='outputtypexls'>Excel</label>
-                </li>
-            </ul>
-        </fieldset>
+            <fieldset>
+                <legend><?php $clang->eT("Output options"); ?></legend>
+                <ul>
+                    <li>
+                        <label for='usegraph'><?php $clang->eT("Show graphs"); ?></label>
+                        <input type='checkbox' id='usegraph' name='usegraph' <?php if (isset($usegraph) && $usegraph == 1) { echo "checked='checked'"; } ?> /><br />
+                        <?php if($error != '') { echo "<span id='grapherror' style='display:none'>$error<hr /></span>"; } ?>
+                    </li>
+
+                    <li>
+                        <label><?php $clang->eT("Select output format"); ?>:</label>
+                        <input type='radio' id="outputtypehtml" name='outputtype' value='html' checked='checked' />
+                        <label for='outputtypehtml'>HTML</label>
+                        <input type='radio' id="outputtypepdf" name='outputtype' value='pdf' />
+                        <label for='outputtypepdf'>PDF</label>
+                        <input type='radio' id="outputtypexls" onclick='nographs();' name='outputtype' value='xls' />
+                        <label for='outputtypexls'>Excel</label>
+                    </li>
+                </ul>
+            </fieldset>
+        </div>
+        <p>
+            <input type='submit' value='<?php $clang->eT("View stats"); ?>' />
+            <input type='button' value='<?php $clang->eT("Clear"); ?>' onclick="window.open('<?php echo Yii::app()->getController()->createUrl("admin/statistics/surveyid/$surveyid"); ?>', '_top')" />
+        </p>
     </div>
-
-    <p>
-        <input type='submit' value='<?php $clang->eT("View stats"); ?>' />
-        <input type='button' value='<?php $clang->eT("Clear"); ?>' onclick="window.open('<?php echo Yii::app()->getController()->createUrl("admin/statistics/surveyid/$surveyid"); ?>', '_top')" />
-    </p>
-
+    <div style='clear: both'></div>
     <div class='header header_statistics'>
         <div style='float:right'><img src='<?php echo $sImageURL; ?>/maximize.png' id='showfilter' alt='<?php $clang->eT("Maximize"); ?>'/><img src='<?php echo $sImageURL; ?>/minimize.png' id='hidefilter' alt='<?php $clang->eT("Minimize"); ?>'/></div>
         <?php $clang->eT("Response filters"); ?>
     </div>
-
+    <!-- AUTOSCROLLING DIV CONTAINING QUESTION FILTERS -->
+    <div id='statisticsresponsefilters' class='statisticsfilters scrollheight_400' <?php if ($filterchoice_state!='') { echo " style='display:none' "; } ?>>
     <input type='hidden' id='filterchoice_state' name='filterchoice_state' value='<?php echo $filterchoice_state; ?>' />
 
     <table id='filterchoices' <?php if ($filterchoice_state!='') { echo " style='display:none' "; } ?> >
@@ -146,7 +153,7 @@
                     <!-- Close filter group --></tr>
                 </table></div></td></tr>
                 <?php endif; ?>
-
+            <!-- GROUP TITLE -->
             <tr>
                 <td>
                     <div class='header ui-widget-header'>
@@ -183,7 +190,8 @@
         <?php $myfield = "{$surveyid}X{$flt[1]}X{$flt[0]}"; $niceqtext=flattenText($flt[5]); ?>
         <?php
             if ($flt[2]=='M' || $flt[2]=='P' || $flt[2]=='N' || $flt[2]=='L' || $flt[2]=='5'
-            || $flt[2]=='G' || $flt[2]=='I' || $flt[2]=='O' || $flt[2]=='Y' || $flt[2]=='!'){ ?>
+            || $flt[2]=='G' || $flt[2]=='I' || $flt[2]=='O' || $flt[2]=='Y' || $flt[2]=='!')
+            { ?>
             <td>
             <?php
                 //Multiple choice:
@@ -200,6 +208,7 @@
                     || array_search("M{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
                     || array_search("P{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
                     || array_search("N{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE)) { echo " checked='checked'"; } ?> />
+            <!-- QUESTION HEADING/TITLE -->
             <label for='filter<?php echo $myfield; ?>'><?php echo _showSpeaker(flattenText($flt[5],true)); ?></label><br />
             <?php
                 if ($flt[2] != "N" && $flt[2] != "|"): ?>
@@ -1251,22 +1260,36 @@
     <input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
     <input type='hidden' name='display' value='stats' />
     </p>
-</form><br />
+    </div><!-- END OF AUTOSCROLLING DIV CONTAINING QUESTION FILTERS -->
+</form>
+<div style='clear: both'></div>
+<div class='header ui-widget-header header_statistics'>
+    <div style='float:right'><img src='<?php echo $sImageURL; ?>/maximize.png' id='showsfilter' alt='<?php $clang->eT("Maximize"); ?>'/><img src='<?php echo $sImageURL; ?>/minimize.png' id='hidesfilter' alt='<?php $clang->eT("Minimize"); ?>'/></div>
+    <?php $clang->eT("Statistics"); ?>
+</div>
+
+<div id='statisticsoutput' class='statisticsfilters'>
 <?php echo $output; ?>
+</div>
 
 <?php
 
+    /* This function builds the text description of eqch question in the filter section
+     *
+     * @param string $hinttext The question text
+     *
+     * */
     function _showSpeaker($hinttext)
     {
-        global $clang, $sImageURL, $maxchars;
+        global $maxchars; //Where does this come from? can it be replaced? passed with function call?
         $clang = Yii::app()->lang;
-        $sImageURL = Yii::app()->getConfig("imageurl");
+        $sImageURL = Yii::app()->getConfig('adminimageurl');
         if(!isset($maxchars))
         {
             $maxchars = 100;
         }
         $htmlhinttext=str_replace("'",'&#039;',$hinttext);  //the string is already HTML except for single quotes so we just replace these only
-        $jshinttext=javascriptEscape($hinttext,true,true);
+        $jshinttext=javascriptEscape($hinttext,true,true);  //Build a javascript safe version of the string
 
         if(strlen($hinttext) > ($maxchars))
         {
@@ -1275,15 +1298,15 @@ function _showSpeaker($hinttext)
             $shortstring = htmlspecialchars(mb_strcut(html_entity_decode($shortstring,ENT_QUOTES,'UTF-8'), 0, $maxchars, 'UTF-8'));
 
             //output with hoover effect
-            $reshtml= "<span style='cursor: hand' title='".$htmlhinttext."' "
+            $reshtml= "<span style='cursor: pointer' title='".$htmlhinttext."' "
             ." onclick=\"alert('".$clang->gT("Question","js").": $jshinttext')\">"
             ." \"$shortstring...\" </span>"
-            ."<img style='cursor: hand' src='$sImageURL/speaker.png' align='bottom' alt='$htmlhinttext' title='$htmlhinttext' "
+            ."<img style='cursor: pointer' src='$sImageURL/speaker.png' align='bottom' alt='$htmlhinttext' title='$htmlhinttext' "
             ." onclick=\"alert('".$clang->gT("Question","js").": $jshinttext')\" />";
         }
         else
         {
-            $reshtml= "<span title='".$htmlhinttext."'> \"$htmlhinttext\"</span>";
+            $reshtml= "<span style='cursor: pointer' title='".$htmlhinttext."'> \"$htmlhinttext\"</span>";
         }
         return $reshtml;
     }
diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js
index dd278e75c35..76692f3ea5b 100644
--- a/scripts/admin/statistics.js
+++ b/scripts/admin/statistics.js
@@ -18,16 +18,29 @@ $(document).ready(function(){
         }
      })
      $('#hidefilter').click( function(){
+            $('#statisticsresponsefilters').hide(1000);
             $('#filterchoices').hide();
             $('#filterchoice_state').val('1');
             $('#vertical_slide2').hide();
      })
      $('#showfilter').click( function(){
+            $('#statisticsresponsefilters').show(1000);
             $('#filterchoices').show();
             $('#filterchoice_state').val('');
             $('#vertical_slide2').show();
      })
-
+     $('#hidegfilter').click( function(){
+            $('#statisticsgeneralfilters').hide(1000);
+     })
+     $('#showgfilter').click( function(){
+            $('#statisticsgeneralfilters').show(1000);
+     })
+     $('#hidesfilter').click( function(){
+            $('#statisticsoutput').hide(1000);
+     })
+     $('#showsfilter').click( function(){
+            $('#statisticsoutput').show(1000);
+     })
      if (typeof aGMapData == "object") {
          for (var i in aGMapData) {
      		gMapInit("statisticsmap_" + i, aGMapData[i]);
diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css
index 6555d1261d3..df68966b0f2 100644
--- a/styles/gringegreen/adminstyle.css
+++ b/styles/gringegreen/adminstyle.css
@@ -493,8 +493,17 @@ th.admincell {
 
 .header_statistics {
     height:21px;
-    padding:1px;
-    padding-left:42px;
+    padding:1px 8px 1px 15px;
+    margin-bottom: 0;
+}
+.statisticsfilters {
+    width: 99%;
+    border: 1px solid #85BD00;
+    margin-bottom: 20px;
+}
+.scrollheight_400 {
+    height: 400px;
+    overflow: auto;
 }
 
 .btnaddanswer,