From 45a00193165bf651d3cae7e81d50dcac0fe745ac Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 28 Jan 2011 14:13:46 +0530
Subject: [PATCH] annotations

---
 pandora/annotation/models.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pandora/annotation/models.py b/pandora/annotation/models.py
index a337dfc0..2083af09 100644
--- a/pandora/annotation/models.py
+++ b/pandora/annotation/models.py
@@ -4,6 +4,7 @@ from __future__ import division, with_statement
 
 from django.db import models
 from django.contrib.auth.models import User
+import ox
 
 import utils
 
@@ -83,11 +84,12 @@ class Annotation(models.Model):
         return {
             'id': self.get_id(),
             'user': self.user.username,
-            'start': self.start,
-            'end': self.end,
+            'in': self.start,
+            'out': self.end,
             'value': self.value,
             'value_html': self.html(),
-            'layer': self.layer.name
+            'created': self.created.strftime('%Y-%m-%dT%H:%M:%SZ'),
+            'modified': self.modified.strftime('%Y-%m-%dT%H:%M:%SZ')
         }
 
     def __unicode__(self):