WebSVN – VORC – Diff – /trunk/perl/RollerCon.pm

+package RollerCon;
 ## RollerCon support functions...
 use strict;
 use cPanelUserConfig;
-use Exporter;
+use Exporter 'import';
-use CGI qw/:standard :netscape/;
+use CGI qw/param header start_html url/;
 use CGI::Cookie;
 use DBI;
+use WebDB;
 use WebDB;
 our @EXPORT = qw( $ORCUSER getRCDBH getAccessLevels authDB max authenticate getShiftDepartment getDepartments convertDepartments convertTime getSchedule getRCid getSetting getUser getUserEmail getUserDerbyName getYears printRCHeader changeShift modShiftTime signUpCount signUpEligible findConflict changeLeadShift logit );
 my $dbh = WebDB->connect ();
+  }
   return $output;
+}
+sub convertTime {
+  my $time = shift || return;
+  if ($time =~ / - /) {
+    return join " - ", map { convertTime ($_) } split / - /, $time;
+  }
+  if ($ORCUSER->{timeformat} eq "24hr") {
+    if ($time =~ /^\d{1,2}:\d{2}$/) { return $time; }
+  } else {
+    my ($hr, $min) = split /:/, $time;
+    my $ampm = " am";
+    if ($hr >= 12) {
+      $hr -= 12 unless $hr == 12;
+      $ampm = " pm";
+    } elsif ($hr == 0) {
+      $hr = 12;
+    }
+    return $hr.":".$min.$ampm;
+  }
+}
 sub getSchedule {
   my $RCid = shift // return "ERROR: No RCid provided to getSchedule";
   my $filter = shift // "";
   my @whereclause;
   if ($filter eq "all") {
-  	push @whereclause, "date >= '2022-01-01'";
+  	push @whereclause, "date >= '2023-01-01'";
   } else {
   	push @whereclause, "date >= date(now())";
+  	}
   	$s->{role} =~ s/\-\d$//;
 #  	push @shifts, $h->li ({ class=> $s->{date} eq $dt ? "nowrap highlighted" : "nowrap shaded" }, join '&nbsp;&nbsp;', $s->{date}, $s->{dayofweek}, $s->{time}, $s->{location}, getDepartments()->{$s->{dept}}, $s->{role}, $s->{teams}, $s->{buttons});
+#  	push @shifts, $h->li ({ class=> $s->{date} eq $dt ? "highlighted" : "shaded" }, join '&nbsp;&nbsp;', $s->{date}, $s->{dayofweek}, $s->{time}, $s->{location}, getDepartments()->{$s->{dept}}, $s->{role}, $s->{teams}, $s->{buttons});
-#  	push @shifts, $h->li ({ class=> $s->{date} eq $dt ? "highlighted" : "shaded" }, join '&nbsp;&nbsp;', $s->{date}, $s->{dayofweek}, $s->{time}, $s->{location}, getDepartments()->{$s->{dept}}, $s->{role}, $s->{teams}, $s->{buttons});
+    $s->{time} = convertTime $s->{time};
   	push @shifts, $h->li ({ class=> $s->{date} eq $dt ? "highlighted" : "shaded" }, $h->div ({ class=>"lisp0" }, [ $h->div ({ class=>"liLeft" }, join '&nbsp;&nbsp;', ($s->{date}, $s->{dayofweek}, $s->{time}, $s->{location}, getDepartments()->{$s->{dept}}, $s->{role}, $s->{teams})), $h->div ({ class=>"liRight" }, $s->{buttons}) ]));
+  }
 	my ($dname) = $sth->fetchrow_array();
 	return $dname;
+}
 sub getYears {
-#	my $sth = $dbh->prepare("select distinct year(date) from v_shift_admin_view union select year(now())");
+	my $sth = $dbh->prepare("select distinct year from (select distinct year(date) as year from v_shift_admin_view union select year(now()) as year) years order by year");
-	my $sth = $dbh->prepare("select distinct year(date) from v_shift_admin_view");
+#	my $sth = $dbh->prepare("select distinct year(date) from v_shift_admin_view");
 	$sth->execute();
 	my @years;
 	while (my ($y) =$sth->fetchrow_array()) { push @years, $y; }
 	return \@years;
+}
 sub printRCHeader {
 	my $PAGE_TITLE = shift;
-	use CGI qw/start_html/;
+#	use CGI qw/start_html/;
 	use HTML::Tiny;
   my $h = HTML::Tiny->new( mode => 'html' );
    	$daily_count = signUpCount ('get', $user_id, $department);
    	if ($change eq "add" and $daily_count >= $MAXSHIFTS and !$leadership_change) {
    		return "<br>Denied! You may only sign up for $MAXSHIFTS $game_type shifts in one day!<br>\n";
+   	}
 #   	if ($change eq "add" and $game_based eq "game" and $department eq "OFF" and $game_type eq "full length") {
-#    	my ($full_length_count) = $dbh->selectrow_array ("select count(*) from v_shift_officiating where RCid = ? and gtype = 'full length' and date > '2022-01-01'", undef, $user_id);
+#    	my ($full_length_count) = $dbh->selectrow_array ("select count(*) from v_shift_officiating where RCid = ? and gtype = 'full length' and date > '2023-01-01'", undef, $user_id);
 #  		if ($full_length_count >= 3) {
 #  			return "<br>Denied! You may only sign up to officiate 3 $game_type games (total)!<br>\n";
 #  		}
 #    }
+  }
+	}
 	if ($shifttype eq "game") {
 #    if ($t->{gtype} !~ /^selected/ and $t->{gtype} ne "short track" and $user->{$limitkey} < $limit) {
 #		if ($t->{gtype} eq "full length" and $dept eq "OFF") {
-#			my ($full_length_count) = $dbh->selectrow_array ("select count(*) from v_shift_officiating where RCid = ? and gtype = 'full length' and date > '2022-01-01'", undef, $user->{RCid});
+#			my ($full_length_count) = $dbh->selectrow_array ("select count(*) from v_shift_officiating where RCid = ? and gtype = 'full length' and date > '2023-01-01'", undef, $user->{RCid});
 #			if ($full_length_count >= 3) {
 #				return 0;
 #			}
 #		}

Subversion Repositories VORC

(root)/trunk/perl/RollerCon.pm – Rev 46 → 50