--- capa/capa51/GUITools/capastats.tcl	1999/10/28 16:32:07	1.4
+++ capa/capa51/GUITools/capastats.tcl	2000/01/10 22:40:30	1.9
@@ -41,6 +41,7 @@ proc runCapaTools { classDirConfigFile }
 #    $utilsMenu add command -label "Email" -command ""
 #    $utilsMenu add command -label "View Score File" -command ""
     $utilsMenu add command -label "View Submissions" -command "CTsubmissions $num"
+    $utilsMenu add command -label "Create a Class Report" -command "CTcreateReport $num"
     $utilsMenu add command -label "Analyze Class Report" -command "CTanalyzeReport $num"
     $utilsMenu add command -label "Analyze Responses" -command "CTanalyzeScorer $num"
     $utilsMenu add command -label "Graph a Responses Analysis" -command "CTgraphAnalyzeScorer $num"
@@ -87,7 +88,9 @@ proc CTchangePath { num } {
 ###########################################################
 proc CTcapaStat2 { num } {
     global gFile gCT gUniqueNumber
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+   # if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+    if {[set setId [pickSets [CTsetList $gFile($num)] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } { return }
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) capastat
     if { [
@@ -127,7 +130,9 @@ proc CTcapaStat2 { num } {
 ###########################################################
 proc CTcapaStat { num } {
     global gFile gCT gUniqueNumber
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+#    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+    if {[set setId [pickSets [CTsetList $gFile($num)] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } { return }
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) capastat
     if { [
@@ -161,8 +166,9 @@ proc CTcapaStat { num } {
 ###########################################################
 proc CTlogAnalysis { num } {
     global gFile gUniqueNumber gCT
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
-    
+    #if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+    if {[set setId [pickSets [CTsetList $gFile($num)] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } { return }
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) loganalysis
     CTdatestamp $cmdnum
@@ -300,13 +306,14 @@ proc CTitemAnalysisStart { num } {
     	unset gCT(cmd.$cmdnum)
 	return
     }
-    if { [set sets [getSetRange $gCT($num) $gFile($num)]] == "" } { 
+#    if { [set sets [getSetRange $gCT($num) [lindex $select 1]]] == "" } \{
+    if { [set sets [pickSets [CTsetList [lindex $select 1]] \
+			"extended" "Select Sets" $gCT($num)]] == "Cancel" } {
 	unset gCT(cmd.$cmdnum)
 	return 
     }
     CTdatestamp $cmdnum
-    if { [ catch {CTitemAnalysisRange $cmdnum [lindex $select 1] \
-		      [lindex $sets 0] [lindex $sets 1] } errors ] } { 
+    if { [ catch {CTitemAnalysisRange $cmdnum [lindex $select 1] $sets } errors ] } { 
 	displayError $errors 
     }
     unset gCT(cmd.$cmdnum)
@@ -334,11 +341,13 @@ proc CTitemCorrelationStart { num } {
     foreach path [lsort [array names gCapaConfig "$num.*_path"]] {
 	lappend paths [list [lindex [split $path "."] 1] $gCapaConfig($path) ] 
     }
-    if { [set select [multipleChoice $gCT($num) "Select a class path" $paths ] ] == "" } {
+    if {[set select [multipleChoice $gCT($num) "Select a class path" $paths]] == ""} {
     	unset gCT(cmd.$cmdnum)
 	return
     }
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { 
+    #if { [set setId [getOneSet $gCT($num) [lindex $select 1]]] == "" } \{ 
+    if {[set setId [pickSets [CTsetList [lindex $select 1]] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } {
 	unset gCT(cmd.$cmdnum)
 	return 
     }
@@ -362,12 +371,26 @@ proc CTsubmissions { num } {
 
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) submissions
-    if { "" == [set setlist [getSetRange $gCT($num) $gFile($num)]] } { return }
+    if { [set sets [pickSets [CTsetList $gFile($num)] \
+			"extended" "Select Sets" $gCT($num)]] == "Cancel" } { return }
+#    if { "" == [set setlist [getSetRange $gCT($num) $gFile($num)]] } { return }
     CTdatestamp $cmdnum
     CTputs $cmdnum "Submissions for: $s_id, $s_name\n"
     displayStatus "Getting submissions" spinner $cmdnum
-    CTsubmissionsLaunch $num $cmdnum telnet $s_id $s_name \
-	[lindex $setlist 0] [lindex $setlist 1]
+    CTsubmissionsLaunch $num $cmdnum telnet $s_id $s_name 0 $sets
+}
+
+###########################################################
+# CTcreateReport
+###########################################################
+###########################################################
+###########################################################
+proc CTcreateReport { num } {
+    global gUniqueNumber gCT gFile
+
+    set cmdnum [incr gUniqueNumber]
+    set gCT(cmd.$cmdnum) createreport
+    CTcreateReportDialog $num $cmdnum
 }
 
 ###########################################################
@@ -1322,8 +1345,8 @@ proc CTrunCommand { num cmdnum fileId {f
 ###########################################################
 ###########################################################
 ###########################################################
-proc CTitemAnalysisRange { num classpath setIdStart setIdEnd } {
-    for { set i $setIdStart } { $i <= $setIdEnd } { incr i } { 
+proc CTitemAnalysisRange { num classpath sets } {
+    foreach i $sets {
 	if { [ catch { CTitemAnalysis $num $classpath $i } errors ] } { 
 	    displayError $errors 
 	}
@@ -1393,23 +1416,25 @@ proc CTitemAnalysis { num classpath setI
 		incr valid_cnt
 		set score 0
 		for { set ii 0 } { $ii < [llength $ans_char] } { incr ii } {
-		    
+		    #Can't use incr because the numbers might be doubles
 		    if { [lindex $ans_char $ii] == "Y" || \
 			     [lindex $ans_char $ii] == "y" } {
-			incr score [lindex $weights $ii]
-			set  Y_cnt($ii) [expr $Y_cnt($ii) + 1]
-			set  Y_total    [expr $Y_total + 1]
+			catch {incr score [lindex $weights $ii]}
+			set Y_cnt($ii) [expr {$Y_cnt($ii) + 1}]
+			set Y_total [expr {$Y_total + 1}]
 		    }
 		    if { [lindex $ans_char $ii] == "N" || \
 			     [lindex $ans_char $ii] == "n" } {
-			set  N_cnt($ii) [expr $N_cnt($ii) + 1]
-			set  N_total    [expr $N_total + 1]
+			set N_cnt($ii) [expr {$N_cnt($ii) + 1}]
+			set N_total  [expr {$N_total + 1}]
 		    }
 		    if { [lindex $ans_char $ii] >= 0 && \
 			     [lindex $ans_char $ii] <= 9 } {
 			incr score [lindex $ans_char $ii]
-			set yes_part [expr [lindex $ans_char $ii] / \
-					  double([lindex $weights $ii]) ]
+			if {[catch {set yes_part [expr [lindex $ans_char $ii] / \
+						      double([lindex $weights $ii])]}]} {
+			    set yes_part 1
+			}
 			set no_part [expr 1.0 - $yes_part]
 			set Y_cnt($ii) [expr $Y_cnt($ii) + $yes_part]
 			set Y_total    [expr $Y_total + $yes_part]
@@ -1622,27 +1647,28 @@ proc CTitemCorrelation { num classpath s
 ###########################################################
 ###########################################################
 ###########################################################
-proc CTsubmissionsLaunch { num cmdnum type s_id s_nm start end } {
+proc CTsubmissionsLaunch { num cmdnum type s_id s_nm index setlist } {
     global gCT gFile gUniqueNumber gCapaConfig
 
-    CTputs $cmdnum "$type submissions for $s_nm for set $start\n"
+    set curset [lindex $setlist $index]
+    CTputs $cmdnum "$type submissions for $s_nm for set $curset\n"
     if { $type == "telnet" } {
-	set command "grep -i $s_id [file join $gFile($num) records submissions$start.db]"
+	set command "grep -i $s_id [file join $gFile($num) records submissions$curset.db]"
 	set followtype web
     } else {
 	set command "grep -i $s_id [file join $gFile($num) \
-                       records websubmissions$start.db]"
+                       records websubmissions$curset.db]"
 	set followtype telnet
-	incr start
+	incr index
     }
     set done 0
     set followcmd ""
-    while { !$done && ($start <= ($end+1)) } {
-	if { $start <= $end } {
+    while { !$done && ($index <= [llength $setlist]) } {
+	if { [lindex $setlist $index] != "" } {
 	    set followcmd "CTsubmissionsLaunch $num $cmdnum $followtype $s_id {$s_nm} \
-                            $start $end"
+                            $index \"$setlist\""
 	}
-	if { ! [catch {set fileId [open "|$command" "r"]} ] } { set done 1 }
+	if { ![catch {set fileId [open "|$command" "r"]} error ] } { set done 1 } 
     }
     fconfigure $fileId -blocking 0
     fileevent $fileId readable "CTrunCommand $num $cmdnum $fileId {$followcmd}"
@@ -1939,7 +1965,7 @@ proc CToutput { num cmdnum } {
 	pack $buttonFrame.wrap $buttonFrame.save $buttonFrame.print \
 	    $buttonFrame.dismiss -side left
     }
-    set index [$gCT($num.output) index end]
+    set index [$gCT($num.output) index end-1c]
     foreach line $gCT(output.$cmdnum) {
 	eval $gCT($num.output) insert end $line
     }
@@ -2209,11 +2235,11 @@ proc CTdrawBargraph { num } {
 	if { [set color [lindex $datum 3]] == "" } {set color $gBarGraph($num.color)}
 	if { $gBarGraph($num.bucketscores) && ($i % $howoften == $when) } {
 	    if { $i == $when } {
-		puts "$value-$which-$howoften"
+#		puts "$value-$which-$howoften"
 		$canvas create rectangle $textwidth \
 		    $y1 $x2 $y2 -fill $color -tag $tag
 	    } else {
-		puts "$value:$which:$howoften"
+#		puts "$value:$which:$howoften"
 		$canvas create rectangle [expr {$eachwidth*($i-$howoften+1)+$textwidth}]\
 		    $y1 $x2 $y2 -fill $color -tag $tag
 	    }
@@ -2729,4 +2755,200 @@ proc CTputsDiscussResults { num resultsV
 	}
     }
     CTputs $num "Overall Unique #viewers: $result($num.viewers)\n"
+}
+
+###########################################################
+# CTcreateReportDialog
+###########################################################
+###########################################################
+###########################################################
+proc CTcreateReportDialog { num cmdnum } {
+    global gCT gFile
+
+    
+    set gCT(summary.section.$cmdnum) 1
+    set gCT(summary.set.$cmdnum) 1
+
+    set summary [toplevel $gCT($num).summary]
+    set whoFrame [frame $summary.whoFrame -borderwidth 4 -relief groove]
+    set whichFrame [frame $summary.whichFrame -borderwidth 4 -relief groove]
+    set sortFrame [frame $summary.sortFrame]
+    set file2Frame [frame $summary.file2Frame]
+    set buttonFrame [frame $summary.buttonFrame]
+    pack $whoFrame $whichFrame $sortFrame $file2Frame $buttonFrame -side top
+    pack configure $whoFrame $whichFrame -padx 10 -pady 10
+
+    set sectionFrame [frame $whoFrame.section]
+    set allFrame [frame $whoFrame.all]
+    pack $sectionFrame $allFrame -side top
+
+    set gCT(summary.who.$cmdnum) section
+
+    radiobutton $sectionFrame.section -text \
+	    "For students in default section:" -variable gCT(summary.who.$cmdnum) \
+	    -value section 
+    entry $sectionFrame.entry -textvariable gCT(summary.section.$cmdnum) -width 3 
+    pack $sectionFrame.section $sectionFrame.entry -side left
+
+    radiobutton $allFrame.all -text "For all students in the class" \
+	    -variable gCT(summary.who.$cmdnum) -value all 
+    pack $allFrame.all
+
+    set sectionFrame [frame $whichFrame.section]
+    set allFrame [frame $whichFrame.all]
+    pack $sectionFrame $allFrame -side top
+
+    set gCT(summary.which.$cmdnum) specific
+
+    radiobutton $sectionFrame.section -text "For set:" \
+	    -variable gCT(summary.which.$cmdnum) -value specific 
+    entry $sectionFrame.entry -textvariable gCT(summary.set.$cmdnum) -width 3 
+    pack $sectionFrame.section $sectionFrame.entry -side left
+
+    radiobutton $allFrame.all -text "For all sets up to:" -variable \
+	    gCT(summary.which.$cmdnum) -value upto 
+    entry $allFrame.entry -textvariable gCT(summary.set.$cmdnum) -width 3 
+    pack $allFrame.all $allFrame.entry -side left
+
+    set firstFrame [frame $sortFrame.firstFrame -borderwidth 4 -relief groove]
+    set secondFrame [frame $sortFrame.secondFrame -borderwidth 4 \
+	    -relief groove]
+    pack $firstFrame $secondFrame -side left
+
+    set gCT(summary.first.$cmdnum) name
+
+    label $firstFrame.label -text "Sorting Order - Primary"
+    radiobutton $firstFrame.name -text "Student Name" -variable \
+	    gCT(summary.first.$cmdnum) -value name
+    radiobutton $firstFrame.number -text "Student Number" -variable \
+	    gCT(summary.first.$cmdnum) -value number
+    radiobutton $firstFrame.section -text "Section" -variable \
+	    gCT(summary.first.$cmdnum) -value section
+    radiobutton $firstFrame.grade -text "Grade" -variable gCT(summary.first.$cmdnum) \
+	    -value grade
+    pack $firstFrame.label $firstFrame.name $firstFrame.number \
+	    $firstFrame.section $firstFrame.grade -side top -anchor w
+
+    set gCT(summary.second.$cmdnum) number
+
+    label $secondFrame.label -text "Sorting Order - Secondary"
+    radiobutton $secondFrame.name -text "Student Name" -variable \
+	    gCT(summary.second.$cmdnum) -value name
+    radiobutton $secondFrame.number -text "Student Number" -variable \
+	    gCT(summary.second.$cmdnum) -value number
+    radiobutton $secondFrame.section -text "Section" -variable \
+	    gCT(summary.second.$cmdnum) -value section
+    radiobutton $secondFrame.grade -text "Grade" -variable gCT(summary.second.$cmdnum) \
+	    -value grade
+    pack $secondFrame.label $secondFrame.name $secondFrame.number \
+	    $secondFrame.section $secondFrame.grade -side top -anchor w
+
+    set defaultFrame [frame $file2Frame.defaultFrame]
+    set fileFrame [frame $file2Frame.fileFrame]
+    pack $defaultFrame $fileFrame -side top
+
+    set gCT(summary.filename.$cmdnum) default 
+
+    radiobutton $defaultFrame.default -text "Grader Chooses File Name" \
+	-variable gCT(summary.filename.$cmdnum) -value default
+    pack $defaultFrame.default
+
+    radiobutton $fileFrame.label -text "Specified Output File:" \
+	-variable gCT(summary.filename.$cmdnum) -value specified
+    set entryFrame [frame $fileFrame.entryFrame]
+    button $fileFrame.select -text "Select File" \
+	    -command "CTselectOutputFile $cmdnum"
+    pack $fileFrame.label $entryFrame $fileFrame.select -side left
+    entry $entryFrame.entry -textvariable gCT(summary.file.$cmdnum) \
+	-xscrollcommand "$entryFrame.scroll set"
+    scrollbar $entryFrame.scroll -orient h -command \
+	    "$entryFrame.entry xview"
+    pack $entryFrame.entry $entryFrame.scroll
+    pack configure $entryFrame.scroll -fill x
+
+    button $buttonFrame.create -text "Create" -command \
+	    "removeWindowEntry Summary
+             destroy $summary
+             CTcreateSummaryReport $num $cmdnum"
+    button $buttonFrame.cancel -text "Cancel" -command \
+	    "removeWindowEntry Summary
+             destroy $summary"
+    pack $buttonFrame.create $buttonFrame.cancel -side left
+
+    Centre_Dialog $summary default
+}
+
+###########################################################
+# CTselectOutputFile
+###########################################################
+###########################################################
+###########################################################
+proc CTselectOutputFile { num } {
+    global gCT
+    set gCT(summary.filename.$num) specified
+    if { "" != [ set temp [tk_getSaveFile] ] } {set gCT(summary.file.$num) $temp}
+}    
+
+###########################################################
+# CTcreateSummaryReport
+###########################################################
+###########################################################
+###########################################################
+proc CTcreateSummaryReport { num cmdnum } {
+    global gCT gFile
+
+    displayStatus "Opening File" both $cmdnum
+
+    switch $gCT(summary.who.$cmdnum) {
+	all {
+	    set file ClassSet$gCT(summary.set.$cmdnum).rpt
+	}
+	section	{
+	    set file Sec$gCT(summary.section.$cmdnum)Set$gCT(summary.set.$cmdnum).rpt 
+	}
+	default	{
+	    displayError "An error has occured while creating a summary \
+		    report $gCT(summary.section.$cmdnum)"
+	    return
+	}
+    }
+
+    if { $gCT(summary.filename.$cmdnum) == "specified" } { 
+	set file $gCT(summary.file.$cmdnum)
+    }
+    if { $file == "" } { 
+	removeStatus
+	displayError "Must specify a valid filename"
+	return
+    }
+    updateStatusMessage "Creating Summary" $cmdnum
+
+    set cwd [pwd]
+    cd $gFile($num)
+    set error [ catch {CTcreateSummary $file $cmdnum} ]
+    cd $cwd
+
+    removeStatus $cmdnum
+
+    if {!$error && "Yes" == [makeSure \
+	       "Created summary file $file, would you like to see it?"]} {
+	set fileId [open [file join $gFile($num) $file] r]
+	CTputs $cmdnum [read $fileId]
+	CToutput $num $cmdnum 
+    }
+}
+
+###########################################################
+# CTsetList
+###########################################################
+###########################################################
+###########################################################
+proc CTsetList { file } {
+    set list ""
+    for { set i 0 } { $i < 100 } { incr i } {
+	if { [file readable [file join $file records set$i.db]] } {
+	    lappend list $i
+	}
+    }
+    return $list
 }
\ No newline at end of file