WebSVN – VORC – Diff – /trunk/site/schedule/shifts.pl

 #!/usr/bin/perl
+# Redirect error messages to a log of my choosing. (it's annoying to filter for errors in the shared env)
+my $error_log_path = $ENV{SERVER_NAME} eq "volunteers.rollercon.com" ? "/home3/rollerco/logs/" : "/tmp/";
+close STDERR;
+open STDERR, '>>', $error_log_path.'vorc_error.log' or warn "Failed to open redirected logfile ($0): $!";
+#warn "Redirecting errors to ${error_log_path}vorc_error.log";
 #if ($ENV{SHELL}) { die "This script shouldn't be executed from the command line!\n"; }
 #use strict;
 use cPanelUserConfig;
 use CGI qw/param cookie header start_html url/;
 use HTML::Tiny;
 use tableViewer;
 use RollerCon;
-use DateTime;
-use DateTime::Duration;
+use DateTime;
-my $now = DateTime->now (time_zone => 'America/Los_Angeles');
+use DateTime::Duration;
 our $h = HTML::Tiny->new( mode => 'html' );
-my $cookie_string = authenticate (1) || die;
+my $cookie_string = authenticate (RollerCon::USER) || die;
 our ($EML, $PWD, $LVL) = split /&/, $cookie_string;
 my $user = getUser ($EML);
 $user->{department} = convertDepartments $user->{department};
