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

   use HTML::Tiny;
   my $h = HTML::Tiny->new( mode => 'html' );
   my $where = scalar @whereclause ? "where ".join " and ", @whereclause : "";
   my @shifts;
-  my $sth = $dbh->prepare("select * from (select id, date, dayofweek, track as location, time, role, teams, signup, 'OFF' as dept, volhours from v_shift_officiating where RCid = ? union
+  my $sth = $dbh->prepare("select * from (select id, date, dayofweek, start_time, end_time, track as location, time, role, teams, signup, 'OFF' as dept, volhours from v_shift_officiating where RCid = ? union
-                                          select id, date, dayofweek, track as location, time, role, teams, signup, 'ANN' as dept, volhours from v_shift_announcer where RCid = ? union
+                                          select id, date, dayofweek, start_time, end_time, track as location, time, role, teams, signup, 'ANN' as dept, volhours from v_shift_announcer where RCid = ? union
-                                          select id, date, dayofweek, location, time, role, if(dept = 'COA', note, '') as teams, type as signup, dept, if(dept = 'PER', 0, volhours) as volhours from v_shift where RCid = ? union
+                                          select id, date, dayofweek, start_time, end_time, location, time, role, if(dept = 'COA', note, '') as teams, type as signup, dept, if(dept = 'PER', 0, volhours) as volhours from v_shift where RCid = ? union
-                                          select id, date, dayofweek, location, time, role, name as teams, 'mvpclass' as signup, 'CLA' as dept, 0 as volhours from v_class_signup_new where RCid = ? union
+                                          select id, date, dayofweek, start_time, end_time, location, time, role, name as teams, 'mvpclass' as signup, 'CLA' as dept, 0 as volhours from v_class_signup_new where RCid = ? union
-                                          select id, date, dayofweek, location, time, role, name as teams, 'seminar' as signup, 'SEM' as dept, 0 as volhours from v_seminar_signup_new where RCid = ?) temp
+                                          select id, date, dayofweek, start_time, end_time, location, time, role, name as teams, 'seminar' as signup, 'SEM' as dept, 0 as volhours from v_seminar_signup_new where RCid = ?) temp
                            $where order by date, time");
+  $sth->execute($RCid, $RCid, $RCid, $RCid, $RCid);
+  my @RESULTS;
+  while (my $r = $sth->fetchrow_hashref) {
+    push @RESULTS, $r;
+    if ($#RESULTS) {
+      my ($yyyy, $mm, $dd) = split /\-/, $r->{date};
+      my ($sh, $sm, $ss) = split /:/, $r->{start_time};
+      my $start_time = DateTime->new (
+          year => $yyyy,
+          month => $mm,
+          day => $dd,
+          hour => $sh,
+          minute => $sm,
+          second => 0,
+          time_zone => 'America/Los_Angeles'
+      );
+      my ($peh, $pem, $pes) = split /:/, $RESULTS[$#RESULTS-1]->{end_time};
+      my ($pyyyy, $pmm, $pdd) = split /\-/, $RESULTS[$#RESULTS-1]->{date};
+      my $prior_end_time = DateTime->new (
+          year => $pyyyy,
+          month => $pmm,
+          day => $pdd,
+          hour => $peh,
+          minute => $pem,
+          second => 0,
+          time_zone => 'America/Los_Angeles'
+      );
+      if ($start_time < $prior_end_time) {
+        $r->{conflict} = 1;
+        $RESULTS[$#RESULTS-1]->{conflict} = 1;
+      }
+    }
+  }
   $sth->execute($RCid, $RCid, $RCid, $RCid, $RCid);
   my $hours = 0;
-  while (my $s = $sth->fetchrow_hashref) {
+  foreach my $s (@RESULTS) {
     my ($yyyy, $mm, $dd) = split /\-/, $s->{date};
-    my $cutoff = DateTime->new(
+    my $cutoff = DateTime->new (
         year => $yyyy,
         month => $mm,
         day => $dd,
         hour => 5,
         minute => 0,
         second => 0,
         time_zone => 'America/Los_Angeles'
-    );
     );
     if (!$s->{teams} or $s->{dept} eq "CLA" or $s->{dept} eq "SEM") {
       # it's a time-based shift
       if ($s->{dept} eq "PER") {
     my $onclick =  $s->{dept} eq "PER" ? "location.href = 'personal_time.pl?id=$s->{id}';" :
                   ($s->{dept} eq "OFF" or $s->{dept} eq "ANN") ? "location.href = 'view_game.pl?id=$s->{id}';" :
                    $s->{dept} eq "CLA" ? "location.href = 'view_class.pl?id=$s->{id}';" :
                    $s->{dept} eq "SEM" ? "location.href = 'view_seminar.pl?id=$s->{id}';" :
                    "location.href = 'view_shift.pl?id=$s->{id}';";
-    push @shifts, $h->div ({ class=>"rTableRow ".($s->{date} eq $dt ? "highlighted" : "shaded") },
+    push @shifts, $h->div ({ class=>"rTableRow ".($s->{date} eq $dt ? "highlighted" : "shaded"), style => $s->{conflict} ? "border:2px solid red;" : undef },
-                    [$h->div ( { class=>'rTableCellr', style=>"white-space:nowrap;padding:3px 5px 7px 5px;font-size:small;", onClick => $onclick },
+                    [$h->div ( { class=>'rTableCell', style=>"white-space:nowrap;padding:3px 5px 7px 5px;font-size:small;", onClick => $onclick },
                        substr($s->{dayofweek}, 0, 3)." [".$s->{date} =~ s/^\d{4}-(0)?//r =~ s|-(0)?|/|r."]",
                        $s->{time}.$h->br.
                        ($s->{volhours} ? $s->{volhours}." hrs" : '&nbsp;'),
                        $s->{location},
                        ($s->{dept} eq "CLA" ? "MVP Class" : $s->{dept} eq "SEM" ? "Seminar" : getDepartments()->{$s->{dept}}." - ".$s->{role}) .$h->br.
   if ($output eq "hours") {
     return $hours;
+  }
+  unshift @shifts, $h->div ({ class=>"rTableHeading " },
+                    [$h->div ( { class=>'rTableHead', style=>"white-space:nowrap;padding:3px 5px 7px 5px;font-size:small;" },
+                       "Date",
+                       "Time / VolHours",
+                       "Location",
+                       "Dept - Role",
+                       "")
+                     ]
                    );
   if (scalar @shifts) {
-    return $h->ul ({ style=>"padding-inline-start:5px;" }, [ @shifts, $h->h5 ("Currently showing $hours ".($filter eq "all" ? " total " : "remaining ")."hours of Volunteer Time.") ]);
+    return $h->ul ({ style=>"padding-inline-start:5px;" }, [$h->div ({ class=>"rTable", style=>"border-collapse:collapse;" }, [ @shifts ]), $h->h5 ("Currently showing $hours ".($filter eq "all" ? " total " : "remaining ")."hours of Volunteer Time.") ]);
   } elsif ($filter eq "prior") {
     return $h->p ({ class=>"hint" }, "[nothing to see here]");
   } else {

Subversion Repositories VORC

(root)/trunk/perl/RollerCon.pm – Rev 262 → 263