[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm response.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 21 Oct 2004 06:33:37 -0000


albertel		Thu Oct 21 02:33:37 2004 EDT

  Modified files:              
    /loncom/homework	response.pm optionresponse.pm 
  Log:
  - Bug#1 <or> handles survey mode
  
  
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.107 loncom/homework/response.pm:1.108
--- loncom/homework/response.pm:1.107	Wed Oct 20 23:19:04 2004
+++ loncom/homework/response.pm	Thu Oct 21 02:33:37 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.107 2004/10/21 03:19:04 albertel Exp $
+# $Id: response.pm,v 1.108 2004/10/21 06:33:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -508,6 +508,7 @@
 	    return 1;
 	}
     }
+    if ($Apache::lonhomework::type eq 'survey') { return 1; }
     return 0;
 }
 
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.120 loncom/homework/optionresponse.pm:1.121
--- loncom/homework/optionresponse.pm:1.120	Wed Sep 29 01:47:33 2004
+++ loncom/homework/optionresponse.pm	Thu Oct 21 02:33:37 2004
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.120 2004/09/29 05:47:33 albertel Exp $
+# $Id: optionresponse.pm,v 1.121 2004/10/21 06:33:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -220,7 +220,16 @@
 	    $responsestr;
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
 	
-	if (!$Apache::lonhomework::scantronmode) {
+	if ($Apache::lonhomework::type eq 'survey') {
+	    if ($ignored == 0) {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    } elsif ($wrong==0 && $right==0) {
+	    } else {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    }
+	} elsif (!$Apache::lonhomework::scantronmode) {
 	    my $ad;
 	    if ($wrong==0 && $ignored==0) {
 		$ad='EXACT_ANS';