-my $username = $h->a ({ href=>"/schedule/manage_user.pl?submit=View&RCid=$user->{RCid}" }, $user->{derby_name});
+my $username = $h->a ({ href=>"/schedule/view_user.pl?submit=View&RCid=$user->{RCid}" }, $user->{derby_name});
-my $RCid = $user->{RCid};
-my $RCAUTH_cookie = CGI::Cookie->new(-name=>'RCAUTH',-value=>"$cookie_string",-expires=>"+30m");
-my $YEAR = 1900 + (localtime)[5];
-if (!scalar (grep { $user->{department}->{$_} > 0 } grep { !/^(ANN|OFF)$/ } keys %{$user->{department}}) and
-    $user->{department}->{ANN} < 2 and
-    $user->{department}->{OFF} < 2 and
-    $LVL < 4) {
+my $RCid = $user->{RCid};
-	print header(-cookie=>$RCAUTH_cookie);
-	printRCHeader("Unauthorized Page");
-	print $h->div ({ class=>"error" }, "No Access");
-	print $h->div ("Your user account is not registered as a Volunteer in a department that uses this view, so you can't see these shifts.  It's possible that your access is still being reviewed.  Please be patient.");
-	print $h->a ({ href=>"/schedule/" }, "[Go Home]");
-	print $h->close ("html");
+my $RCAUTH_cookie = CGI::Cookie->new(-name=>'RCAUTH',-value=>"$cookie_string",-expires=>"+30m");
-	exit;
+my $YEAR = 1900 + (localtime)[5];
 my $now = DateTime->now (time_zone => 'America/Los_Angeles');
-my $pageTitle = "Volunteer Shifts";
+my $pageTitle = "Shift Management";
-my $prefscookie = "vorcshifts";
+my $prefscookie = "shiftmanager";
 our $DBTABLE = 'v_shift';
 my %COLUMNS = (
 # colname   =>  [qw(DisplayName       N    type     status)],   status ->  static | default | <blank>
-	id          => [qw(ShiftID        5    number       )],
+	id          => [qw(ID             5    number         )],
-	dept        => [qw(Department    10    select      default )],
+	dept        => [qw(Department    10    select       )],
-	role        => [qw(Role          15    text      default )],
+	date        => [qw(Date          15    date        default )],
-	type        => [qw(Type          20    select      default )],
+  dayofweek   => [qw(Day           17    select      )],
-	date        => [qw(Date          25    date        default )],
+	time        => [qw(Time          20    text        default )],
-  dayofweek   => [qw(Day           27    select              )],
+	start_time  => [qw(Start         25    text         )],
-	location    => [qw(Location      30    select      default )],
+	end_time    => [qw(End           30    text         )],
-	time        => [qw(Time          35    text        default )],
+	mod_time    => [qw(ModTime       35    number         )],
-	start_time  => [qw(Start         36    text         )],
+	doubletime  => [qw(DoubleTime    37    boolean         )],
-	end_time    => [qw(End           40    text         )],
+	volhours    => [qw(VolHours      40    number         )],
-	mod_time    => [qw(ModTime       45    number         )],
+	role        => [qw(Role          45    text      default )],
-	doubletime  => [qw(DoubleTime    47    boolean         )],
+	type        => [qw(Type          50    select      default )],
-	volhours    => [qw(VolHours      50    number         )],
+	location    => [qw(Location      55    select      default )],
-	note        => [qw(Notes         55    text        default )],
+	note        => [qw(Notes         60    text        default )],
-	RCid        => [qw(AssigneeID    60    text         )],
+	RCid        => [qw(RCID          65    text         )],
-	derby_name  => [qw(DerbyName     65    select      default   )],
+	derby_name  => [qw(Assignee      70    select      default   )],
 );
 my $stylesheet = "/style.css";
 my $homeURL = '/schedule/';
-my @pagelimitoptions = ("All", 5, 10, 25);
 my @pagelimitoptions = ("All", 5, 10, 25);
 my @whereClause;
-if ($LVL <= 3 and $user->{department}->{VCI} < 2) {
+my @whereClause;
-  my $string = "dept in (".join ",", map { '"'.$_.'"' } grep { $ORCUSER->{department}->{$_} > 0 } keys %{$ORCUSER->{department}};
-  $string .= ")";
+if ($LVL < 5) {
-#   warn $string;
+  my $string = "dept in (".join ",", map { '"'.$_.'"' } grep { $ORCUSER->{department}->{$_} >= 1 } keys %{$ORCUSER->{department}};
-  push @whereClause, $string;
+  $string .= ")";
   push @whereClause, $string;
 push @whereClause, "(dept != 'PER' or RCid = $RCid)";
 push @whereClause, "dept != 'PER'";
+# If we need to modify line item values, create a subroutine named "modify_$columnname"
+#    It will receive a hashref to the object lineitem
+sub modify_doubletime {
+  my $thing = shift;
+  return $thing->{doubletime} ? "True" : "False";
+}
+sub modify_id {
+  my $hr = shift;
+  return $hr->{id} unless $LVL >= RollerCon::ADMIN;
+  if ($hr->{dept} eq "COA") {
+    return $h->a ({ href=>"view_class.pl?id=".getClassID ($hr->{id})."&choice=Update" }, "[Edit Class]");
+  } else {
+    my $clicky = $hr->{RCid} ? "event.stopPropagation(); if (confirm('WARNING!\\nYou are modifying a shift that someone has signed up for.')==true) {return true;} else {return false;}" : "return true;";
+    my $extrawarning = $hr->{RCid} ? "\\nWARNING! It appears someone is signed up for it." : "";
+    return join "&nbsp;", #$hr->{id},
-# If we need to modify line item values, create a subroutine named "modify_$columnname"
+           $h->a ({ href=>"view_shift.pl?id=$hr->{id}&choice=Update", onClick=>$clicky }, "[Edit]"),
+           $h->a ({ href=>"view_shift.pl?id=$hr->{id}&choice=Copy" }, "[Copy]"),
+           $h->a ({ href=>"view_shift.pl?id=$hr->{id}&choice=Delete", onClick=>"event.stopPropagation(); if (confirm('Are you sure you want to DELETE this shift?$extrawarning')==true) {return true;} else {return false;}" }, "[Delete]")
+    ;
+  }
+};
+my $DEPTS = getDepartments;
+sub modify_dept {
+  my $hr = shift;
+  $hr->{dept} = $DEPTS->{$hr->{dept}};
+}
+sub filter_dept {
+  my $colName = shift;
+	my $filter = shift;
+	if (defined $filter)	{
-#    It will receive a hashref to the object lineitem
+		if ($filter eq "-blank-") {
+			return "($colName = '' or isNull($colName) = 1)";
+		}
+		return "$colName = \"$filter\"";
+	}	else {
+		my $thing = "filter-${colName}";
+    my $categories = join "", map { $FORM{$thing} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $DEPTS->{$_}) : $h->option ({ value=>$_ }, $DEPTS->{$_}) } grep { $LVL > 4 or exists $user->{department}->{$_} } grep { !/^PER$/ } sort keys %{$DEPTS};
+		my $Options = "<OPTION></OPTION>".$categories;
-sub modify_doubletime {
-  my $thing = shift;
+		$Options =~ s/>($FORM{$thing})/ selected>$1/;
+		return "<SELECT name=filter-${colName} $onChange>$Options</SELECT>";
+	}
+}
+sub modify_derby_name {
+  my $t = shift;
+  if ($t->{derby_name}) {
-  return $thing->{doubletime} ? "True" : "False";
+    if ($user->{department}->{$t->{dept}} >= RollerCon::LEAD or $LVL >= RollerCon::ADMIN) {
       $t->{derby_name} = $h->a ({ href=>"/schedule/view_user.pl?RCid=$t->{RCid}" }, $t->{derby_name});
     } else {
-sub modify_derby_name {
+      $t->{derby_name} = "FILLED";
         hour => 5,
         minute => 0,
         second => 0,
         time_zone => 'America/Los_Angeles'
   );
- 	if (($t->{RCid} == $RCid and $t->{type} ne "selected" and $now < $cutoff) or ($t->{derby_name} and ($user->{department}->{$t->{dept}} >= 2 or $LVL >= 5 or $user->{department}->{VCI} >= 2))) {
+ 	if (($t->{assignee_id} == $RCid and $t->{type} ne "selected" and $now < $cutoff) or ($t->{derby_name} and ($user->{department}->{$t->{dept}} >= 2 or $LVL >= 5))) {
- 	  if ($t->{dept} eq "PER") {
- 	    # DEL Personal Block
- 	    $t->{derby_name} .= " ".$h->a ({ onClick=>"if (confirm('Really? You want to delete this personal time?')==true) { window.open('manage_personal_time.pl?choice=Delete&id=$s[0]','Confirm Change','resizable,height=260,width=370'); return false; }" }, "[DEL]");
+ 		# DROP
- 	  } else {
+ 		$t->{derby_name} = "$t->{derby_name} <A HREF='#' onClick=\"event.stopPropagation(); if (confirm('Really? You want to drop this person from the shift?')==true) { window.open('make_shift_change.pl?change=del&RCid=$t->{assignee_id}&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false; }\">[DROP]</a>";
-   		# DROP
- 	    $t->{derby_name} .= " ".$h->a ({ onClick=>"if (confirm('Really? You want to drop this shift?')==true) { window.open('make_shift_change.pl?change=del&RCid=$t->{RCid}&id=$t->{id}','Confirm Change','resizable,height=260,width=370'); return false; }" }, "[DROP]");
+ 		if ($user->{department}->{$t->{dept}} >= 2 or $LVL > 4) {
-   		if ($user->{department}->{$t->{dept}} >= 2 or $LVL >= 5 or $user->{department}->{VCI} >= 2) {
-   		  # NO SHOW and MOD TIME
-   		  $t->{derby_name} .= " | ".$h->a ({ href=>'#', onClick=>"if (confirm('Really? They were a no show?')==true) { window.open('make_shift_change.pl?noshow=true&change=del&RCid=$t->{RCid}&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false; }" }, "[NO SHOW]");
+ 		  # NO SHOW
-   		  $t->{derby_name} .= " | ".$h->a ({ onClick=>"window.open('mod_shift_time.pl?RCid=$t->{RCid}&shiftid=$t->{id}','Mod Vol Hours','resizable,height=260,width=370');" }, "[MOD]");
+ 		  $t->{derby_name} .= " | <A HREF='#' onClick=\"event.stopPropagation(); if (confirm('Really? They were a no show?')==true) { window.open('make_shift_change.pl?noshow=true&change=del&RCid=$t->{assignee_id}&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false; }\">[NO SHOW]</a>";
-   		}
+ 		}
- 	  }
  	} elsif (!$t->{derby_name}) {
  		if (signUpEligible ($ORCUSER, $t, "vol") and $now < $cutoff) {
  			# SIGN UP
- 			$t->{derby_name} = $h->a ({ onClick=>"window.open('make_shift_change.pl?change=add&RCid=$RCid&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false;" }, "[SIGN UP]");
+ 			$t->{derby_name} = "<A HREF='#' onClick=\"event.stopPropagation(); window.open('make_shift_change.pl?change=add&RCid=$RCid&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false;\">[SIGN UP]</a>";
+ 		}
- 		if ($user->{department}->{$t->{dept}} >= 2 or $LVL > 4 or $user->{department}->{VCI} >= 2) {
+ 		if ($user->{department}->{$t->{dept}} >= 2 or $LVL > 4) {
  			# ADD USER
  			$t->{derby_name} ? $t->{derby_name} .= " | " : {};
- 			$t->{derby_name} .= $h->a ({ onClick=>"window.open('make_shift_change.pl?change=lookup&RCid=$RCid&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false;" }, "[ADD USER]");
+ 			$t->{derby_name} .= "<A HREF='#' onClick=\"event.stopPropagation(); window.open('make_shift_change.pl?change=lookup&RCid=$RCid&id=$t->{id}','Confirm Shift Change','resizable,height=260,width=370'); return false;\">[ADD USER]</a>";
+ 		}
+ 	}
  	return $t->{derby_name};
+}
-my $DEPTS = getDepartments;
-sub modify_dept {
+sub modify_time {
-  my $hr = shift;
+  my $t = shift;
-  return $DEPTS->{$hr->{dept}};
+  return convertTime $t->{time};
 }
-sub filter_dept {
-  my $colName = shift;
-	my $filter = shift;
-	if (defined $filter)	{
-		if ($filter eq "-blank-") {
-			return "($colName = '' or isNull($colName) = 1)";
-		}
-		return "$colName = \"$filter\"";
-	}	else {
+sub modify_start_time {
-		my $thing = "filter-${colName}";
-    my $categories = join "", map { $FORM{$thing} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $DEPTS->{$_}) : $h->option ({ value=>$_ }, $DEPTS->{$_}) } grep { $LVL > 4 or $user->{department}->{VCI} >= 2 or exists $user->{department}->{$_} } sort keys %{$DEPTS};
-		my $Options = "<OPTION></OPTION>".$categories;
-		$Options =~ s/>($FORM{$thing})/ selected>$1/;
-		return "<SELECT name=filter-${colName} $onChange>$Options</SELECT>";
+  my $t = shift;
-	}
+  return convertTime $t->{start_time};
+}
-sub modify_time {
+sub modify_end_time {
   my $t = shift;
-  return convertTime $t->{time};
+  return convertTime $t->{end_time};
 	$FORM{$_} = param($_);				# Retrieve all of the FORM data submitted
 	if ((/^filter/) and ($FORM{$_} ne '')) {	# Build a set of filters to apply
 		my ($filter,$field) = split /-/, $_;
-		$FILTER->{$field} = $FORM{$_};
-	}	elsif ($FORM{$_} eq "true")	{		# Compile list of fields to display
+		$FILTER->{$field} = $FORM{$_} unless notInArray ($field, \@allFields);
-	  if ($_ ne "shiftinclude") {
-		  push @displayFields, $_;
 	}	elsif ($FORM{$_} eq "true")			# Compile list of fields to display
-	}
-}
+		{ push @displayFields, $_; }
+}
-my @addToWhereClause = ("year(date) = '$YEAR'", "type != 'announcer'");
+push @whereClause, "year(date) = '$YEAR'";
 if (exists $FORM{autoload})	{			# If the FORM was submitted (i.e. the page is being redisplayed),
 							                    #  	build the data for the cookie that remembers the page setup
 	my $disFields = join ":", @displayFields;
 	my $fils = join ":", map { "$_=$FILTER->{$_}" } keys %{$FILTER};
-	$QUERY_STRING = $disFields.'&'.$fils.'&'.$FORM{sortby}.'&'.$FORM{autoload}.'&'.$FORM{shiftinclude};
+	$QUERY_STRING = $disFields.'&'.$fils.'&'.$FORM{sortby}.'&'.$FORM{autoload};
+}
 if (!(exists $FORM{autoload}))	{			# No FORM was submitted...
 	if (my $prefs = cookie ($prefscookie) and !defined param ("ignoreCookie"))	{ # Check for cookies from previous visits.
-		my ($disF, $filts, $sb, $al, $si) = split /&/, $prefs;
+		my ($disF, $filts, $sb, $al) = split /&/,$prefs;
 		@displayFields = split /:/,$disF;
-		foreach my $pair (split /:/, $filts)	{
-			my ($key, $value) = split /=/, $pair;
+		foreach my $pair (split /:/, $filts)	{
-			$FORM{"filter-$key"} = $value;
+			my ($key, $value) = split /=/, $pair;
-			$FILTER->{$key} = $value;
+			$FORM{"filter-$key"} = $value;
+			$FILTER->{$key} = $value;
+		}
 		$FORM{sortby} = $sb;
 		$FORM{autoload} = $al;
-		$FORM{shiftinclude} = $si;
+		$QUERY_STRING = $prefs;
-		$QUERY_STRING = $prefs;
+	}	else {
-	}	else {
+	  @displayFields = @defaultFields; # Otherwise suppply a default list of columns.
-	  @displayFields = sort byfield @defaultFields; # Otherwise suppply a default list of columns.
+	  $FORM{sortby} = $displayFields[1];
 	  $FORM{autoload} = 1;             # And turn aut0load on by default.
-	}
+	}
+}
 # let's just make sure the columns are in the right order (and there aren't any missing)
+# let's just make sure the columns are in the right order (and there aren't any missing)
-@displayFields = sort byfield uniq @displayFields, @staticFields;
+@displayFields = grep { inArray($_, \@allFields) } sort byfield uniq @displayFields, @staticFields;
 # If the field isn't in the displayFields list,	then add it to the hideFields list
 @hideFields = grep { notInArray ($_, \@displayFields) } @allFields;
 if ($FORM{excel}) {
   exportExcel (\@ProductList, "RC_Officiating_Shifts");
   exit;
+}
-my @shifts;
-if ($FORM{shiftinclude} eq "true") {
-  my @SIWhere = ("year(date) = '$YEAR'");
-  push @SIWhere, "RCid = $ORCUSER->{RCid}";
-  my ($d, $c) = getData (\@displayFields, \@SIWhere, $DBTABLE, $FORM{sortby});
-  @shifts = @{ $d };
-}
 my $signedOnAs = $username ? "Welcome, $username. ".$h->a ({ href=>"index.pl", onClick=>"document.cookie = 'RCAUTH=; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/';return true;" }, "[Log Out]") : "You are not signed in.";
-# Set some cookie stuff...
-my ($uri) = split /\?/, $ENV{REQUEST_URI};
+# Set some cookie stuff...
-my $path = `dirname $uri`; chomp $path; $path .= '/' unless $path eq "/";
+my $path = `dirname $ENV{REQUEST_URI}`; chomp $path; $path .= '/' unless $path eq "/";
 my $queryCookie = cookie(-NAME=>$prefscookie,
 			-VALUE=>"$QUERY_STRING",
-			-PATH=>"$path",
-			-EXPIRES=>'+365d');
-my $SIChecked;
-if ($FORM{shiftinclude}) {
-  $SIChecked = $h->input ({ type=>"checkbox", name=>"shiftinclude", value=>"true", checked=>[], onClick=>'submit();' });
-} else {
-  $SIChecked = $h->input ({ type=>"checkbox", name=>"shiftinclude", value=>"true", onClick=>'submit();' });
+			-PATH=>"$path",
 			-EXPIRES=>'+365d');
 # Print the header
+#
 # 	print "\n\n\n\n<!-- $QUERY_STRING --> \n\n\n\n";
 #------------------
 #------------------
 # Toggle the autoload fields within the table elements
 our ($onClick, $onChange);   # (also used in scanFunctions)
 my ($radiobutton, $refreshbutton, $sortby);
   $radiobutton = $h->div ({ class=>'autoload' },
     ["Autoload Changes: ",
     $h->input ({ type=>"radio", name=>'autoload', class=>'accent', value=>1, onClick=>'submit();', checked=>[] }), "On ",
     $h->input ({ type=>"radio", name=>'autoload', class=>'accent', value=>0, onClick=>'submit();' }), "Off ",
     ]);
+  $refreshbutton = "";
-  $sortby = $h->select ({name=>"sortby", onChange=>'submit();' }, [ map { $FORM{sortby} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $NAME{$_}) : $h->option ({ value=>$_ }, $NAME{$_}) } @displayFields ]);
+  $sortby = $h->select ({name=>"sortby", onChange=>'submit();' }, [ map { $FORM{sortby} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $NAME{$_}) : $h->option ({ value=>$_ }, $NAME{$_}) } grep { $_ ne "id" } @displayFields ]);
 } else {
   $onClick = "";
 	$onChange = "onChange='page.value = 1;'";
   $radiobutton = $h->div ({ class=>'autoload' },
     ["Autoload Changes: ",
   $sortby = $h->select ({name=>"sortby" }, [ map { $FORM{sortby} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $NAME{$_}) : $h->option ({ value=>$_ }, $NAME{$_}) } @displayFields ]);
+}
 print start_html (-title => $pageTitle, -style => {'src' => $stylesheet} );
-#printRCHeader ($pageTitle);
+print start_html (-title => $pageTitle, -style => {'src' => $stylesheet} );
   push @topleft, $h->div ({ class=>'rTable' }, [ @hiddenrows ]);
   print $h->div ({ class=>"sp0" }, [
     $h->div ({ class=>"spLeft"  }, [ @topleft ]),
     $h->div ({ class=>"spRight" }, [
-      $signedOnAs, $h->br,
-      "Show my shifts: ", $SIChecked, $h->br,
-      $h->input ({ type=>"button", value=>"Block Personal Time", onClick=>"window.location.href='manage_personal_time.pl'" }),
+      $signedOnAs
     ])
   ]);
+}
 # Print the main table...............................................
 print $h->open ('div', { class=>'rTable' });
 my @tmptitlerow;
 foreach my $f (@displayFields)	{  # Print the Column headings
-  if (inArray ($f, \@staticFields)) {
+  if ($f eq $allFields[0]) {
-    push @tmptitlerow, $h->div ({ class=>'rTableHead' }, [ $h->input ({ type=>"hidden", name=>$f, value=>"true" }), $NAME{$f}, "&nbsp;", $h->input ({ type=>"button", value=>"Add", onClick=>"window.location.href='manage_shift.pl'" }) ]);
+    push @tmptitlerow, $h->div ({ class=>'rTableHead', onClick=>"Req.$f.click();"  }, [ $h->input ({ type=>"checkbox", class=>"accent", name=>$f, value=>"true", checked=>[], onClick=>'event.stopPropagation(); submit();' }), $NAME{$f}, $LVL >= RollerCon::MANAGER ? $h->input ({ type=>"hidden", name=>$f, value=>"true" })."&nbsp;".$h->input ({ type=>"button", value=>"Add", onClick=>"window.location.href='view_shift.pl'" }) : "" ]);
   } else {
+}
 # Print the filter boxes...
-print $h->div ({ class=>'rTableHeading' }, [ @tmptitlerow ], [ map { $h->div ({ class=>'rTableCell filters' }, filter ($_)) } @displayFields ], $h->div ({ class=>"rTableCell" }));
-if ($FORM{shiftinclude}) {  # Include all of the user's shifts at the top
-  foreach my $t (@shifts)	{
-	  print $h->div ({ class=>'rTableRow highlighted' }, [ map { $h->div ({ class=>'rTableCell' }, exists &{"modify_".$_} ? &{"modify_".$_} ($t) : $t->{$_}) } @displayFields ]);
-  }
-  print $h->hr ({ width=>"500%" });
 print $h->div ({ class=>'rTableHeading' }, [ @tmptitlerow ], [ map { $h->div ({ class=>'rTableCell filters' }, filter ($_)) } @displayFields ], $h->div ({ class=>"rTableCell" }));
-# Print the things
-#foreach my $t (@ProductList)	{
 #  print $h->div ({ class=>'rTableRow shaded' }, [ map { $h->div ({ class=>'rTableCell' }, exists &{"modify_".$_} ? &{"modify_".$_} ($t) : $t->{$_}) } @displayFields ]);
-#}
-foreach my $t (@ProductList)	{
+# Print the things
-  if ($t->{RCid} eq $ORCUSER->{RCid}) {
-	  print $h->div ({ class=>'rTableRow highlighted' }, [ map { $h->div ({ class=>'rTableCell' }, exists &{"modify_".$_} ? &{"modify_".$_} ($t) : $t->{$_}) } @displayFields ]);
-  } else {
-	  print $h->div ({ class=>'rTableRow shaded' }, [ map { $h->div ({ class=>'rTableCell' }, exists &{"modify_".$_} ? &{"modify_".$_} ($t) : $t->{$_}) } @displayFields ]);
+foreach my $t (@ProductList)	{
   print $h->div ({ class=>'rTableRow shaded', onclick=>"location.href='view_shift.pl?id=$t->{id}&choice=View'" }, [ map { $h->div ({ class=>'rTableCell' }, exists &{"modify_".$_} ? &{"modify_".$_} ($t) : $t->{$_} ? $t->{$_} : "") } @displayFields ]);
+}

Subversion Repositories VORC

(root)/trunk/site/schedule/shifts.pl – Rev 53 → 56