version 1.55, 2008/09/14 15:16:29
|
version 1.63, 2010/08/04 01:56:07
|
Line 135 Skips 'survey' problems.
|
Line 135 Skips 'survey' problems.
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
sub problem_selector { |
sub problem_selector { |
my ($AcceptedResponseTypes,$sequence_addendum) = @_; |
my ($AcceptedResponseTypes,$sequence_addendum,$symbmode) = @_; |
my $Str; |
my $Str; |
$Str = "\n<table>\n"; |
$Str = &Apache::loncommon::start_data_table(); |
my $rb_count =0; |
my $rb_count =0; |
my ($navmap,@sequences) = |
my ($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments('all'); |
&Apache::lonstatistics::selected_sequences_with_assessments('all'); |
Line 158 sub problem_selector {
|
Line 158 sub problem_selector {
|
resptype=>$resptype}); |
resptype=>$resptype}); |
my $checked = ''; |
my $checked = ''; |
if ($env{'form.problemchoice'} eq $value) { |
if ($env{'form.problemchoice'} eq $value) { |
$checked = 'checked '; |
$checked = ' checked="checked"'; |
} |
} |
my $title = $res->compTitle; |
my $title = $res->compTitle; |
if (! defined($title) || $title eq '') { |
if (! defined($title) || $title eq '') { |
($title) = ($res->src =~ m:/([^/]*)$:); |
($title) = ($res->src =~ m:/([^/]*)$:); |
} |
} |
$seq_str .= '<tr>'. |
$seq_str .= &Apache::loncommon::start_data_table_row(). |
qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value" $checked /></td>}. |
($symbmode? |
|
'<td><input type="radio" id="'.$rb_count.'" name="symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' /></td>' |
|
:qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}). |
'<td><label for="'.$rb_count.'">'.$resptype.'</label></td>'. |
'<td><label for="'.$rb_count.'">'.$resptype.'</label></td>'. |
'<td><label for="'.$rb_count.'">'.$title.'</label>'; |
'<td><label for="'.$rb_count.'">'.$title.'</label>'; |
if (scalar(@response_ids) > 1) { |
if (scalar(@response_ids) > 1) { |
Line 173 sub problem_selector {
|
Line 175 sub problem_selector {
|
} |
} |
my $link = $res->link.'?symb='.&escape($res->shown_symb); |
my $link = $res->link.'?symb='.&escape($res->shown_symb); |
$seq_str .= (' 'x2). |
$seq_str .= (' 'x2). |
qq{<a target="preview" href="$link">view</a>}; |
'<a target="preview" href="'.$link.'">'.&mt('view').'</a>'; |
$seq_str .= "</td></tr>\n"; |
$seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n"; |
$rb_count++; |
$rb_count++; |
} |
} |
} |
} |
} |
} |
} |
} |
if ($seq_str ne '') { |
if ($seq_str ne '') { |
$Str .= '<tr><td> </td>'. |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
'<td colspan="2"><b>'.$seq->compTitle.'</b></td>'. |
'<th colspan="3">'.$seq->compTitle.'</th>'. |
"</tr>\n".$seq_str; |
&Apache::loncommon::end_data_table_header_row()."\n".$seq_str; |
if (defined($sequence_addendum)) { |
if (defined($sequence_addendum)) { |
$Str .= '<tr>'. |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
('<td> </td>'x2). |
('<td> </td>'x2). |
'<td align="right">'.$sequence_addendum.'</td>'. |
'<td align="right">'.$sequence_addendum.'</td>'. |
"</tr>\n"; |
&Apache::loncommon::end_data_table_header_row()."\n"; |
} |
} |
} |
} |
} |
} |
$Str .= "</table>\n"; |
$Str .= &Apache::loncommon::end_data_table()."\n"; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 222 and their contents. A checkbox is provi
|
Line 224 and their contents. A checkbox is provi
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
sub MultipleProblemSelector { |
sub MultipleProblemSelector { |
my ($navmap,$inputname,$formname)=@_; |
my ($navmap,$inputname,$formname,$anoncounter)=@_; |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
my $Str; |
my $Str; |
# Massage the input as needed. |
# Massage the input as needed. |
if (! defined($navmap)) { |
if (! defined($navmap)) { |
$navmap = Apache::lonnavmaps::navmap->new(); |
$navmap = Apache::lonnavmaps::navmap->new(); |
if (! defined($navmap)) { |
if (! defined($navmap)) { |
$Str .= |
$Str .= '<div class="LC_error">' |
'<h1>'.&mt('Error: cannot process course structure').'</h1>'; |
.&mt('Error: cannot process course structure') |
|
.'</div>'; |
return $Str; |
return $Str; |
} |
} |
} |
} |
my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))}; |
my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))}; |
# Header |
# Header |
$Str .= <<"END"; |
$Str .= <<"END"; |
<script language="JavaScript" type="text/javascript"> |
<script type="text/javascript" language="JavaScript"> |
function checkall(value,seqid) { |
function checkall(value,seqid) { |
for (i=0; i<document.forms.$formname.elements.length; i++) { |
for (i=0; i<document.forms.$formname.elements.length; i++) { |
ele = document.forms.$formname.elements[i]; |
ele = document.forms.$formname.elements[i]; |
Line 256 sub MultipleProblemSelector {
|
Line 259 sub MultipleProblemSelector {
|
} |
} |
</script> |
</script> |
END |
END |
$Str .= |
my $checkanonjs = <<"END"; |
|
|
|
<script type="text/javascript" language="JavaScript"> |
|
function checkanon() { |
|
return true; |
|
} |
|
</script> |
|
|
|
END |
|
if (ref($anoncounter) eq 'HASH') { |
|
if (keys(%{$anoncounter}) > 0) { |
|
my $anonwarning = &mt('Your selection includes both problems with and without anonymous submissions.').'\n'.&mt('You must select either only anonymous or only named problems.').'\n\n'.&mt('If a selection contains both anonymous and named parts, [_1]use the Anoymous/Named buttons to ensure selections will be either all anonymous [_1]or all named.','\n'); |
|
$checkanonjs = <<"END"; |
|
|
|
<script type="text/javascript" language="JavaScript"> |
|
function checkanon() { |
|
anoncount = 0; |
|
namedcount = 0; |
|
for (i=0; i<document.forms.$formname.elements.length; i++) { |
|
ele = document.forms.$formname.elements[i]; |
|
if (ele.name == '$inputname') { |
|
itemid = document.forms.$formname.elements[i].id; |
|
if (document.forms.$formname.elements[i].checked) { |
|
anonid = 'anonymous_'+itemid; |
|
mixid = 'mixed_'+itemid; |
|
anonele = document.getElementById(anonid); |
|
mixele = document.getElementById(mixid); |
|
if (anonele.value > 0) { |
|
if (mixele.value == 'none') { |
|
anoncount ++; |
|
} else { |
|
if (mixele.value == '0') { |
|
if (mixele.checked) { |
|
anoncount ++; |
|
} else { |
|
namedcount ++; |
|
} |
|
} else { |
|
namedcount ++; |
|
} |
|
} |
|
} else { |
|
namedcount ++; |
|
} |
|
} |
|
} |
|
} |
|
if (anoncount > 0 && namedcount > 0) { |
|
alert("$anonwarning"); |
|
return false; |
|
} |
|
} |
|
</script> |
|
|
|
END |
|
} |
|
} |
|
$Str .= $checkanonjs. |
'<a href="javascript:checkall(true)">'.&mt('Select All').'</a>'. |
'<a href="javascript:checkall(true)">'.&mt('Select All').'</a>'. |
(' 'x4). |
(' 'x4). |
'<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>'; |
'<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>'; |
Line 287 END
|
Line 347 END
|
$seq_id++, |
$seq_id++, |
$inputname)); |
$inputname)); |
} elsif ($curRes->is_problem) { |
} elsif ($curRes->is_problem) { |
|
my $anonpart = 0; |
|
my $namedpart = 0; |
|
my @parts = @{$curRes->parts()}; |
|
if (ref($anoncounter) eq 'HASH') { |
|
if (keys(%{$anoncounter}) > 0) { |
|
my @parts = @{$curRes->parts()}; |
|
my $symb = $curRes->symb(); |
|
foreach my $part (@parts) { |
|
if ((exists($anoncounter->{$symb."\0".$part})) || |
|
$curRes->is_anonsurvey($part)) { |
|
$anonpart ++; |
|
} else { |
|
$namedpart ++ |
|
} |
|
} |
|
} |
|
} |
if (@Accumulator && $Accumulator[-1] ne '') { |
if (@Accumulator && $Accumulator[-1] ne '') { |
&{$Accumulator[-1]}($curRes, |
&{$Accumulator[-1]}($curRes, |
exists($selected->{$curRes->symb})); |
exists($selected->{$curRes->symb}), |
|
$anonpart,$namedpart); |
} |
} |
} |
} |
} |
} |
Line 317 sub new_accumulator {
|
Line 395 sub new_accumulator {
|
return |
return |
sub { |
sub { |
if (@_) { |
if (@_) { |
my ($res,$checked) = @_; |
my ($res,$checked,$anonpart,$namedpart) = @_; |
$target.='<tr><td><label>'. |
$target.='<tr><td><label>'. |
'<input type="checkbox" name="'.$inputname.'" '; |
'<input type="checkbox" name="'.$inputname.'" '; |
if ($checked) { |
if ($checked) { |
$target .= 'checked '; |
$target .= 'checked="checked" '; |
} |
} |
|
my $anon_id = $item_id; |
$target .= 'id="'.$seq_id.':'.$item_id++.'" '; |
$target .= 'id="'.$seq_id.':'.$item_id++.'" '; |
|
my $esc_symb = &escape($res->symb); |
$target.= |
$target.= |
'value="'.&escape($res->symb).'" />'. |
'value="'.$esc_symb.'" />'. |
' '.$res->compTitle.'</label>'. |
' '.$res->compTitle.'</label>'. |
(' 'x2).'<a target="preview" '. |
(' 'x2).'<a target="preview" '. |
'href="'.$res->link.'?symb='. |
'href="'.$res->link.'?symb='. |
&escape($res->shown_symb).'">view</a>'. |
&escape($res->shown_symb).'">'.&mt('view').'</a>'. |
'</td></tr>'.$/; |
'<input type="hidden" id="anonymous_'.$seq_id.':'.$anon_id.'" name="hidden_'.$seq_id.':'.$anon_id.'" value="'.$anonpart.'" />'; |
|
my $mixed = '<input type="hidden" id="mixed_'.$seq_id.':'.$anon_id.'" value="none" name="mixed_'.$seq_id.':'.$anon_id.'" />'; |
|
if ($anonpart) { |
|
if ($namedpart) { |
|
my $checknamed = ''; |
|
my $checkedanon = ' checked="checked"'; |
|
if ($env{'form.mixed_'.$seq_id.':'.$anon_id} eq $esc_symb) { |
|
$checknamed = $checkedanon; |
|
$checkedanon = ''; |
|
} |
|
$mixed = ' ('. |
|
&mt('Both anonymous and named submissions -- display: [_1]Anonymous [_2]Named[_3]', |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="mixed_'.$seq_id.':'.$anon_id. |
|
'" value="0" id="mixed_'.$seq_id.':'.$anon_id.'"'.$checkedanon.' />', |
|
'</label></span>'.(' 'x2).' <span class="LC_nobreak">'. |
|
'<label><input type="radio" name="mixed_'.$seq_id.':'.$anon_id. |
|
'" value="symb_'.$esc_symb.'" id="named_'.$seq_id.':'.$anon_id.'"'.$checknamed.' />', |
|
'</label></span>').')'; |
|
} else { |
|
$target .= ' '.&mt('(Anonymous Survey)'); |
|
} |
|
} |
|
$target.= $mixed.'</td></tr>'.$/; |
} else { |
} else { |
if (defined($target)) { |
if (defined($target)) { |
return { title => $title, |
return { title => $title, |
Line 463 sub get_prev_curr_next {
|
Line 566 sub get_prev_curr_next {
|
my @resources = &get_resources($navmap,$seq); |
my @resources = &get_resources($navmap,$seq); |
foreach my $res (@resources) { |
foreach my $res (@resources) { |
foreach my $part (@{$res->parts}) { |
foreach my $part (@{$res->parts}) { |
if ($res->is_survey($part) && ($granularity eq 'part_survey')){ |
if (($res->is_survey($part) || ($res->is_anonsurvey($part))) && |
|
($granularity eq 'part_survey')) { |
push (@Resource, |
push (@Resource, |
{ symb => $res->symb, |
{ symb => $res->symb, |
part => $part, |
part => $part, |
Line 608 sub GetStudentAnswers {
|
Line 712 sub GetStudentAnswers {
|
my $answer = &Apache::lonstathelpers::get_student_answer |
my $answer = &Apache::lonstathelpers::get_student_answer |
($resource,$sname,$sdom,$partid,$respid); |
($resource,$sname,$sdom,$partid,$respid); |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&mt('last student')); |
'last student'); |
$answers{$answer}++; |
$answers{$answer}++; |
$student->{'answer'} = $answer; |
$student->{'answer'} = $answer; |
} |
} |
Line 1254 sub limit_by_time_form {
|
Line 1358 sub limit_by_time_form {
|
my $enddateform = &Apache::lonhtmlcommon::date_setter |
my $enddateform = &Apache::lonhtmlcommon::date_setter |
('Statistics','limitby_enddate',$endtime,undef,undef,$state); |
('Statistics','limitby_enddate',$endtime,undef,undef,$state); |
my $Str; |
my $Str; |
$Str .= '<script language="Javascript" >'; |
$Str .= '<script type="text/javascript" language="JavaScript">'; |
$Str .= 'function toggle_limitby_activity(state) {'; |
$Str .= 'function toggle_limitby_activity(state) {'; |
$Str .= ' if (state) {'; |
$Str .= ' if (state) {'; |
$Str .= ' limitby_startdate_enable();'; |
$Str .= ' limitby_startdate_enable();'; |
Line 1419 sub submission_report_form {
|
Line 1523 sub submission_report_form {
|
' enough input.'); |
' enough input.'); |
} |
} |
my $html = $/. |
my $html = $/. |
'<script type="Text/JavaScript">'. |
'<script type="text/javascript" language="JavaScript">'. |
"document.Statistics.reportSelected.value='$original_report';". |
"document.Statistics.reportSelected.value='$original_report';". |
'</script>'. |
'</script>'. |
'<input type="hidden" name="correctans" value="true" />'. |
'<input type="hidden" name="correctans" value="true" />'. |