loncom/interface/lonquickgrades.pm - diff

Return to lonquickgrades.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonquickgrades.pm between versions 1.85 and 1.97

version 1.85, 2011/05/04 01:49:08	version 1.97, 2011/06/01 21:32:50
Line 244 sub getData {	Line 244 sub getData {
for my $part (@{$parts}) {	for my $part (@{$parts}) {
my $completionStatus = $curRes->getCompletionStatus($part);	my $completionStatus = $curRes->getCompletionStatus($part);
my $dateStatus = $curRes->getDateStatus($part);	my $dateStatus = $curRes->getDateStatus($part);
	my $weight = $curRes->weight($part);
	my $problemstatus = $curRes->problemstatus($part);

if ($completionStatus == $curRes->EXCUSED()) {	if ($completionStatus == $curRes->EXCUSED()) {
next;	next;
}	}
Line 252 sub getData {	Line 254 sub getData {
my $score = 0;	my $score = 0;
# If we're not telling status and the answer date isn't passed yet,	# If we're not telling status and the answer date isn't passed yet,
# it's an "attempted" point	# it's an "attempted" point
if ((($curRes->problemstatus($part) eq 'no') \|\|	if ((($problemstatus eq 'no') \|\|
($curRes->problemstatus($part) eq 'no_feedback_ever')) &&	($problemstatus eq 'no_feedback_ever')) &&
($dateStatus != $curRes->ANSWER_OPEN)) {	($dateStatus != $curRes->ANSWER_OPEN)) {
my $status = $curRes->simpleStatus($part);	my $status = $curRes->simpleStatus($part);
if ($status == $curRes->ATTEMPTED) {	if ($status == $curRes->ATTEMPTED) {
$partsAttempted += $curRes->weight($part);	$partsAttempted += $weight;
$totalAttempted += $partsAttempted;	$totalAttempted += $partsAttempted;
}	}
} else {	} else {
$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));	$score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
}	}
$partsRight += $score;	$partsRight += $score;
$totalRight += $score;	$totalRight += $score;
$partsCount += $curRes->weight($part);	$partsCount += $weight;

$curRes->{DATA}->{PROB_SCORE} += $score;	$curRes->{DATA}->{PROB_SCORE} += $score;
$curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);	$curRes->{DATA}->{PROB_WEIGHT} += $weight;

if ($curRes->opendate($part) < $now) {	if ($curRes->opendate($part) < $now) {
$totalPossible += $curRes->weight($part);	$totalPossible += $weight;
$curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);	$curRes->{DATA}->{PROB_POSSIBLE} += $weight;
}	}
$totalParts += $curRes->weight($part);	$totalParts += $weight;
} else {	} else {
my $status = $curRes->simpleStatus($part);	my $status = $curRes->simpleStatus($part);
my $thisright = 0;	my $thisright = 0;
Line 291 sub getData {	Line 293 sub getData {
$totalAttempted++;	$totalAttempted++;
}	}

my $dateStatus = $curRes->getDateStatus($part);
$totalParts++;	$totalParts++;
if ($curRes->opendate($part) < $now) {	if ($curRes->opendate($part) < $now) {
$totalPossible++;	$totalPossible++;
Line 467 sub outputCategories {	Line 468 sub outputCategories {
$r->print(&Apache::loncommon::resourcebrowser_javascript().	$r->print(&Apache::loncommon::resourcebrowser_javascript().
'<input type="hidden" name="storemove" value="" />'.	'<input type="hidden" name="storemove" value="" />'.
'<input type="hidden" name="cmd" value="" />'.	'<input type="hidden" name="cmd" value="" />'.
	'<input type="hidden" name="resourcesymb" value="" />'.
'<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.	'<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.
'<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');	'<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');
}	}
Line 477 sub outputCategories {	Line 479 sub outputCategories {
# foreach (keys(%data)) {	# foreach (keys(%data)) {
# $r->print("\n<br />".$_.'='.$data{$_});	# $r->print("\n<br />".$_.'='.$data{$_});
# }	# }
	# my @debugarray=('5:1','4:3','1:1','5:5','6:7');
	# $r->print("Array: ".join(',',@debugarray).'<br />');
	# $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />');
	# $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />');
	# $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />');
	# $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />');
	#
	# $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />');
	# $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />');
	# $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />');
	# $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />');
	#
	# $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />');
	# $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />');
	# $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />');
	# $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />');
	#
	# $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />');
	# $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />');
	# $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />');
	# $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />');
	#
	# $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />');
	# $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />');
	# $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />');
	# $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />');

}	}

#	#
Line 538 sub process_category_edits {	Line 567 sub process_category_edits {
} elsif ($cmd=~/^delcat\_(.+)$/) {	} elsif ($cmd=~/^delcat\_(.+)$/) {
%categories=&del_category($1,$cangrade,%categories);	%categories=&del_category($1,$cangrade,%categories);
} elsif ($cmd=~/^addcont\_(.+)$/) {	} elsif ($cmd=~/^addcont\_(.+)$/) {
%categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories);	%categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories);
} elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {	} elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
%categories=&del_category_content($1,$cangrade,$2,%categories);	%categories=&del_category_content($1,$cangrade,$2,%categories);
} elsif ($cmd=~/^newrule\_(.+)$/) {	} elsif ($cmd=~/^newrule\_(.+)$/) {
Line 560 sub process_category_edits {	Line 589 sub process_category_edits {

sub output_category_table {	sub output_category_table {
my ($r,$cangrade,$navmaps,%categories)=@_;	my ($r,$cangrade,$navmaps,%categories)=@_;
my $sum=0;
my $total=0;	my $totalweight=0;
	my $totalpoints=0;

$r->print(&Apache::loncommon::start_data_table());	$r->print(&Apache::loncommon::start_data_table());
#	#
&output_category_table_header($r,$cangrade);	&output_category_table_header($r,$cangrade);
#	#
my @order=split(/\,/,$categories{'order'});	my @order=split(/\,/,$categories{'order'});
#	#
	my %performance=&dumpdata($navmaps);
my $maxpos=$#order;	my $maxpos=$#order;
for (my $i=0;$i<=$maxpos;$i++) {	for (my $i=0;$i<=$maxpos;$i++) {
my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,%categories);	my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
$sum+=$value*$weight;	unless ($possible) { next; }
$total+=$weight;	$totalpoints+=$weight*$correct/$possible;
	$totalweight+=$weight;
}	}
#	#
&bottom_line_category($r,$cangrade,$sum,$total);	my $perc=0;
	if ($totalweight) { $perc=100.*$totalpoints/$totalweight; }

	&bottom_line_category($r,$cangrade,$perc);
#	#
$r->print(&Apache::loncommon::end_data_table());	$r->print(&Apache::loncommon::end_data_table());
return $sum;	return $perc;
}	}

sub output_category_table_header {	sub output_category_table_header {
Line 602 sub output_category_table_header {	Line 638 sub output_category_table_header {
#	#

sub output_and_calc_category {	sub output_and_calc_category {
my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_;	my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;
my $value=0;
my $weight=0;
my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");	my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'up' => 'Move Up',	'up' => 'Move Up',
'dw' => 'Move Down');	'dw' => 'Move Down');
$r->print("\n".&Apache::loncommon::start_data_table_row());	if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }

if ($cangrade) {	if ($output && $cangrade) {
$r->print(<<ENDMOVE);	$r->print(<<ENDMOVE);
<td>	<td>
<div class="LC_docs_entry_move">	<div class="LC_docs_entry_move">
Line 638 ENDMOVE	Line 673 ENDMOVE
$r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>');	$r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>');
$r->print('<td><input type="text" name="name_'.$id.	$r->print('<td><input type="text" name="name_'.$id.
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>');	'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>');
} else {	} elsif ($output) {
$r->print('<td>'.$categories{$id.'_name'}.'</td>');	$r->print('<td>'.$categories{$id.'_name'}.'</td>');
}	}
# Content	# Content display and summing up of points
$r->print('<td><ul>');	my $totalpossible=0;
	my $totalcorrect=0;
	my @individual=();
	if ($output) { $r->print('<td><ul>'); }
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {	foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
$r->print('<li>');	my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
$r->print(&Apache::lonnet::gettitle($contentid));	$totalpossible+=$possible;
if ($cangrade) {	$totalcorrect+=$correct;
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');	if ($possible>0) { push(@individual,"$possible:$correct"); }
	if ($output) {
	$r->print('<li>');
	$r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')');
	if ($cangrade) {
	$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
	}
	$r->print('</li>');
}	}
$r->print('</li>');
}	}
$r->print('</ul>');	if ($output) {
if ($cangrade) {	$r->print('</ul>');
$r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />'.	if ($cangrade) {
'<input type="hidden" name="addcont_'.$id.'_res" onChange='."'".'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'."' />");	$r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
	}
	$r->print('<p><b>'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
	$r->print('</td>');
}	}
$r->print('</td>');

# Total	# Total
	if ($output) { $r->print('<td>'); }
if ($cangrade) {	if ($cangrade) {
$r->print('<td>'.	if ($output) {
	$r->print(
'<select name="totaltype_'.$id.'">'.	'<select name="totaltype_'.$id.'">'.
'<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.	'<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.
'<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.	'<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.
'</select>'.	'</select>'.
'<input type="text" size="4" name="total_'.$id.	'<input type="text" size="4" name="total_'.$id.
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" /></td>');	'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" />');
	}
} else {	} else {
$r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>');	if ($output) {
	$r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}));
	}
	}
	# Adjust total points
	if ($categories{$id.'_totaltype'} eq 'typein') {
	$totalpossible=1.*$categories{$id.'_total'};
	}
	if ($output) {
	$r->print('<p><b>'.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
}	}


# Calculation	# Calculation
$r->print('<td><ul>');	if ($output) { $r->print('<td><ul>'); }
foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {	foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
$r->print('<li>');	if ($output) { $r->print('<li>'); }
my ($code,$value)=split(/\:/,$calcrule);	my ($code,$value)=split(/\:/,$calcrule);
$r->print(&pretty_prt_rule($cangrade,$id,$code,$value));	if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
if ($cangrade) {	if ($cangrade) {
$r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>');	if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); }
}	}
$r->print('</li>');	if ($code eq 'capabove') {
	if ($totalpossible>0) {
	if ($totalcorrect/$totalpossible>$value/100.) {
	$totalcorrect=$totalpossible*$value/100.;
	}
	}
	} elsif ($code eq 'capbelow') {
	if ($totalpossible>0) {
	if ($totalcorrect/$totalpossible<$value/100.) {
	$totalcorrect=$totalpossible*$value/100.;
	}
	}
	} elsif ($code eq 'droplow') {
	($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
	} elsif ($code eq 'drophigh') {
	($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
	} elsif ($code eq 'droplowperc') {
	($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
	} elsif ($code eq 'drophighperc') {
	($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
	}
	if ($output) { $r->print('</li>'); }
}	}
$r->print('</ul>');	# Re-adjust total points if force total
if ($cangrade) {	if ($categories{$id.'_totaltype'} eq 'typein') {
$r->print('<br />'.&new_calc_rule_form($id));	$totalpossible=1.*$categories{$id.'_total'};
}	}
$r->print('</td>');

	if ($output) {
	$r->print('</ul>');
	if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
	$r->print('<p><b>'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
	$r->print('</td>');
	}
	#
	# Prepare for export
	#
# Weight	# Weight
	my $weight=$categories{$id.'_weight'};
	unless (1.*$weight>0) { $weight=0; }
if ($cangrade) {	if ($cangrade) {
$r->print('<td>'.	if ($output) {
	$r->print('<td>'.
'<input type="text" size="4" name="weight_'.$id.	'<input type="text" size="4" name="weight_'.$id.
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>');	'" value="'.&Apache::lonhtmlcommon::entity_encode($weight).'" /></td>');
	}
} else {	} else {
$r->print('<td>'.$categories{$id.'_weight'}.'</td>');	if ($output) {
	$r->print('<td>'.$weight.'</td>');
	}
}	}
# Achieved	# Achieved
$r->print('<td>');	my $type=$categories{$id.'_displayachieved'};
	unless (($type eq 'percent') \|\| ($type eq 'points')) { $type='points'; }
	if ($output) { $r->print('<td>'); }
if ($cangrade) {	if ($cangrade) {
$r->print('<select name="displayachieved_'.$id.'">'.	if ($output) {
'<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.	$r->print('<select name="displayachieved_'.$id.'">'.
'<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.	'<option value="percent"'.($type eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.
	'<option value="points"'.($type eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.
'</select>');	'</select>');
} else {	}
if ($categories{$id.'_displayachieved'} eq 'percent') {	}
$r->print(&mt('percent'));	if ($output) {
	$r->print('<p><b>');
	if ($type eq 'percent') {
	my $perc='---';
	if ($totalpossible) {
	$perc=100.*$totalcorrect/$totalpossible;
	}
	$r->print(&mt('[_1] percent',&numberout($perc)));
} else {	} else {
$r->print(&mt('points'));	$r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible)));
}	}
	$r->print('</b></p>');
}	}
$r->print('</td>');	if ($output) { $r->print('</td>'); }

return ($value,$weight);	return ($totalcorrect,$totalpossible,$type,$weight);
}	}

#	#
	# Drop folders and problems
	#

	sub drop {
	my ($high,$percent,$n,@individual)=@_;
	# Sort assignments by points or percent
	my @newindividual=sort {
	my ($pa,$ca)=split(/\:/,$a);
	my ($pb,$cb)=split(/\:/,$b);
	if ($percent) {
	my $perca=0;
	if ($pa>0) { $perca=$ca/$pa; }
	my $percb=0;
	if ($pb>0) { $percb=$cb/$pb; }
	$perca<=>$percb;
	} else {
	$ca<=>$cb;
	}
	} @individual;
	# Drop the ones we don't want
	if ($#newindividual>=$n) {
	if ($high) {
	splice(@newindividual,$#newindividual+1-$n,$n);
	} else {
	splice(@newindividual,0,$n);
	}
	} else {
	@newindividual=();
	}
	# Re-calculate how many points possible and achieved
	my $newpossible=0;
	my $newcorrect=0;
	for my $score (@newindividual) {
	my ($thispossible,$thiscorrect)=(split(/\:/,$score));
	$newpossible+=$thispossible;
	$newcorrect+=$thiscorrect;
	}
	return ($newpossible,$newcorrect,@newindividual);
	}
	#
# Bottom line with grades	# Bottom line with grades
#	#

sub bottom_line_category {	sub bottom_line_category {
my ($r,$cangrade,$sum,$total)=@_;	my ($r,$cangrade,$perc)=@_;
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
if ($cangrade) {	if ($cangrade) {
$r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');	$r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');
}	}
$r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');	$r->print('<td colspan="6"><b>'.&mt('Total: [_1] percent',&numberout($perc)).'</b></td>');
}	}

	sub numberout {
	my ($number)=@_;
	my $printout=sprintf("%.3f", $number);
	$printout=~s/0+$//;
	$printout=~s/\.$//;
	return $printout;
	}
#	#
# Make one new category	# Make one new category
#	#
Line 759 sub make_new_category {	Line 909 sub make_new_category {

sub category_rule_codes {	sub category_rule_codes {
return &Apache::lonlocal::texthash(	return &Apache::lonlocal::texthash(
'droplow' => 'Drop N lowest grade assignments',	'droplowperc' => 'Drop N lowest grade percentage problems/folders',
'drophigh' => 'Drop N highest grade assignments',	'drophighperc' => 'Drop N highest grade percentage problems/folderss',
	'droplow' => 'Drop N lowest point problems/folders',
	'drophigh' => 'Drop N highest point problems/folders',
'capabove' => 'Cap percentage above N percent',	'capabove' => 'Cap percentage above N percent',
'capbelow' => 'Cap percentage below N percent');	'capbelow' => 'Cap percentage below N percent');
}	}
Line 844 sub set_category_rules {	Line 996 sub set_category_rules {
sub add_category_content {	sub add_category_content {
my ($id,$cangrade,$newcontent,%categories)=@_;	my ($id,$cangrade,$newcontent,%categories)=@_;
unless ($cangrade) { return %categories; }	unless ($cangrade) { return %categories; }
	&Apache::lonnet::logthis("In here $newcontent");
my %newcontent=($newcontent => 1);	my %newcontent=($newcontent => 1);
foreach my $current (split(/\,/,$categories{$id.'_content'})) {	foreach my $current (split(/\,/,$categories{$id.'_content'})) {
$newcontent{$current}=1;	$newcontent{$current}=1;

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

Removed from v.1.85
changed lines
	Added in v.1.97