oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix [ 927266 ] WG 6.0.1 Data Form Issue

Browse source
This commit is contained in:
JT Smith 2004-05-02 19:14:22 +00:00
parent d0fb8d5ab7
commit d1492509a5
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Wobject.pm
View file

@ -433,7 +433,10 @@ The value of the column defined by "setName" to select a data set from.
sub moveCollateralDown {
my ($id, $seq, $setName, $setValue);
$setName = $_[4] || "wobjectId";
$setValue = $_[5] || $_[0]->get($setName);
$setValue = $_[5];
unless (defined $setValue) {
$setValue = $_[0]->get($setName);
}
($seq) = WebGUI::SQL->quickArray("select sequenceNumber from $_[1] where $_[2]=$_[3] and $setName=".quote($setValue));
($id) = WebGUI::SQL->quickArray("select $_[2] from $_[1] where $setName=".quote($setValue)
." and sequenceNumber=$seq+1");
@ -483,7 +486,10 @@ The value of the column defined by "setName" to select a data set from.
sub moveCollateralUp {
my ($id, $seq, $setValue, $setName);
$setName = $_[4] || "wobjectId";
$setValue = $_[5] || $_[0]->get($setName);
$setValue = $_[5];
unless (defined $setValue) {
$setValue = $_[0]->get($setName);
}
($seq) = WebGUI::SQL->quickArray("select sequenceNumber from $_[1] where $_[2]=$_[3] and $setName=".quote($setValue));
($id) = WebGUI::SQL->quickArray("select $_[2] from $_[1] where $setName=".quote($setValue)
." and sequenceNumber=$seq-1");

9
lib/WebGUI/Wobject/Survey.pm
View file

@ -900,7 +900,7 @@ sub www_view {
}
if ($var->{'response.Id'}) {
$var->{'questions.soFar.count'} = $self->getQuestionResponseCount($var->{'response.Id'});
($var->{'questions.correct.Count'}) = WebGUI::SQL->quickArray("select count(*) from Survey_questionResponse a, Survey_answer b where a.Survey_responseId="
($var->{'questions.correct.count'}) = WebGUI::SQL->quickArray("select count(*) from Survey_questionResponse a, Survey_answer b where a.Survey_responseId="
.$var->{'response.Id'}." and a.Survey_answerId=b.Survey_answerId and b.isCorrect=1");
if ($var->{'questions.soFar.count'} > 0) {
$var->{'questions.correct.percent'} = round(($var->{'questions.correct.count'}/$var->{'questions.soFar.count'})*100)
@ -946,7 +946,10 @@ sub www_viewGradebook {
$p->setDataByQuery("select userId,username,ipAddress,Survey_responseId,startDate,endDate from Survey_response
where isComplete=1 and Survey_id=".$self->get("Survey_id")." order by username,ipAddress,startDate");
my $users = $p->getPageData;
($var->{'question.Count'}) = WebGUI::SQL->quickArray("select count(*) from Survey_question where Survey_id=".$self->get("Survey_id"));
($var->{'question.count'}) = WebGUI::SQL->quickArray("select count(*) from Survey_question where Survey_id=".$self->get("Survey_id"));
if ($var->{'question.count'} > $self->get("questionsPerResponse")) {
$var->{'question.count'} = $self->get("questionsPerResponse");
}
$var->{'response.user.label'} = WebGUI::International::get(67,$self->get("namespace"));
$var->{'response.count.label'} = WebGUI::International::get(52,$self->get("namespace"));
$var->{'response.percent.label'} = WebGUI::International::get(54,$self->get("namespace"));
@ -960,7 +963,7 @@ sub www_viewGradebook {
.'&responseId='.$user->{Survey_responseId}),
'response.user.name'=>($user->{userId} == 1) ? $user->{ipAddress} : $user->{username},
'response.count.correct' => $correctCount,
'response.percent' => round(($correctCount/$var->{'question.Count'})*100)
'response.percent' => round(($correctCount/$var->{'question.count'})*100)
});
}
$var->{response_loop} = \@responseloop;