pyc-website

commit 76b86378c78ae15b05404c340e324fc6287c7469
parent 79db187fbe29cdc04fbbe2399f8c236cfa173a02
Author: Jul <jul@9o.is>
Date:   Mon, 21 Jul 2014 22:14:49 -0400

Atm isOpen function now includes timezone

Diffstat:
M
src/main/scala/inc/pyc/model/Atm.scala
 | 
11
+++++------

1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/scala/inc/pyc/model/Atm.scala b/src/main/scala/inc/pyc/model/Atm.scala
@@ -34,9 +34,7 @@ class Atm private () extends MongoRecord[Atm] with ObjectIdPk[Atm] {
     override def defaultValue = Countries.USA
   }
   
-  object timezone extends TimeZoneField(this) {
-    override def defaultValue = "America/New_York"
-  }
+  object timezone extends TimeZoneField(this)
   
   /** The Geolocation of the atm. */
   object loc extends MongoCaseClassField[Atm, LatLong](this) {
@@ -77,11 +75,11 @@ class Atm private () extends MongoRecord[Atm] with ObjectIdPk[Atm] {
    */
   private def isOpen: Boolean = {
     val comparator = DateTimeComparator.getTimeOnlyInstance()
-    val formatter = DateTimeFormat.forPattern("HH:mm")
+    val formatter = DateTimeFormat.forPattern("HH:mm ZZZ")
     val time = timeForToday
     val now = DateTime.now
-    val open = formatter.parseDateTime(time.open.get)
-    val close = formatter.parseDateTime(time.close.get)
+    val open = formatter.parseDateTime(time.open.get + " " + timezone.get)
+    val close = formatter.parseDateTime(time.close.get + " " + timezone.get)
     
     (comparator.compare(now, open) == 1) && (comparator.compare(now, close) == -1)
   }
@@ -174,6 +172,7 @@ object FeaturedAtm {
       .ownerObj(owner.id.get)
       .website("http://www.coffeetimehellas.com/")
       .model("skyhook")
+      .timezone("America/New_York")
       .times(times)
       .save()
   }