Fixes #934 - Scheduled items now drop into the right days

2015-09-04 08:18:10 +01:00
parent 860457bfae
commit 0851427f2d
4 changed files with 37 additions and 4 deletions
@@ -129,6 +129,34 @@ class IncidentPresenter extends AbstractPresenter
        return $this->wrappedObject->scheduled_at->setTimezone($this->setting->get('app_timezone'))->format('d/m/Y H:i');
    }

+    /**
+     * Returns a formatted timestamp for use within the timeline.
+     *
+     * @return string
+     */
+    public function timestamp_formatted()
+    {
+        if ($this->wrappedObject->is_scheduled) {
+            return $this->scheduled_at_formatted;
+        } else {
+            return $this->created_at_formatted;
+        }
+    }
+
+    /**
+     * Return the iso timestamp for use within the timeline.
+     *
+     * @return string
+     */
+    public function timestamp_iso()
+    {
+        if ($this->wrappedObject->is_scheduled) {
+            return $this->scheduled_at_iso;
+        } else {
+            return $this->created_at_iso;
+        }
+    }
+
    /**
     * Present the status with an icon.
     *