From 0b3910c99854717282150bd4462c745b4008c7ae Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 28 Jul 2016 13:54:06 -0700 Subject: Removed monadic directives + Fixed timezones for textual time + Explicit Swagger host provision --- src/main/scala/com/drivergrp/core/time.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/scala/com/drivergrp/core/time.scala') diff --git a/src/main/scala/com/drivergrp/core/time.scala b/src/main/scala/com/drivergrp/core/time.scala index ebe0071..9bafb00 100644 --- a/src/main/scala/com/drivergrp/core/time.scala +++ b/src/main/scala/com/drivergrp/core/time.scala @@ -1,7 +1,7 @@ package com.drivergrp.core import java.text.SimpleDateFormat -import java.util.{Calendar, Date, GregorianCalendar} +import java.util._ import scala.concurrent.duration._ @@ -41,11 +41,11 @@ object time { }.getTime.getTime) } - def textualDate(time: Time): String = - new SimpleDateFormat("MMMM d, yyyy").format(new Date(time.millis)) + def textualDate(timezone: TimeZone)(time: Time): String = + make(new SimpleDateFormat("MMMM d, yyyy"))(_.setTimeZone(timezone)).format(new Date(time.millis)) - def textualTime(time: Time): String = - new SimpleDateFormat("MMM dd, yyyy hh:mm:ss a").format(new Date(time.millis)) + def textualTime(timezone: TimeZone)(time: Time): String = + make(new SimpleDateFormat("MMM dd, yyyy hh:mm:ss a"))(_.setTimeZone(timezone)).format(new Date(time.millis)) object provider { -- cgit v1.2.3