--- loncom/interface/loncoursedata.pm	2006/04/28 21:51:35	1.162
+++ loncom/interface/loncoursedata.pm	2006/05/01 05:27:28	1.166
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.162 2006/04/28 21:51:35 albertel Exp $
+# $Id: loncoursedata.pm,v 1.166 2006/05/01 05:27:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -902,6 +902,15 @@ sub clear_internal_caches {
     undef(%students_by_id);
 }
 
+
+################################################
+################################################
+
+sub symb_is_for_task {
+    my ($symb) = @_;
+    return ($symb =~ /\.task$/);
+}
+
 ################################################
 ################################################
 
@@ -993,7 +1002,60 @@ sub update_full_student_data {
             next;
         } elsif ($parameter eq 'version') {
             next;
-        } elsif ($parameter =~ /^resource\.(.*)\.(tries|
+	} elsif (&symb_is_for_task($symb)) {
+	    next if ($parameter !~ /^resource\.(.*)\.(award|
+						      awarded|
+						      solved|
+						      submission|
+						      portfiles|
+						      status|
+						      version|
+						      regrader)\s*$/x);
+	    my ($version_and_part_id, $field) = ($1,$2);
+
+	    next if ($version_and_part_id !~ /\./ 
+		     && $field ne 'regrader' && $field ne 'version');
+
+	    my ($version, $part, $instance) = 
+		split(/\./,$version_and_part_id);
+
+	    #skip and instance dimension or criteria specific data
+	    next if (defined($instance) 
+		     && $instance ne $field
+		     && $instance ne 'bridgetask');
+	    
+	    if (!defined($part)) {
+		$part = $version;
+	    }
+	    my $resp_id = &get_part_id('0');
+	    my $part_id = &get_part_id($part);
+	    
+	    if ($field eq 'version') {
+		# for tasks each version is an attempt at it thus
+		#     version -> tries
+		$partdata->{$symb_id}{$part_id}{$transaction}{'tries'}=
+		    $value;
+		# at new version time the record gets reset thus adding a
+		# virtual response awarddetail of 'new_version'
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific'}='status';
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_value'}='new_version';
+
+	    } elsif ($field eq 'award' || $field eq 'awarded' 
+		     || $field eq 'solved') {
+		$partdata->{$symb_id}{$part_id}{$transaction}{$field}=
+		    $value;
+	    } elsif ($field eq 'portfiles') {
+		# tasks only accepts portfolio submissions
+		$value = $dbh->quote($value);
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'submission'}=$value;
+	    } elsif ($field eq 'status') {
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific'}=$field;
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_value'}=$value;
+	    } elsif ($field eq 'regrader') {
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_2'}=$field;
+		$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_value_2'}=$value;
+	    }
+	} elsif ($parameter =~ /^resource\.(.*)\.(tries|
                                                   award|
                                                   awarded|
                                                   previous|
@@ -1292,6 +1354,10 @@ sub store_student_data {
             my $award   = $param_hash->{'resource.'.$part.'.award'};
             my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};
             my $timestamp = $param_hash->{'timestamp'};
+	    my $tries   = $param_hash->{'resource.'.$part.'.tries'};
+	    if (&symb_is_for_task($current_symb)) {
+		$tries   = $param_hash->{'resource.'.$part.'.version'};
+	    }
             #
             $solved      = '' if (! defined($solved));
             $tries       = '' if (! defined($tries));
@@ -2808,9 +2874,90 @@ sub get_classlist {
     }
 }
 
+sub get_group_memberships {
+    my ($classlist,$cdom,$cnum) = @_;
+    my $cid = $cdom.'_'.$cnum;
+    if (!defined($cdom) || !defined($cnum)) {
+        $cid =  $env{'request.course.id'};
+        $cdom = $env{'course.'.$cid.'.domain'};
+        $cnum = $env{'course.'.$cid.'.num'};
+    }
+    my (%classgroups,%studentgroups);
+    my $now = time;
+    my $access_end = $env{'course.'.$cid.'.default_enrollment_end_date'};
+    my (%curr_groups,%groupmemberhash);
+    my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,
+                                                     $cnum);
+    if ($numgroups) {
+        %groupmemberhash = &Apache::lonnet::get_group_membership($cdom,$cnum);
+        foreach my $student (keys(%{$classlist})) {
+            %{$classgroups{$student}} = ();
+            my $hasgroup = 0;
+            foreach my $status ('previous','future','active','aftercourse') {
+                %{$classgroups{$student}{$status}} = ();
+            }
+            foreach my $group (keys(%curr_groups)) {
+                if (defined($groupmemberhash{$group.':'.$student})) {
+                    my ($end,$start) = split(/:/,$groupmemberhash{$group.':'.
+                                                                    $student});
+                    if ($start == -1) {
+                        next;
+                    } else {
+                        $studentgroups{$group} ++;
+                        $hasgroup = 1;
+                        if ($end && $end < $now) {
+                            $classgroups{$student}{'previous'}{$group} =
+                                         $groupmemberhash{$group.':'.$student};
+                            if ($classlist->{$student}[&CL_STATUS()] eq 'Expired') {
+                                if ($access_end && $access_end < $now) {
+                                    if ($access_end - $end < 86400) {
+                                        $classgroups{$student}{'aftercourse'}{$group} = $groupmemberhash{$group.':'.$student};
+                                    }
+                                }
+                            }
+                        } elsif ($now > $start) {
+                            if (!$end || $end > $now) {
+                                $classgroups{$student}{'active'}{$group} =
+                                         $groupmemberhash{$group.':'.$student};
+                            }
+                        } else {
+                            $classgroups{$student}{'future'}{$group} =
+                                         $groupmemberhash{$group.':'.$student};
+                        }
+                    }
+                }
+            }
+            if (!$hasgroup) {
+                $studentgroups{'none'} ++;
+            }
+        }
+    }
+    return (\%classgroups,\%studentgroups);
+}
+                                                                                   
+sub get_students_groups {
+    my ($student,$enrollment_status,$classgroups) = @_;
+    my @studentsgroups = ();
+    if (ref($$classgroups{$student}{'active'}) eq 'HASH') {
+        push(@studentsgroups,keys(%{$$classgroups{$student}{'active'}}));
+    }
+    if ($enrollment_status eq 'Any') {
+        foreach my $status ('previous','future') {
+            if (ref($$classgroups{$student}{$status}) eq 'HASH') {
+                push(@studentsgroups,keys(%{$$classgroups{$student}{$status}}));
+            }
+        }
+    } else {
+        if (ref($$classgroups{$student}{'aftercourse'}) eq 'HASH') {
+            push(@studentsgroups,keys(%{$$classgroups{$student}{'aftercourse'}}));
+        }
+    }
+    return @studentsgroups;
+}
+
+
 # ----- END HELPER FUNCTIONS --------------------------------------------
 
 1;
 __END__
 
-