@@ -1634,6 +1634,66 @@ sub quit { if (ref Browser::main_window()) {Browser::main_window()->destroy} } +=head4 edit_custom() + +Edit a custom property for the whole class. Takes no arguments. + +=cut + +sub edit_custom { + my $self = shift; + local $Words::words_prefix = "b.edit_custom"; + + my $data = $self->{DATA}; + my $gb = $data->{GB}; + + my ($pa,$ph) = $gb->list_defined_student_properties({'last'=>1,'first'=>1,'dropped'=>1}); + # Don't do first and last, which would require complicated special-casing. + # Don't do dropped, which is boolean, not string. + # Allow id, plus any other custom ones they've defined. + my @p = @$pa; + my @roster = $gb->student_keys(); + my %old = (); + my $p; + + my $callback2 = sub { + my $new = shift; + my $did_something = 0; + foreach my $who(@roster) { + if ($new->{$who} ne $old{$who}) { + $gb->set_student_property($who,$p,$new->{$who}); + #print "set $who,$p,$new->{$who}\n"; + $did_something = 1; + } + } + if ($did_something) { + $self->is_modified(1); + $self->{STAGE}->{ROSTER}->refresh(); + }; + }; + + my $callback = sub { + my $h = shift; + local $Words::words_prefix = "b.edit_custom"; + $p = $h->{'property'}; # property to edit + my @inputs2 = (); + foreach my $who(@roster) { + my ($first,$last) = $gb->name($who); + $old{$who} = $gb->get_student_property($who,$p); + push @inputs2,Input->new(KEY=>$who,PROMPT=>"$last, $first",TYPE=>'string',DEFAULT=>$old{$who}); + } + ExtraGUI::fill_in_form(INPUTS=>\@inputs2,TITLE=>(sprintf(w('edit_properties'),$p)),CALLBACK=>$callback2,COLUMNS=>2); + }; + + my $m = {}; + foreach my $p(@p) {$m->{$p}=$p} + my @inputs = ( + Input->new(KEY=>'property',WIDGET_TYPE=>'menu',ITEM_KEYS=>$pa,ITEM_MAP=>$m,DEFAULT=>'id'), + ); + + ExtraGUI::fill_in_form(INPUTS=>\@inputs,TITLE=>w('property_to_edit'),CALLBACK=>$callback,COLUMNS=>1); +} + =head4 edit_student() Takes no arguments. @@ -1655,21 +1715,44 @@ sub edit_student { # ...See comments on the similar test in add_or_drop(). my ($first,$last) = $gb->name($student); - my %old = ( - 'last'=>$last, - 'first'=>$first, - 'id'=>$gb->get_student_property($student,'id'), - ); + my %old = ('last'=>$last,'first'=>$first); + + my ($pa,$ph) = $gb->list_defined_student_properties(); # all the standard ones, plus any special ones that have ever been defined for any student + my @p = @$pa; + + my @inputs = (); + my $n = 1; + foreach my $p(@p) { # typically goes last, first, id + my $name = ucfirst($p); + if ($n++<=3) {$name = w($p)} + $old{$p} = $gb->get_student_property($student,$p) if $p ne 'last' && $p ne 'first'; + push @inputs,Input->new(KEY=>$p,PROMPT=>$name,TYPE=>'string',DEFAULT=>$old{$p}); + } + push @inputs,Input->new(KEY=>'_define_new',PROMPT=>w('define_new'),TYPE=>'string'); + push @inputs,Input->new(KEY=>'_new_value', PROMPT=>w('new_value'),TYPE=>'string'); my $callback = sub { my $new = shift; my $did_something = 0; - foreach my $what(keys %old) { - if (!(exists $old{$what} && $old{$what} eq $new->{$what})) { - $gb->set_student_property($student,$what,$new->{$what}); - $did_something = 1; + my %create = (); + foreach my $what(keys %$new) { + if ($what eq '_define_new' || $what eq '_new_value') { + $create{$what} = $new->{$what}; + } + else { + if (!($old{$what} eq $new->{$what})) { + $gb->set_student_property($student,$what,$new->{$what}); + $did_something = 1; + } } } + if (exists $create{'_new_value'} && ! exists $create{'_define_new'}) { + ExtraGUI::error_message(w('null_property')); + } + if (exists $create{'_define_new'}) { + $gb->set_student_property($student,$create{'_define_new'},$create{'_new_value'}); + $did_something = 1; + } if ($did_something) { $self->is_modified(1); $roster->refresh(); @@ -1680,11 +1763,7 @@ sub edit_student { TITLE=>(sprintf w("title"),$name), CALLBACK=>$callback, COLUMNS=>2, - INPUTS=>[ - Input->new(KEY=>"last",PROMPT=>w("last"),TYPE=>'string',DEFAULT=>$old{'last'}), - Input->new(KEY=>"first",PROMPT=>w("first"),TYPE=>'string',DEFAULT=>$old{'first'}), - Input->new(KEY=>"id",PROMPT=>w("id"),TYPE=>'string',DEFAULT=>$old{'id'}), - ] + INPUTS=>\@inputs, ); } @@ -2295,6 +2374,7 @@ sub menu_bar { &$add_item("STUDENTS_MENUB",\@items,'reinstate','',sub{$self->add_or_drop('reinstate')}); &$add_item("STUDENTS_MENUB",\@items,'edit',w('edit_disabled'),sub{$self->edit_student()}); &$add_item("STUDENTS_MENUB",\@items,'drop',(sprintf w('drop'),''),sub{$self->add_or_drop('drop')}); + &$add_item("STUDENTS_MENUB",\@items,'edit_custom','',sub{$self->edit_custom()}); $self->{STUDENTS_MENUB} = $bar->Menubutton(-text=>w("students"),-menuitems=>\@items,-tearoff=>0)->pack(-side=>'left'); BrowserWindow.pm @@ -569,6 +569,7 @@ sub fill_in_form { my $ncols = $args{COLUMNS}; my $t; + # ?????????? does the same for ncols==1 versus ncols==2???? bug??? if ($ncols==2) { $t = $box->Scrolled("Text", -scrollbars=>'oe', ExtraGUI.pm @@ -1648,6 +1648,47 @@ sub get_student_property { return get_property($self->roster_private_method()->{$who},$prop); } +=head3 list_defined_student_properties() + +Returns ($a,$h), where $a is a ref to an array containing +all the student properties that have been defined so far, +and $h is a hash whose keys are the elements of $a. As soon as a property has been defined for one student, +it's considered to be defined in general. +The optional argument is a hash ref whose keys are properties that should be not be returned; +if defaults to {"dropped"=>1}. +The order of @$a is guaranteed to be "last","first","id", and "dropped," +followed by any others, in alphabetical order. +The second optional argument, is passed to student_keys. + +=cut + +sub list_defined_student_properties { + my $self = shift; + my $ignored = {"dropped"=>1}; + if (@_) {$ignored = shift} + my $criteria = ''; # defined in student_keys() + if (@_) {$criteria = shift} + my @standard = ('last','first','id','dropped'); + my %found = (); + my @result; + foreach my $standard(@standard) { + $found{$standard} = 1; + push @result,$standard unless exists $ignored->{$standard}; + } + my @students = $self->student_keys($criteria); + my $r = $self->roster_private_method(); + foreach my $who(@students) { + my %k = comma_delimited_to_hash($r->{$who}); + foreach my $k(keys %k) { + push @result,$k unless exists $ignored->{$k} || exists $found{$k}; + $found{$k} = 1; + } + } + my %h = {}; + foreach my $x(@result) {$h{$x}=1} + return (\@result,\%h); +} + =head3 get_property() Avoid using this routine, and use get_property2() instead. GradeBook.pm @@ -105,11 +105,16 @@ STRING "en.b.dialog.cancel" => "Cancel", "en.b.dialog.confirm" => "Confirm", "en.b.dialog.confirm_overwrite" => "The file %s already exists. Overwrite it?", +"en.b.edit_custom.property_to_edit" => "Property to Edit", +"en.b.edit_custom.edit_properties" => "Editing %s", "en.b.edit_student.title" => "Edit Information for %s", "en.b.edit_student.id" => "Student ID", "en.b.edit_student.pwd" => "Password", "en.b.edit_student.first" => "First Name", "en.b.edit_student.last" => "Last Name", +"en.b.edit_student.define_new" => "New Student Property to Define", +"en.b.edit_student.new_value" => "Value of Newly Defined Property for This Student", +"en.b.edit_student.null_property" => "You must define a name for the new student property you're defining.", "en.b.delete_assignment.confirm" => "Delete %s?", "en.b.edit_assignment.title" => "Edit Information for %s", "en.b.edit_assignment.due" => "Due Date", @@ -158,6 +163,7 @@ STRING "en.b.menus.reinstate" =>"Reinstate", "en.b.menus.drop" =>"Drop %s", "en.b.menus.edit" =>"Edit Information for %s", +"en.b.menus.edit_custom" =>"Edit Property for Whole Class", "en.b.menus.edit_disabled" =>"Edit Information", "en.b.menus.assignments" =>"Assignments", "en.b.menus.new_assignment_blank" =>"New Assignment", MyWords.pm get_dependencies_from_cpan.pl lmmath.sty manpage.pod 9a284342fc96f1ca8b533519a8c48fdc2f40d70c Ben Crowell githubcrowell09@lightandmatter.com http://github.com/bcrowell/opengrade/commit/ae3574dc790beb33445c3e17ed2e048fd3d248d1 ae3574dc790beb33445c3e17ed2e048fd3d248d1 2009-08-01T18:51:50-07:00 2009-08-01T18:51:50-07:00 custom student properties eb21eba51e01680276356f04e1dd11627de3e39b Ben Crowell githubcrowell09@lightandmatter.com