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

 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'";
-  my @whereclause;
+  } else {
+  	push @whereclause, "date >= date(now())";
   push @whereclause, "date >= date(now())" unless $filter eq "all";
 #  if ($RCid ne $ORCUSER->{RCid}) {
 #    push @whereclause, "dept != 'PER'";
 #  }
 		($shift_id) = $dbh->selectrow_array ("select min(id) from v_shift where date = ? and start_time = ? and location = ? and isnull(RCid) = 1", undef, split /\|/, $shift_id);
+	}
 	my $game_based = $role ? "game" : "shift";
 	my $sth;
-	if ($change eq "add") {
+	if ($change eq "add" or $change eq "override") {
   	my $taken;
   	if ($game_based eq "game") {
   	  ($taken) = $dbh->selectrow_array ("select count(*) from assignment where Gid = ? and role = ?", undef, $shift_id, $role);
 		} elsif ($department eq "CLA") {
   if ($change eq "add" and convertDepartments(getUser($user_id)->{department})->{$department} < 1) {
 		return "<br>Denied! User ($user_id) is not a member of Department ($department)!<br>\n" unless $department eq "CMP";
   }
+  my $conflict = findConflict ($user_id, $shift_id, $game_based);
-  if ($change eq "add" and findConflict ($user_id, $shift_id, $game_based)) {
+  if ($change eq "add" and $conflict) {
-		return "<br>Denied! There is a conflict with that shift's time!<br>\n";
+		return "<br>Denied! There is a conflict ($conflict) with that shift's time!<br>\n";
+  }
   } else {
    	$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") {
+#   	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 > '2022-01-01'", undef, $user_id);
-  		if ($full_length_count >= 3) {
+#  		if ($full_length_count >= 3) {
-  			return "<br>Denied! You may only sign up to officiate 3 $game_type games (total)!<br>\n";
+#  			return "<br>Denied! You may only sign up to officiate 3 $game_type games (total)!<br>\n";
-  		}
+#  		}
-    }
+#    }
+  }
  	my @DBARGS;
   if ($game_based eq "game") {
-  	if ($change eq "add") {
+  	if ($change eq "add" or $change eq "override") {
   		$sth = $dbh->prepare("insert into assignment (Gid, role, RCid) values (?, ?, ?)");
   	} elsif ($change eq "del") {
   		$sth = $dbh->prepare("delete from assignment where Gid = ? and role = ? and RCid= ?");
+  	}
   	@DBARGS = ($shift_id, $role, $user_id);
   } else {
-  	if ($change eq "add") {
+  	if ($change eq "add" or $change eq "override") {
   		$sth = $dbh->prepare("update shift set assignee_id = ? where id = ? and isnull(assignee_id) = 1");
   		@DBARGS = ($user_id, $shift_id);
   	} elsif ($change eq "del") {
   		$sth = $dbh->prepare("update shift set assignee_id = null where id = ?");
   print "<br>attempting to make DB changes...<br>";
   if ($sth->execute (@DBARGS)) {
   	$daily_count = signUpCount ($change, $user_id, $department) unless $leadership_change;
+  	logit ($user_id, "Shift ".ucfirst($change).": $shift_id -> $role");
-  	logit ($user_id, "Shift ".ucfirst($change).": $shift_id -> $role");
+  	logit ($ORCUSER->{RCid}, "OVERRIDE: Shift ".ucfirst($change).": $shift_id -> $role") if $change eq "override";
   	print "Success!...<br>You've signed up for $daily_count shifts today (you're currently allowed to sign up for $MAXSHIFTS per day).<br>\n";
   	return;
   } else {
     return "<br><b>You did not get the shift</b>, most likely because someone else took it while you were looking.<br>\nERROR: ", $sth->errstr();
 		$user->{$limitkey} = signUpCount('get', $user->{RCid}, $dept);
+	}
 	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") {
+#		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 > '2022-01-01'", undef, $user->{RCid});
-			if ($full_length_count >= 3) {
+#			if ($full_length_count >= 3) {
-				return 0;
+#				return 0;
-			}
+#			}
 #		}
     if ($t->{signup} ne "selected" and $user->{$limitkey} < $limit) {
 			return 1;
 		} else {
 			return 0;
   if ($type eq "game") {
   # Are they already signed up for this game? (It's faster to check the two views one at a time...)
 #    ($conflicts) = $dbh->selectrow_array ("select count(*) from v_shift_officiating where substring_index(id, '-', 1) = ? and RCid = ?", undef, $gid, $rcid);
     ($conflicts) = $dbh->selectrow_array ("select count(*) from v_shift_officiating where id = ? and RCid = ?", undef, $gid, $rcid);
-  	if ($conflicts) { return 1; } # no need to keep looking...
+  	if ($conflicts) { return "OFF-".$gid; } # no need to keep looking...
     ($conflicts) = $dbh->selectrow_array ("select count(*) from v_shift_announcer where id = ? and RCid = ?", undef, $gid, $rcid);
-  	if ($conflicts) { return 1; } # no need to keep looking...
+  	if ($conflicts) { return "ANN-".$gid; } # no need to keep looking...
     ($date, $start, $end) = $dbh->selectrow_array ("select distinct date, time, end_time from game where id = ?", undef, $gid);
   } elsif ($type eq "personal")  {
   # Are they signed up for any games that would conflict with this one?
 #  my $sth = $dbh->prepare("select count(*) from v_shift_admin_view where id in (select id from game where date = (select date from game where id = ?) and ((time <= (select time from game where id = ?) and end_time > (select time from game where id = ?)) or (time > (select time from game where id = ?) and time < (select end_time from game where id = ?)))) and RCid = ?");
 #  my $sth = $dbh->prepare("select count(*) from v_shift_all where id in (select id from v_shift_all where date = (select date from v_shift_all where id = ?) and ((start_time <= (select start_time from v_shift_all where id = ?) and end_time > (select start_time from v_shift_all where id = ?)) or (start_time > (select start_time from v_shift_all where id = ?) and start_time < (select end_time from v_shift_all where id = ?)))) and RCid = ?");
-  ($conflicts) = $dbh->selectrow_array ("select count(*) from (
+  ($conflicts) = $dbh->selectrow_array ("select * from (
-    select id from v_shift             where date = ? and ((start_time <= ? and end_time > ?) or (start_time > ? and start_time < ?)) and RCid = ? union
+    select concat(dept, '-', id) from v_shift             where date = ? and ((start_time <= ? and end_time > ?) or (start_time > ? and start_time < ?)) and RCid = ? union
-    select id from v_shift_announcer   where date = ? and ((start_time <= ? and end_time > ?) or (start_time > ? and start_time < ?)) and RCid = ? union
+    select concat('ANN-', id) from v_shift_announcer   where date = ? and ((start_time <= ? and end_time > ?) or (start_time > ? and start_time < ?)) and RCid = ? union
-    select id from v_shift_officiating where date = ? and ((start_time <= ? and end_time > ?) or (start_time > ? and start_time < ?)) and RCid = ? ) alltables",
+    select concat('OFF-', id) from v_shift_officiating where date = ? and ((start_time <= ? and end_time > ?) or (start_time > ? and start_time < ?)) and RCid = ? ) alltables",
     undef, $date, $start, $start, $start, $end, $rcid, $date, $start, $start, $start, $end, $rcid, $date, $start, $start, $start, $end, $rcid
   );

Subversion Repositories ORC

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