[BACK]Return to lonquickgrades.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonquickgrades.pm between versions 1.69 and 1.70

version 1.69, 2011/02/20 22:48:26 version 1.70, 2011/02/20 23:38:00
Line 462  sub process_category_edits { Line 462  sub process_category_edits {
 # Simply store the rest of the stuff  # Simply store the rest of the stuff
         foreach my $id (split(/\,/,$categories{'order'})) {          foreach my $id (split(/\,/,$categories{'order'})) {
             %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);              %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);
               %categories=&set_category_weight($cangrade,$id,$env{'form.weighttype_'.$id},$env{'form.weight_'.$id},%categories);
 # More changes here  # More changes here
         }          }
     }      }
Line 554  ENDMOVE Line 555  ENDMOVE
     } else {      } else {
         $r->print('<td>'.$categories{$id.'_name'}.'</td>');          $r->print('<td>'.$categories{$id.'_name'}.'</td>');
     }      }
     $r->print(&Apache::loncommon::end_data_table_row()."\n");  # Content
   # FIXME: just placeholders
       if ($cangrade) {
          $r->print("<td>Content Edit</td>");
       } else {
          $r->print("<td>Content</td>");
       }
   # Calculation
   # FIXME: just placeholders
       if ($cangrade) {
          $r->print("<td>Calculation Edit</td>");
       } else {
          $r->print("<td>Calculation</td>");
       }
   # Weight
       if ($cangrade) {
          $r->print('<td>'.
                     '<select name="weighttype_'.$id.'">'.
                     '<option value="default"'.($categories{$id.'_weighttype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.
                     '<option value="typein"'.($categories{$id.'_weighttype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.
                     '</select>'.
                     '<input type="text" size="4" name="weight_'.$id.
                     '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>');
       } else {
           $r->print('<td>'.($categories{$id.'_weighttype'} eq 'default'?&mt('default'):$categories{$id.'_weight'}).'</td>');
       }
   
     return ($value,$weight);      return ($value,$weight);
 }  }
   
Line 590  sub make_new_category { Line 617  sub make_new_category {
     if (defined($ordernum)) {      if (defined($ordernum)) {
         %categories=&move_category($id,$cangrade,$ordernum,%categories);          %categories=&move_category($id,$cangrade,$ordernum,%categories);
     }      }
       $categories{$id.'_weighttype'}='default';
     return %categories;      return %categories;
 }  }
   
Line 668  sub set_category_name { Line 696  sub set_category_name {
 }  }
   
 #  #
   # Set weight of a category
   #
   sub set_category_weight {
       my ($cangrade,$id,$weighttype,$weight,%categories)=@_;
       unless ($cangrade) { return %categories; }
       if (($categories{$id.'_weight'} eq '') && ($weight=~/\d/)) {
           $weighttype='typein';
       }
       $categories{$id.'_weighttype'}=$weighttype;
       if ($weighttype eq 'default') {
           $categories{$id.'_weight'}='';
       } else {
           $weight=~s/\D//gs;
           unless ($weight) { $weight=0; }
           $categories{$id.'_weight'}=$weight;
       }
       return %categories;
   }
   
   
   #
 # === end category-related  # === end category-related
 #  #
 #  #
Removed from v.1.69  
changed lines
  Added in v.1.70

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