loncom/interface/lonnavmaps.pm - diff

Return to lonnavmaps.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavmaps.pm between versions 1.509.2.14.2.7 and 1.509.2.14.2.9

version 1.509.2.14.2.7, 2023/01/20 22:51:11	version 1.509.2.14.2.9, 2023/07/06 20:32:17
Line 534 my %colormap =	Line 534 my %colormap =
$resObj->EXCUSED => '#3333FF',	$resObj->EXCUSED => '#3333FF',
$resObj->PAST_DUE_ANSWER_LATER => '',	$resObj->PAST_DUE_ANSWER_LATER => '',
$resObj->PAST_DUE_NO_ANSWER => '',	$resObj->PAST_DUE_NO_ANSWER => '',
	$resObj->PAST_DUE_ATMPT_ANS => '',
	$resObj->PAST_DUE_ATMPT_NOANS => '',
	$resObj->PAST_DUE_NO_ATMT_ANS => '',
	$resObj->PAST_DUE_NO_ATMT_NOANS => '',
$resObj->ANSWER_OPEN => '#006600',	$resObj->ANSWER_OPEN => '#006600',
$resObj->OPEN_LATER => '',	$resObj->OPEN_LATER => '',
$resObj->TRIES_LEFT => '',	$resObj->TRIES_LEFT => '',
Line 679 sub getDescription {	Line 683 sub getDescription {
return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;	return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
}	}
}	}
if ($status == $res->PAST_DUE_ANSWER_LATER) {	if (($status == $res->PAST_DUE_ANSWER_LATER) \|\| ($status == $res->PAST_DUE_ATMPT_ANS) \|\| ($status == $res->PAST_DUE_NO_ATMT_ANS)) {
return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));	return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));
}	}
if ($status == $res->PAST_DUE_NO_ANSWER) {	if (($status == $res->PAST_DUE_NO_ANSWER) \|\| ($status == $res->PAST_DUE_ATMPT_NOANS) \|\| ($status == $res->PAST_DUE_NO_ATMT_NOANS)) {
if ($res->is_practice()) {	if ($res->is_practice()) {
return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));	return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));
} else {	} else {
Line 691 sub getDescription {	Line 695 sub getDescription {
}	}
if (($status == $res->ANSWER_OPEN \|\| $status == $res->PARTIALLY_CORRECT)	if (($status == $res->ANSWER_OPEN \|\| $status == $res->PARTIALLY_CORRECT)
&& $res->handgrade($part) ne 'yes') {	&& $res->handgrade($part) ne 'yes') {
return &Apache::lonhtmlcommon::direct_parm_link(&mt("Answer available"),$res->symb(),'answerdate,duedate',$part);	my $msg = &mt('Answer available');
	my $parmlist = 'answerdate,duedate';
	if (($res->is_tool) && ($res->is_gradable())) {
	if (($status == $res->PARTIALLY_CORRECT) && ($res->parmval('retrypartial',$part))) {
	$msg = &mt('Grade received');
	$parmlist = 'retrypartial';
	} else {
	$msg = &mt('Grade available');
	}
	}
	return &Apache::lonhtmlcommon::direct_parm_link($msg,$res->symb(),$parmlist,$part);
}	}
if ($status == $res->EXCUSED) {	if ($status == $res->EXCUSED) {
return &mt("Excused by instructor");	return &mt("Excused by instructor");
Line 1195 sub render_quick_status {	Line 1209 sub render_quick_status {
my $linkclose = "</a>";	my $linkclose = "</a>";

$result .= '<td class="LC_middle">';	$result .= '<td class="LC_middle">';
if ($resource->is_problem() &&	if ($resource->is_gradable() &&
!$firstDisplayed) {	!$firstDisplayed) {
my $icon = $statusIconMap{$resource->simpleStatus($part)};	my $icon = $statusIconMap{$resource->simpleStatus($part)};
my $alt = $iconAltTags{$icon};	my $alt = $iconAltTags{$icon};
Line 1220 sub render_long_status {	Line 1234 sub render_long_status {

my $color;	my $color;
my $info = '';	my $info = '';
if ($resource->is_problem() \|\| $resource->is_practice()) {	if ($resource->is_gradable() \|\| $resource->is_practice()) {
$color = $colormap{$resource->status};	$color = $colormap{$resource->status};

if (dueInLessThan24Hours($resource, $part)) {	if (dueInLessThan24Hours($resource, $part)) {
Line 1235 sub render_long_status {	Line 1249 sub render_long_status {
}	}
}	}

if ($resource->kind() eq "res" &&	if (($resource->kind() eq "res") &&
$resource->is_raw_problem() &&	($resource->is_raw_problem() \|\| $resource->is_gradable()) &&
!$firstDisplayed) {	!$firstDisplayed) {
if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }	if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
$result .= getDescription($resource, $part);	$result .= getDescription($resource, $part);
Line 1283 my @statuses = ($resObj->CORRECT, $resOb	Line 1297 my @statuses = ($resObj->CORRECT, $resOb

sub render_parts_summary_status {	sub render_parts_summary_status {
my ($resource, $part, $params) = @_;	my ($resource, $part, $params) = @_;
if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }	if (!$resource->is_gradable() && !$resource->contains_problem) { return '<td></td>'; }
if ($params->{showParts}) {	if ($params->{showParts}) {
return '<td></td>';	return '<td></td>';
}	}
Line 2845 sub parmval_real {	Line 2859 sub parmval_real {

my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);	my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
$mapname = &Apache::lonnet::deversion($mapname);	$mapname = &Apache::lonnet::deversion($mapname);
	my $toolsymb = '';
	if ($fn =~ /ext\.tool$/) {
	$toolsymb = $symb;
	}
# ----------------------------------------------------- Cascading lookup scheme	# ----------------------------------------------------- Cascading lookup scheme
my $rwhat=$what;	my $rwhat=$what;
$what=~s/^parameter\_//;	$what=~s/^parameter\_//;
Line 2908 sub parmval_real {	Line 2926 sub parmval_real {

my $meta_rwhat=$rwhat;	my $meta_rwhat=$rwhat;
$meta_rwhat=~s/\./_/g;	$meta_rwhat=~s/\./_/g;
my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);	my $default=&Apache::lonnet::metadata($fn,$meta_rwhat,$toolsymb);
if (defined($default)) { return [$default,'resource']}	if (defined($default)) { return [$default,'resource']}
$default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);	$default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat,$toolsymb);
if (defined($default)) { return [$default,'resource']}	if (defined($default)) { return [$default,'resource']}
# --------------------------------------------------- fifth, check more course	# --------------------------------------------------- fifth, check more course
if (defined($courseopt)) {	if (defined($courseopt)) {
Line 2933 sub parmval_real {	Line 2951 sub parmval_real {
if (defined($partgeneral[0])) { return \@partgeneral; }	if (defined($partgeneral[0])) { return \@partgeneral; }
}	}
if ($recurse) { return []; }	if ($recurse) { return []; }
my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat);	my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat,$toolsymb);
if (defined($pack_def)) { return [$pack_def,'resource']; }	if (defined($pack_def)) { return [$pack_def,'resource']; }
return [''];	return [''];
}	}
Line 3485 sub usedVersion {	Line 3503 sub usedVersion {
return $self->navhash("version_$linkurl");	return $self->navhash("version_$linkurl");
}	}

	sub isFirstResource {
	my $self = shift;
	my $map = shift;
	my $symb = shift;
	return unless (ref($map));
	my $isfirst;
	my $firstResource = $map->map_start();
	if (ref($firstResource)) {
	if ((!$firstResource->is_map()) && ($firstResource->src() ne '')) {
	if ($firstResource->symb() eq $symb) {
	$isfirst = 1;
	} else {
	$isfirst = 0;
	}
	} else {
	my $it = $self->getIterator($firstResource,undef,undef,1);
	while ( my $res=$it->next()) {
	if ((ref($res)) && ($res->src() ne '') && (!$res->is_map())) {
	if ($res->symb() eq $symb) {
	$isfirst = 1;
	} else {
	$isfirst = 0;
	}
	last;
	}
	}
	}
	}
	return $isfirst;
	}

	sub isLastResource {
	my $self = shift;
	my $map = shift;
	my $symb = shift;
	return unless (ref($map));
	my $islast;
	my $lastResource = $map->map_finish();
	if (ref($lastResource)) {
	if ((!$lastResource->is_map()) && ($lastResource->src() ne '')) {
	if ($lastResource->symb() eq $symb) {
	$islast = 1;
	} else {
	$islast = 0;
	}
	} else {
	my $currRes = $self->getBySymb($symb);
	if (ref($currRes)) {
	my $it = $self->getIterator($currRes,undef,undef,1);
	while ( my $res=$it->next()) {
	if ((ref($res)) && ($res->src() ne '') && (!$res->is_map())) {
	if ($res->symb() eq $symb) {
	$islast = 1;
	} else {
	$islast = 0;
	}
	last;
	}
	}
	}
	}
	}
	return $islast;
	}

1;	1;

package Apache::lonnavmaps::iterator;	package Apache::lonnavmaps::iterator;
Line 4542 sub is_problem {	Line 4625 sub is_problem {
}	}
return 0;	return 0;
}	}
	sub is_tool {
	my $self=shift;
	my $src = $self->src();
	return ($src =~ /ext\.tool$/);
	}
	sub is_gradable {
	my $self=shift;
	my $src = $self->src();
	if (($src =~ /$LONCAPA::assess_re/) \|\|
	(($self->is_tool()) && ($self->parmval('gradable',0) =~ /^yes$/i))) {
	return !($self->is_practice());
	}
	}
#	#
# The has below is the set of status that are considered 'incomplete'	# The has below is the set of status that are considered 'incomplete'
#	#
Line 5241 sub parts {	Line 5337 sub parts {
my $self = shift;	my $self = shift;

if ($self->ext) { return []; }	if ($self->ext) { return []; }
	if (($self->is_tool()) &&
	($self->is_gradable())) { return ['0']; }

$self->extractParts();	$self->extractParts();
return $self->{PARTS};	return $self->{PARTS};
Line 5331 sub extractParts {	Line 5429 sub extractParts {
my %parts;	my %parts;

# Retrieve part count, if this is a problem	# Retrieve part count, if this is a problem
if ($self->is_problem()) {	if ($self->is_raw_problem()) {
my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');	my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');

Line 5498 The problem will be opened later.	Line 5596 The problem will be opened later.

Open and not yet due.	Open and not yet due.


=item * B<PAST_DUE_ANSWER_LATER>:	=item * B<PAST_DUE_ANSWER_LATER>:

The due date has passed, but the answer date has not yet arrived.	The due date has passed, but the answer date has not yet arrived.
Line 5511 The due date has passed and there is no	Line 5608 The due date has passed and there is no

The answer date is here.	The answer date is here.

	=item * B<NOTHING_SET>:

	No dates have been set for this problem at all.

	=item * B<PAST_DUE_ATMPT_ANS>:

	The due date has passed, feedback is suppressed, the problem was attempted, and the answer date has not yet arrived.

	=item * B<PAST_DUE_ATMPT_NOANS>:

	The due date has passed, feedback is suppressed, the problem was attempted, and there is no answer opening date set.

	=item * B<PAST_DUE_NO_ATMT_ANS>:

	The due date has passed, feedback is suppressed, the problem was not attempted, and the answer date has not yet arrived.

	=item * B<PAST_DUE_NO_ATMT_NOANS>:

	The due date has passed, feedback is suppressed, the problem was not attempted, and there is no answer opening date set.

=item * B<NETWORK_FAILURE>:	=item * B<NETWORK_FAILURE>:

The information is unknown due to network failure.	The information is unknown due to network failure.
Line 5526 sub PAST_DUE_NO_ANSWER { return 2; }	Line 5643 sub PAST_DUE_NO_ANSWER { return 2; }
sub PAST_DUE_ANSWER_LATER { return 3; }	sub PAST_DUE_ANSWER_LATER { return 3; }
sub ANSWER_OPEN { return 4; }	sub ANSWER_OPEN { return 4; }
sub NOTHING_SET { return 5; }	sub NOTHING_SET { return 5; }
	sub PAST_DUE_ATMPT_ANS { return 6; }
	sub PAST_DUE_ATMPT_NOANS { return 7; }
	sub PAST_DUE_NO_ATMT_ANS { return 8; }
	sub PAST_DUE_NO_ATMT_NOANS { return 9; }
sub NETWORK_FAILURE { return 100; }	sub NETWORK_FAILURE { return 100; }

# getDateStatus gets the date status for a given problem part.	# getDateStatus gets the date status for a given problem part.
Line 5615 Attempted, and not yet graded.	Line 5736 Attempted, and not yet graded.

Attempted, and credit received for attempt (survey and anonymous survey only).	Attempted, and credit received for attempt (survey and anonymous survey only).

	=item * B<INCORRECT_BY_PASSBACK>:

	Attempted, but wrong for LTI Tool Provider by passback of grade

	=item * B<CORRECT_BY_PASSBACK>:

	Correct for LTI Tool Provider by passback of grade

=back	=back

=cut	=cut
Line 5627 sub CORRECT_BY_OVERRIDE { return 14; }	Line 5756 sub CORRECT_BY_OVERRIDE { return 14; }
sub EXCUSED { return 15; }	sub EXCUSED { return 15; }
sub ATTEMPTED { return 16; }	sub ATTEMPTED { return 16; }
sub CREDIT_ATTEMPTED { return 17; }	sub CREDIT_ATTEMPTED { return 17; }
	sub INCORRECT_BY_PASSBACK { return 18; }
	sub CORRECT_BY_PASSBACK { return 19; }

sub getCompletionStatus {	sub getCompletionStatus {
my $self = shift;	my $self = shift;
Line 5641 sub getCompletionStatus {	Line 5772 sub getCompletionStatus {
if ($status eq 'correct_by_override') {	if ($status eq 'correct_by_override') {
return $self->CORRECT_BY_OVERRIDE;	return $self->CORRECT_BY_OVERRIDE;
}	}
	if ($status eq 'correct_by_passback') {
	return $self->CORRECT_BY_PASSBACK;
	}
if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }	if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }	if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
	if ($status eq 'incorrect_by_passback') {return $self->INCORRECT_BY_PASSBACK; }
if ($status eq 'excused') {return $self->EXCUSED; }	if ($status eq 'excused') {return $self->EXCUSED; }
if ($status eq 'ungraded_attempted') {return $self->ATTEMPTED; }	if ($status eq 'ungraded_attempted') {return $self->ATTEMPTED; }
if ($status eq 'credit_attempted') {	if ($status eq 'credit_attempted') {
Line 5715 set.	Line 5850 set.
The problem is past due, not considered correct, and an answer date in	The problem is past due, not considered correct, and an answer date in
the future is set.	the future is set.

	=item * B<PAST_DUE_ATMPT_ANS>:

	The problem is past due, feedback is suppressed, the problem was
	attempted and an answer date in the future is set.

	=item * B<PAST_DUE_ATMPT_NOANS>:

	The problem is past due, feedback is suppressed, the problem was
	attempted and no answer date is set.

	=item * B<PAST_DUE_NO_ATMT_ANS>:

	The problem is past due, feedback is suppressed, the problem was
	not attempted and an answer date in the future is set.

	=item * B<PAST_DUE_NO_ATMT_NOANS>:

	The problem is past due, feedback is suppressed, the problem was
	not attempted and no answer date is set.

=item * B<ANSWER_OPEN>:	=item * B<ANSWER_OPEN>:

The problem is past due, not correct, and the answer is now available.	The problem is past due, not correct, and the answer is now available.
Line 5796 sub status {	Line 5951 sub status {

# There are a few whole rows we can dispose of:	# There are a few whole rows we can dispose of:
if ($completionStatus == CORRECT \|\|	if ($completionStatus == CORRECT \|\|
$completionStatus == CORRECT_BY_OVERRIDE ) {	$completionStatus == CORRECT_BY_OVERRIDE \|\|
if ( $suppressFeedback ) { return ANSWER_SUBMITTED }	$completionStatus == CORRECT_BY_PASSBACK ) {
	if ( $suppressFeedback ) {
	if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|
	$dateStatus == PAST_DUE_NO_ANSWER ) {
	if ($dateStatus == PAST_DUE_ANSWER_LATER) {
	return PAST_DUE_ATMPT_ANS;
	} else {
	return PAST_DUE_ATMPT_NOANS;
	}
	} else {
	return ANSWER_SUBMITTED;
	}
	}
my $awarded=$self->awarded($part);	my $awarded=$self->awarded($part);
if ($awarded < 1 && $awarded > 0) {	if ($awarded < 1 && $awarded > 0) {
return PARTIALLY_CORRECT;	return PARTIALLY_CORRECT;
Line 5809 sub status {	Line 5976 sub status {

# If it's WRONG... and not open	# If it's WRONG... and not open
if ( ($completionStatus == INCORRECT \|\|	if ( ($completionStatus == INCORRECT \|\|
$completionStatus == INCORRECT_BY_OVERRIDE)	$completionStatus == INCORRECT_BY_OVERRIDE \|\|
	$completionStatus == INCORRECT_BY_PASSBACK)
&& (!$self->opendate($part) \|\| $self->opendate($part) > time()) ) {	&& (!$self->opendate($part) \|\| $self->opendate($part) > time()) ) {
return INCORRECT;	return INCORRECT;
}	}
Line 5836 sub status {	Line 6004 sub status {

if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|	if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|
$dateStatus == PAST_DUE_NO_ANSWER ) {	$dateStatus == PAST_DUE_NO_ANSWER ) {
return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus;	if ($suppressFeedback) {
	if ($completionStatus == NOT_ATTEMPTED) {
	if ($dateStatus == PAST_DUE_ANSWER_LATER) {
	return PAST_DUE_NO_ATMT_ANS;
	} else {
	return PAST_DUE_NO_ATMT_NOANS;
	}
	} else {
	if ($dateStatus == PAST_DUE_ANSWER_LATER) {
	return PAST_DUE_ATMPT_ANS;
	} else {
	return PAST_DUE_ATMPT_NOANS;
	}
	}
	} else {
	return $dateStatus;
	}
}	}

if ($dateStatus == ANSWER_OPEN) {	if ($dateStatus == ANSWER_OPEN) {
Line 5851 sub status {	Line 6035 sub status {
}	}

# If it's WRONG...	# If it's WRONG...
if ($completionStatus == INCORRECT \|\| $completionStatus == INCORRECT_BY_OVERRIDE) {	if ($completionStatus == INCORRECT \|\| $completionStatus == INCORRECT_BY_OVERRIDE \|\|
	$completionStatus == INCORRECT_BY_PASSBACK) {
# and there are TRIES LEFT:	# and there are TRIES LEFT:
if ($self->tries($part) < $self->maxtries($part) \|\| !$self->maxtries($part)) {	if ($self->tries($part) < $self->maxtries($part) \|\| !$self->maxtries($part)) {
return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;	return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;
Line 6046 my %compositeToSimple =	Line 6231 my %compositeToSimple =
EXCUSED() => CORRECT,	EXCUSED() => CORRECT,
PAST_DUE_NO_ANSWER() => INCORRECT,	PAST_DUE_NO_ANSWER() => INCORRECT,
PAST_DUE_ANSWER_LATER() => INCORRECT,	PAST_DUE_ANSWER_LATER() => INCORRECT,
	PAST_DUE_ATMPT_ANS() => ATTEMPTED,
	PAST_DUE_ATMPT_NOANS() => ATTEMPTED,
	PAST_DUE_NO_ATMT_ANS() => CLOSED,
	PAST_DUE_NO_ATMT_NOANS() => CLOSED,
ANSWER_OPEN() => INCORRECT,	ANSWER_OPEN() => INCORRECT,
OPEN_LATER() => CLOSED,	OPEN_LATER() => CLOSED,
TRIES_LEFT() => OPEN,	TRIES_LEFT() => OPEN,

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.509.2.14.2.7
changed lines
	Added in v.1.509.2.14.2.9