[LON-CAPA-cvs] cvs: loncom /homework insertlist.xml /html/adm/help/tex Authoring_Hint_Tags.tex /interface lonquickgrades.pm

[www]

www		Mon Jan 10 00:06:28 2011 EDT

  Modified files:              
    /loncom/homework	insertlist.xml 
    /loncom/html/adm/help/tex	Authoring_Hint_Tags.tex 
    /loncom/interface	lonquickgrades.pm 
  Log:
  Help on authoring adaptive hints
  
  
Index: loncom/homework/insertlist.xml
diff -u loncom/homework/insertlist.xml:1.22 loncom/homework/insertlist.xml:1.23
--- loncom/homework/insertlist.xml:1.22	Sat Nov 13 03:22:58 2010
+++ loncom/homework/insertlist.xml	Mon Jan 10 00:06:22 2011
@@ -103,12 +103,20 @@
 		<color>#accacc</color>
 		<insert_sub>insert_hintgroup</insert_sub>
 		<allow>customhint,formulahint,hintpart,mathhint,numericalhint,optionhint,radiobuttonhint,reactionhint,organichint,startouttext,stringhint</allow>
+		<help>
+			<file>Authoring_Hint_Tags</file>
+			<description>How to write hints</description>
+		</help>
 	</tag>
 	<tag name="hintpart">
 		<description>Conditional Hint</description>
 		<color>#ccaacc</color>
 		<insert_sub>insert_hintpart</insert_sub>
 		<allow>block,display,gnuplot,img,import,organicstructure,parserlib,problemtype,randomlabel,randomlist,script,scriptlib,startouttext,tex,web,while,window</allow>
+	        <help>
+                        <file>adaptive_hints</file>
+                        <description>How to write adaptive hints</description>
+                </help>
 	</tag>
 	<tag name="formulahint">
 		<description>Formula Hint Condition</description>
Index: loncom/html/adm/help/tex/Authoring_Hint_Tags.tex
diff -u loncom/html/adm/help/tex/Authoring_Hint_Tags.tex:1.3 loncom/html/adm/help/tex/Authoring_Hint_Tags.tex:1.4
--- loncom/html/adm/help/tex/Authoring_Hint_Tags.tex:1.3	Fri Aug 21 14:15:45 2009
+++ loncom/html/adm/help/tex/Authoring_Hint_Tags.tex	Mon Jan 10 00:06:25 2011
@@ -3,9 +3,9 @@
 All of these tags must appear inside a \textbf{}response tag:
 
 \begin{itemize}
-\item \textbf{hintgroup}\index{hintgroup}: tag that surrounds all of a
+\item \textbf{hintgroup}\index{hintgroup}: Tag that surrounds all of a
 hint. 
-\item \textbf{hintpart}\index{hintpart}: required. Tag to implement conditional
+\item \textbf{hintpart}\index{hintpart}: Tag to implement conditional
 hints. It has a required argument \textbf{on}. When a hint tag named
 the same as the \textbf{on} attribute evaluates to be correct, the
 \textbf{hintpart} will show. If no other \textbf{hintpart} is to
@@ -25,8 +25,8 @@
 should be set to the value of which \textbf{hintpart} will be shown. 
 \item \textbf{radiobuttonhint}\index{radiobuttonhint}: The required attribute
 \textbf{name} should be set to the value of which \textbf{hintpart}
-will be shown, and the attribute \textbf{answer} should be a two element
-list, first the type (\textbf{foil} or \textbf{concept}) and then
-either the foil's name or the concept's string.
+will be shown, and the attribute \textbf{answer} should be at least a two element
+list: first the type (\textbf{foil} or \textbf{concept}) and then
+either the foil name(s) or the concept string(s), e.g., ``('foil','greaterthan','equal')'' if the condition should be triggered by the foils named ``greaterthan'' or ``equal.''
 \item \textbf{customhint}\index{customhint}: The required attribute \textbf{name} should be set to the value of which \textbf{hintpart} will be shown.  Define the hint condition within an \textbf{answer} block inside of the \textbf{customhint} block.  The condition is defined like how an answer is defined in \textbf{customresponse} where you need to return EXACT\_ANS to indicate when customhint criteria are met. 
 \end{itemize}
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.61 loncom/interface/lonquickgrades.pm:1.62
--- loncom/interface/lonquickgrades.pm:1.61	Mon Jan  3 14:39:19 2011
+++ loncom/interface/lonquickgrades.pm	Mon Jan 10 00:06:28 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.61 2011/01/03 14:39:19 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.62 2011/01/10 00:06:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -133,7 +133,7 @@
 
     $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
     $r->print("\n".'<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
-                                          ($showPoints?&mt('Points Overview'):($showCategories?&mt('Grades Overview'):&mt('Completion Overview'))).
+                                          ($showPoints?&mt('Individual Points Overview'):($showCategories?&mt('Grades Overview'):&mt('Completion Overview'))).
                                           '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
 
     if (!($showPoints || $notshowSPRSlink) || ($allowed_to_view)) {
@@ -403,6 +403,14 @@
 
     my ($r,$showPoints,$notshowTotals,
            $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+# Take care of storing and retrieving categories
+
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
+# categories loaded now
+
 }
 
 # Pass this two refs to arrays for the start and end color, and a number