Menu
▾
▴
openwebwork-cvs
|
From: Mike G. v. a. <we...@ma...> - 2005-06-10 16:02:06
|
Log Message:
-----------
Bring HEAD and rel-2-1-patches in line with each other.
Modified Files:
--------------
webwork2/htdocs/css:
ur.css
webwork2/lib/WeBWorK:
DB.pm
webwork2/lib/WeBWorK/ContentGenerator:
CourseAdmin.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
Scoring.pm
Stats.pm
Revision Data
-------------
Index: ur.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/htdocs/css/ur.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lhtdocs/css/ur.css -Lhtdocs/css/ur.css -u -r1.2 -r1.3
--- htdocs/css/ur.css
+++ htdocs/css/ur.css
@@ -135,6 +135,7 @@
padding: 2px 5px 2px 5px;
width: auto;
}
-div.problemHeader { float: left; }
+# div.problemHeader { float: left; } # suspected of causing MSIE peekabo=
o bug
+div.problemHeader {}
div.problem { clear: both; background-color: #E0E0E0; color: black; }
.parsehilight { background-color:yellow; }
Index: DB.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/DB.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -Llib/WeBWorK/DB.pm -Llib/WeBWorK/DB.pm -u -r1.62 -r1.63
--- lib/WeBWorK/DB.pm
+++ lib/WeBWorK/DB.pm
@@ -343,6 +343,7 @@
$self->{set_user}->{driver}->connect("ro")
or return 0, @results, "Failed to connect to set_user database.";
=09
+
# get PSVNs for global user (=EFN)
# this reads from "login<>global_user"
my @globalUserPSVNs =3D $self->{set_user}->getPSVNsForUser($globalUser=
ID);
@@ -358,6 +359,7 @@
#warn "got setID '$setID'\n";
}
=09
+
# get PSVNs for each setID (=EFN*M)
# this reads from "set<>$_"
my @okPSVNs =3D map { $self->{set_user}->getPSVNsForSet($_) } @globalU=
serSetIDs;
Index: CourseAdmin.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Cours=
eAdmin.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -Llib/WeBWorK/ContentG=
enerator/CourseAdmin.pm -u -r1.34 -r1.35
--- lib/WeBWorK/ContentGenerator/CourseAdmin.pm
+++ lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -58,6 +58,10 @@
return;
}
=09
+ # get result and send to message
+ my $status_message =3D $r->param("status_message");
+ $self->addmessage(CGI::p("$status_message")) if $status_message;
+
## if the user is asking for the downloaded database...
#if (defined $r->param("download_exported_database")) {
# my $courseID =3D $r->param("export_courseID");
@@ -688,7 +692,7 @@
if ($add_admin_users ne "") {
foreach my $userID ($db->listUsers) {
if ($userID eq $add_initial_userID) {
- warn "User '$userID' will not be copied from admin course as it is t=
he initial instructor.";
+ $self->addbadmessage( "User '$userID' will not be copied from admin =
course as it is the initial instructor.");
next;
}
my $User =3D $db->getUser($userID);
Index: Stats.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instr=
uctor/Stats.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -Llib/WeBWorK/ContentGenerator/Instructor/Stats.pm -Llib/WeBWorK/Con=
tentGenerator/Instructor/Stats.pm -u -r1.52 -r1.53
--- lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
@@ -363,6 +363,7 @@
=20
foreach my $problemRecord (@problemRecords) {
next unless ref($problemRecord);
+
# warn "Can't find record for problem $prob in set $setName for $stu=
dent";
# FIXME check the legitimate reasons why a student record might not =
be defined
####################################################################
@@ -476,9 +477,11 @@
foreach my $probID (@problemIDs) {
$attempts_percentiles_for_problem{$probID} =3D {
determine_percentiles([@brackets2], @{$attempts_list_for_problem{$=
probID}})
+
};=20
$problemPage{$probID} =3D $urlpath->newFromModule("WeBWorK::Content=
Generator::Problem",
courseID =3D> $courseName, setID =3D> $setName, problemID =3D> $probI=
D);
+
}
=20
########################################################################=
#############
Index: Scoring.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instr=
uctor/Scoring.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -Llib/WeBWorK/C=
ontentGenerator/Instructor/Scoring.pm -u -r1.43 -r1.44
--- lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
@@ -71,6 +71,7 @@
||
lc($Users{$a}->user_id) cmp lc($Users{$b}->user_id)
}
+
keys %Users;
#my @userInfo =3D (\%Users, \@sortedUserIDs);
$WeBWorK::timer->continue("done pre-fetching users") if defined($WeBWo=
rK::timer);
@@ -465,13 +466,16 @@
$scoringData[6][$totalsColumn+1] =3D "index" ;
}
for (my $user =3D 0; $user < @sortedUserIDs; $user++) {
+
$scoringData[7+$user][$totalsColumn] =3D sprintf("%.1f",$userStatusTo=
tals{$user});
$scoringData[7+$user][$totalsColumn+1] =3D sprintf("%.0f",100*$userSu=
ccessIndex{$user}) if $scoringItems->{successIndex};
+
}
}
$WeBWorK::timer->continue("End set $setID") if defined($WeBWorK::timer=
);
return @scoringData;
}
+
sub sumScores { # Create a totals column for each student
my $self =3D shift;
my $r_totals =3D shift;
@@ -703,6 +707,7 @@
my ($self, $string, $padTo) =3D @_;
$string =3D '' unless defined $string;
my $spaces =3D $padTo - length $string;
+
# return " "x$spaces.$string;
return $string." "x$spaces;
}
|
|
From: Mike G. v. a. <we...@ma...> - 2005-06-10 16:03:40
|
Log Message:
-----------
Bring HEAD and rel-2-1-patches in line with each other.
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2/clients:
webwork_xmlrpc_client.pl
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
Scoring.pm
Revision Data
-------------
Index: webwork_xmlrpc_client.pl
===================================================================
RCS file: /webwork/cvs/system/webwork2/clients/webwork_xmlrpc_client.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lclients/webwork_xmlrpc_client.pl -Lclients/webwork_xmlrpc_client.pl -u -r1.1.2.1 -r1.1.2.2
--- clients/webwork_xmlrpc_client.pl
+++ clients/webwork_xmlrpc_client.pl
@@ -36,9 +36,9 @@
} else {
- print STDERR "Useage: .xmlrpc_client4.pl command file_name\n";
- print STDERR "For example: .xmlrpc_client4.pl renderProblem input.txt\n";
- print STDERR "For example: .xmlrpc_client4.pl listLibraries \n";
+ print STDERR "Useage: ./webwork_xmlrpc_client.pl command [file_name]\n";
+ print STDERR "For example: ./webwork_xmlrpc_client.pl renderProblem input.txt\n";
+ print STDERR "For example: ./webwork_xmlrpc_client.pl listLibraries \n";
print STDERR "Commands are: ", join(" ", @COMMANDS), "\n";
}
Index: Scoring.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -u -r1.36.2.4 -r1.36.2.5
--- lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
@@ -520,6 +520,7 @@
return @scoringData;
}
+}
# Often it's more efficient to just get everything out of the database
# and then pick out what you want later. Hence, these "everything2*" functions
sub everything2info {
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X