Skip to content

Commit

Permalink
Fixed #1072 part3: fixes test for filterincomplete answer
Browse files Browse the repository at this point in the history
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@3099 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
Thibault Le Meur committed Jul 19, 2007
1 parent 7a73dc5 commit f3375f6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions admin/browse.php
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
$nfncount = count($fnames)-1;
//SHOW INDIVIDUAL RECORD
$idquery = "SELECT * FROM $surveytable WHERE ";
if (incompleteAnsFilterstate() === true) {$idquery .= "submitdate > ".$connect->DBDate('1980-01-01'). " AND ";}
if (incompleteAnsFilterstate() === true) {$idquery .= "submitdate >= ".$connect->DBDate('1980-01-01'). " AND ";}
if ($id<1) {$id=1;}
if (isset($_POST['sql']) && $_POST['sql'])
{
Expand Down Expand Up @@ -474,7 +474,7 @@

//LETS COUNT THE DATA
$dtquery = "SELECT count(*) FROM $surveytable";
if (incompleteAnsFilterstate() === true) {$dtquery .= " WHERE submitdate > ".$connect->DBDate('1980-01-01');}
if (incompleteAnsFilterstate() === true) {$dtquery .= " WHERE submitdate >= ".$connect->DBDate('1980-01-01');}
$dtresult=db_execute_num($dtquery);
while ($dtrow=$dtresult->FetchRow()) {$dtcount=$dtrow[0];}

Expand All @@ -486,20 +486,20 @@
if ($_POST['sql'] == "NULL")
{
$dtquery = "SELECT * FROM $surveytable ";
if (incompleteAnsFilterstate() === true) {$dtquery .= " WHERE submitdate > ".$connect->DBDate('1980-01-01');}
if (incompleteAnsFilterstate() === true) {$dtquery .= " WHERE submitdate >= ".$connect->DBDate('1980-01-01');}
$dtquery .= " ORDER BY id";
}
else
{
$dtquery = "SELECT * FROM $surveytable WHERE ".stripcslashes($_POST['sql'])." ";
if (incompleteAnsFilterstate() === true) {$dtquery .= " AND submitdate > ".$connect->DBDate('1980-01-01');}
if (incompleteAnsFilterstate() === true) {$dtquery .= " AND submitdate >= ".$connect->DBDate('1980-01-01');}
$dtquery .= " ORDER BY id";
}
}
else
{
$dtquery = "SELECT * FROM $surveytable ";
if (incompleteAnsFilterstate() === true) {$dtquery .= " WHERE submitdate > ".$connect->DBDate('1980-01-01');}
if (incompleteAnsFilterstate() === true) {$dtquery .= " WHERE submitdate >= ".$connect->DBDate('1980-01-01');}
$dtquery .= " ORDER BY id";
}
if ($order == "desc") {$dtquery .= " DESC";}
Expand Down Expand Up @@ -642,7 +642,7 @@
$num_total_answers=0;
$num_completed_answers=0;
$gnquery = "SELECT count(id) FROM $surveytable";
$gnquery2 = "SELECT count(id) FROM $surveytable WHERE submitdate > '1980-01-01 00:00:00'";
$gnquery2 = "SELECT count(id) FROM $surveytable WHERE submitdate >= '1980-01-01 00:00:00'";
$gnresult = db_execute_num($gnquery);
$gnresult2 = db_execute_num($gnquery2);

Expand Down

0 comments on commit f3375f6

Please sign in to comment.