--- loncom/interface/lonhelper.pm 2003/04/30 19:08:15 1.15
+++ loncom/interface/lonhelper.pm 2003/05/07 18:22:43 1.21
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.15 2003/04/30 19:08:15 bowersj2 Exp $
+# $Id: lonhelper.pm,v 1.21 2003/05/07 18:22:43 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -149,7 +149,11 @@ of the information used is persistent be
and -maintain code.
It is possible to do some of the work with an XML fragment parsed by
-lonxml; again, see lonprintout.pm for an example.
+lonxml; again, see lonprintout.pm for an example. In that case it is
+imperative that you call B<Apache::lonhelper::registerHelperTags()>
+before parsing XML fragments and B<Apache::lonhelper::unregisterHelperTags()>
+when you are done. See lonprintout.pm for examples of this usage in the
+printHelper subroutine.
=cut
@@ -462,7 +466,7 @@ sub process {
# Phase 2: Preprocess current state
my $startState = $self->{STATE};
- my $state = $self->{STATES}{$startState};
+ my $state = $self->{STATES}->{$startState};
# For debugging, print something here to determine if you're going
# to an undefined state.
@@ -473,10 +477,11 @@ sub process {
# Phase 3: While the current state is different from the previous state,
# keep processing.
- while ( $startState ne $self->{STATE} )
+ while ( $startState ne $self->{STATE} &&
+ defined($self->{STATES}->{$self->{STATE}}) )
{
$startState = $self->{STATE};
- $state = $self->{STATES}{$startState};
+ $state = $self->{STATES}->{$startState};
$state->preprocess();
}
@@ -495,6 +500,11 @@ sub display {
my $result = "";
+ if (!defined($state)) {
+ $result = "<font color='#ff0000'>Error: state '$state' not defined!</font>";
+ return $result;
+ }
+
# Phase 4: Display.
my $stateTitle = $state->title();
my $bodytag = &Apache::loncommon::bodytag("$self->{TITLE}",'','');
@@ -987,22 +997,25 @@ sub render {
if ($self->{'multichoice'}) {
$result .= <<SCRIPT;
<script>
- function checkall(value) {
+ function checkall(value, checkName) {
for (i=0; i<document.forms.helpform.elements.length; i++) {
- document.forms.helpform.elements[i].checked=value;
+ ele = document.forms.helpform.elements[i];
+ if (ele.name == checkName + '.forminput') {
+ document.forms.helpform.elements[i].checked=value;
+ }
}
}
</script>
SCRIPT
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true)" value="Select All" />
-<input type="button" onclick="checkall(false)" value="Unselect All" />
+<input type="button" onclick="checkall(true, '$var')" value="Select All" />
+<input type="button" onclick="checkall(false, '$var')" value="Unselect All" />
<br />
BUTTONS
}
- if (defined $self->{ERRO_MSG}) {
+ if (defined $self->{ERROR_MSG}) {
$result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
}
@@ -1295,7 +1308,10 @@ the user can manipulate the folders.
<resource> takes the standard variable attribute to control what helper
variable stores the results. It also takes a "multichoice" attribute,
-which controls whether the user can select more then one resource.
+which controls whether the user can select more then one resource. The
+"toponly" attribute controls whether the resource display shows just the
+resources in that sequence, or recurses into all sub-sequences, defaulting
+to false.
B<SUB-TAGS>
@@ -1356,6 +1372,7 @@ sub start_resource {
$paramHash->{'variable'} = $token->[2]{'variable'};
$helper->declareVar($paramHash->{'variable'});
$paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+ $paramHash->{'toponly'} = $token->[2]{'toponly'};
return '';
}
@@ -1460,10 +1477,10 @@ sub render {
if ($self->{'multichoice'}) {
$result = <<SCRIPT;
<script>
- function checkall(value) {
+ function checkall(value, checkName) {
for (i=0; i<document.forms.helpform.elements.length; i++) {
ele = document.forms.helpform.elements[i];
- if (ele.type == "checkbox") {
+ if (ele.name == checkName + '.forminput') {
document.forms.helpform.elements[i].checked=value;
}
}
@@ -1472,8 +1489,8 @@ sub render {
SCRIPT
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true)" value="Select All" />
-<input type="button" onclick="checkall(false)" value="Unselect All" />
+<input type="button" onclick="checkall(true, '$var')" value="Select All Resources" />
+<input type="button" onclick="checkall(false, '$var')" value="Unselect All Resources" />
<br />
BUTTONS
}
@@ -1516,7 +1533,7 @@ BUTTONS
}
};
- $ENV{'form.condition'} = 1;
+ $ENV{'form.condition'} = !$self->{'toponly'};
$result .=
&Apache::lonnavmaps::render( { 'cols' => [$renderColFunc,
Apache::lonnavmaps::resource()],
@@ -1613,21 +1630,25 @@ sub render {
my $self = shift;
my $result = '';
my $buttons = '';
+ my $var = $self->{'variable'};
if ($self->{'multichoice'}) {
$result = <<SCRIPT;
<script>
- function checkall(value) {
+ function checkall(value, checkName) {
for (i=0; i<document.forms.helpform.elements.length; i++) {
- document.forms.helpform.elements[i].checked=value;
+ ele = document.forms.helpform.elements[i];
+ if (ele.name == checkName + '.forminput') {
+ document.forms.helpform.elements[i].checked=value;
+ }
}
}
</script>
SCRIPT
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true)" value="Select All" />
-<input type="button" onclick="checkall(false)" value="Unselect All" />
+<input type="button" onclick="checkall(true, '$var')" value="Select All Students" />
+<input type="button" onclick="checkall(false, '$var')" value="Unselect All Students" />
<br />
BUTTONS
}
@@ -1668,7 +1689,7 @@ BUTTONS
$checked = 1;
}
$result .=
- " value='" . HTML::Entities::encode($_)
+ " value='" . HTML::Entities::encode($_ . ':' . $choices->{$_}->[$section])
. "' /></td><td>"
. HTML::Entities::encode($choices->{$_}->[$fullname])
. "</td><td align='center'>"
@@ -1818,10 +1839,19 @@ sub render {
if ($self->{'multichoice'}) {
$result = <<SCRIPT;
<script>
- function checkall(value) {
+ function checkall(value, checkName) {
for (i=0; i<document.forms.helpform.elements.length; i++) {
ele = document.forms.helpform.elements[i];
- if (ele.type == "checkbox") {
+ if (ele.name == checkName + '.forminput') {
+ document.forms.helpform.elements[i].checked=value;
+ }
+ }
+ }
+
+ function checkallid(value, idName) {
+ for (i=0; i<document.forms.helpform.elements.length; i++) {
+ ele = document.forms.helpform.elements[i];
+ if (ele.id == idName) {
document.forms.helpform.elements[i].checked=value;
}
}
@@ -1830,8 +1860,10 @@ sub render {
SCRIPT
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true)" value="Select All" />
-<input type="button" onclick="checkall(false)" value="Unselect All" />
+<input type="button" onclick="checkall(true, '$var')" value="Select All Files" />
+<input type="button" onclick="checkall(false, '$var')" value="Unselect All Files" />
+<input type="button" onclick="checkallid(true, 'Published')" value="Select All Published" />
+<input type="button" onclick="checkallid(false, 'Published')" value="Unselect All Published" />
<br />
BUTTONS
}
@@ -1855,7 +1887,7 @@ BUTTONS
$result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
}
- $result .= '<table border="0" cellpadding="1" cellspacing="1">';
+ $result .= '<table border="0" cellpadding="2" cellspacing="0">';
# Keeps track if there are no choices, prints appropriate error
# if there are none.
@@ -1872,14 +1904,16 @@ BUTTONS
}
my $fileName = $subdir .'/'. $file;
if (&$filterFunc($file)) {
- $result .= '<tr><td align="right">' .
- "<input type='$type' name='" . $var
+ (my $status, my $color) = @{fileState($subdir, $file)};
+ $result .= '<tr><td align="right"' . " bgcolor='$color'>" .
+ "<input id='$status' type='$type' name='" . $var
. ".forminput' value='" . HTML::Entities::encode($fileName) .
"'";
if (!$self->{'multichoice'} && $choices == 0) {
$result .= ' checked';
}
- $result .= "/></td><td>" . $file . "</td></tr>\n";
+ $result .= "/></td><td bgcolor='$color'>" . $file .
+ "</td><td bgcolor='$color'>$status</td></tr>\n";
$choices++;
}
}
@@ -1895,6 +1929,37 @@ BUTTONS
return $result;
}
+# Determine the state of the file: Published, unpublished, modified.
+# Return the color it should be in and a label as a two-element array
+# reference.
+# Logic lifted from lonpubdir.pm, even though I don't know that it's still
+# the most right thing to do.
+
+sub fileState {
+ my $constructionSpaceDir = shift;
+ my $file = shift;
+
+ my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+ my $subdirpart = $constructionSpaceDir;
+ $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
+ my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+ $subdirpart;
+
+ my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
+ my @resourceSpaceFileStat = stat($resdir . '/' . $file);
+ if (!@resourceSpaceFileStat) {
+ return ['Unpublished', '#FFCCCC'];
+ }
+
+ my $constructionSpaceFileModified = $constructionSpaceFileStat[9];
+ my $resourceSpaceFileModified = $resourceSpaceFileStat[9];
+
+ if ($constructionSpaceFileModified > $resourceSpaceFileModified) {
+ return ['Modified', '#FFFFCC'];
+ }
+ return ['Published', '#CCFFCC'];
+}
+
sub postprocess {
my $self = shift;
my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};