Skip to content

Commit

Permalink
Fixed issue #7192: Filters are pre-filled in statistics
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Jan 22, 2013
1 parent 0724518 commit cccf7ad
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions application/views/admin/export/statistics_view.php
View file
Expand Up @@ -96,11 +96,11 @@
if (isset($datestamp) && $datestamp == "Y") {?>
<fieldset id='right'><legend><?php $clang->eT("Submission date"); ?></legend><ul><li>
<label for='datestampE'><?php $clang->eT("Equals:"); ?></label>
<?php echo CHtml::textField('text','datestampeE',isset($_POST['datestampE'])?$_POST['datestampE']:'',array('id'=>'datestampE', 'class'=>'popupdate'));?>
<?php echo CHtml::textField('datestampeE',isset($_POST['datestampE'])?$_POST['datestampE']:'',array('id'=>'datestampE', 'class'=>'popupdate', 'size'=>'12'));?>
</li><li><label for='datestampG'><?php $clang->eT("Later than:");?></label>
<?php echo CHtml::textField('text','datestampG',isset($_POST['datestampG'])?$_POST['datestampG']:'',array('id'=>'datestampG', 'class'=>'popupdate', 'size'=>'12'));?>
<?php echo CHtml::textField('datestampG',isset($_POST['datestampG'])?$_POST['datestampG']:'',array('id'=>'datestampG', 'class'=>'popupdate', 'size'=>'12'));?>
</li><li><label for='datestampL'><?php $clang->eT("Earlier than:");?></label>
<?php echo CHtml::textField('text','datestampL',isset($_POST['datestampL'])?$_POST['datestampL']:'',array('id'=>'datestampL', 'class'=>'popupdate', 'size'=>'12'));?>
<?php echo CHtml::textField('datestampL',isset($_POST['datestampL'])?$_POST['datestampL']:'',array('id'=>'datestampL', 'class'=>'popupdate', 'size'=>'12'));?>
</li></ul></fieldset>
<input type='hidden' name='summary[]' value='datestampE' />
<input type='hidden' name='summary[]' value='datestampG' />
Expand Down Expand Up @@ -278,10 +278,10 @@
if (isset($_POST[$myfield2])){echo $_POST[$myfield2];}
<span class='smalltext'><?php $clang->eT("Number greater than");?>:</span><br />
<?php echo CHtml::textField('text',$myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array('onkeypress'=>"return goodchars(event,'0123456789.,')"));?>
<?php echo CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array('onkeypress'=>"return goodchars(event,'0123456789.,')"));?>
<br>
<span class='smalltext'><?php $clang->eT("Number less than");?>:</span><br>
<?php echo CHtml::textField('text',$myfield3,isset($_POST[$myfield3])?$_POST[$myfield3]:'',array('onkeypress'=>"return goodchars(event,'0123456789.,')"));?>
<?php echo CHtml::textField($myfield3,isset($_POST[$myfield3])?$_POST[$myfield3]:'',array('onkeypress'=>"return goodchars(event,'0123456789.,')"));?>
<br>
<?php
//we added 1 form -> increase counter
Expand Down Expand Up @@ -321,7 +321,7 @@
echo _showSpeaker($flt[3]." - ".flattenText($row[1],true))
."<br />\n"
."\t<span class='smalltext'>".$clang->gT("Responses containing").":</span><br />\n";
echo CHtml::textField('text',$myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array())
echo CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array())
."\t</td>\n";
$counter2++;
}
Expand Down Expand Up @@ -368,7 +368,7 @@
."&nbsp;"._showSpeaker($niceqtext)
."<br />\n"
."\t<span class='smalltext'>".$clang->gT("Responses containing").":</span><br />\n"
.CHtml::textField('text',$myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array())
.CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array())
."\t</td>\n";
break;

Expand All @@ -380,10 +380,10 @@
$myfield2="{$myfield}G";
$myfield3="{$myfield}L";
echo "\t<span class='smalltext'>".$clang->gT("Number greater than").":</span><br />\n"
.CHtml::textField('text',$myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
.CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
."\t<br />\n"
."\t<span class='smalltext'>".$clang->gT("Number less than").":</span><br />\n"
.CHtml::textField('text',$myfield3,isset($_POST[$myfield3])?$_POST[$myfield3]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
.CHtml::textField($myfield3,isset($_POST[$myfield3])?$_POST[$myfield3]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
."\t<br />\n";

//put field names into array
Expand All @@ -397,10 +397,10 @@
$myfield2 = "{$myfield}G";
$myfield3 = "{$myfield}L";
echo "\t<span class='smalltext'>".$clang->gT("Number of files greater than").":</span><br />\n"
.CHtml::textField('text',$myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
.CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
."<br />\n"
."\t<span class='smalltext'>".$clang->gT("Number of files less than").":</span><br />\n"
.CHtml::textField('text',$myfield3,isset($_POST[$myfield3])?$_POST[$myfield3]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
.CHtml::textField($myfield3,isset($_POST[$myfield3])?$_POST[$myfield3]:'',array( 'onkeypress'=>"return goodchars(event,'0123456789.,')" ))
."<br />\n";
break;

Expand Down Expand Up @@ -437,13 +437,13 @@
."<br />\n"

."\t<span class='smalltext'>".$clang->gT("Date (YYYY-MM-DD) equals").":<br />\n"
.CHtml::textField('text',$myfield3,isset($_POST[$myfield3])?$_POST[$myfield2]:'',array() )
.CHtml::textField($myfield3,isset($_POST[$myfield3])?$_POST[$myfield2]:'',array() )
."<br />\n"
."\t&nbsp;&nbsp;".$clang->gT("Date is")." >=<br />\n"
.CHtml::textField('text',$myfield4,isset($_POST[$myfield4])?$_POST[$myfield4]:'',array() )
.CHtml::textField($myfield4,isset($_POST[$myfield4])?$_POST[$myfield4]:'',array() )
."<br />"
.$clang->gT("AND/OR Date is")." <= <br />"
.CHtml::textField('text',$myfield5,isset($_POST[$myfield5])?$_POST[$myfield5]:'',array() )
.CHtml::textField($myfield5,isset($_POST[$myfield5])?$_POST[$myfield5]:'',array() )
."</span>\n";
break;

Expand Down Expand Up @@ -756,7 +756,7 @@
."</strong><br />\n";
//echo $fquery;
echo "\t<span class='smalltext'>".$clang->gT("Responses containing").":</span><br />\n"
.CHtml::textField('text',$myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array() )
.CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array() )
."</td>\n";
$counter2++;
}
Expand Down

0 comments on commit cccf7ad

Please sign in to comment.