Schedule Entry - Initial Occurrence Scope

Commit 3a41b0 partially addressed initial occurrence issue from Starts On
perspective but failed to consider if the occurrence is already in the past
or out of scope.

This commit addresses the issue for realz.

include/class.businesshours.php

@@ -116,7 +116,13 @@ public function addWorkingHours(Datetime $date, $hours, &$auditlog=array()) {
                     // partial / remaining hours
                     if (!$e->isBeforeHours($date))
                         $partial = true;
+
+                } elseif (strtotime("$d ".$e->getEndsTime()) <
+                           $date->getTimestamp()) {
+                    // Entry is out of scope
+                    continue;
                 }
+
                 // Handle holidays - if within scope of current work day
                 $leadtime =0;
                 if (($holiday=$this->holidays[$d])) {

include/class.schedule.php

@@ -797,6 +797,7 @@ function getCurrent($from=null) {
             $stop = $this->getStopsDatetime();
             if ($stop && $stop->getTimestamp() < $from->getTimestamp())
                 return null;
+
             // Figure out start time for the entry.
             $from->modify($this->getIntervalSpec($from));
             $this->_current = clone $from;
@@ -1421,7 +1422,7 @@ function buildFields() {
                         'gmt' => false,
                         'future' => false,
                         'max' => time(),
-                        'showtimezone' => false,
+                        'showtimezone' => true,
                         ),
                 )),
                 'hours'  =>  new TextboxField(array(

include/staff/templates/schedule-diagnostic.tmpl.php

@@ -15,6 +15,10 @@
     if ($form->isValid()) {
         $timeline = array();
         $data = $form->getClean();
+        // Add timezone if it's not ISO compliant date (GET request)
+        if (strlen($data['date']) <= 16)
+            $data['date'] .= ' '.$schedule->getTimezone();
+
         $schedule->addWorkingHours(Format::parseDateTime($data['date']), $data['hours'], $timeline);
         ?>
         <div id="diagnostic-results"