improve alarm handling

adormit/adormit.go

@@ -11,7 +11,6 @@ import (
 func Version() string {
 	return "0.0.1a4"
 }
-
 var CurrentTimers []Timer
 var CurrentAlarms map[string]Alarm
 
@@ -19,7 +18,6 @@ func Init() {
 	CurrentAlarms = make(map[string]Alarm)
 	CurrentTimers = make([]Timer, 0)
 }
-
 type Alarm struct {
 	Name   string
 	Early  bool
@@ -29,11 +27,9 @@ type Alarm struct {
 	Uuid   uuid.UUID
 	Creator string
 }
-
-func (a *Alarm) String() {
+func (a *Alarm) String () string {
 	return fmt.Sprintf("%v by %v" , a.Name, a.Creator)
 }
-
 type Timer struct {
 	Name     string
 	Start    time.Time
@@ -67,6 +63,7 @@ func DemoTimer() {
 	t.Countdown()
 }
 
+
 func debug(ty interface{}) {
 	fooType := reflect.TypeOf(ty)
 	fmt.Println(fooType)
@@ -75,3 +72,4 @@ func debug(ty interface{}) {
 		fmt.Println(method.Name)
 	}
 }
+

cmd/http.go

@@ -57,18 +57,21 @@ func listTimers(ctx *macaron.Context) {
 
 func newAlarm(req *http.Request, log *log.Logger) string {
 	//insert new alarm locally
+	// log.Print(req.Form)
 	name := req.FormValue("name")
 	early, err := strconv.ParseBool(req.FormValue("early"))
-	// time, err := time.Parse("Mon Jan 2 15:04:05 -0700 MST 2006", req.FormValue("time"))
+	log.Println(req.FormValue("time"))
+	targettime, err := time.ParseInLocation(time.Kitchen, req.FormValue("time"), time.Local)
 	active, err := strconv.ParseBool(req.FormValue("active"))
 	if err != nil {
 		panic(err)
 	}
+	log.Println(targettime.Local())
 	// id := adormit.MakeAlarmId()
-	a := adormit.Alarm{Active: active, Early: early, Name: name}
+	a := adormit.Alarm{Active: active, Early: early, Name: name, Time: targettime}
 	a.MakeId()
 	g := a.SetAlarm()
-	log.Printf("http/newAlarm: %s", a.Uuid)
+	log.Printf("http/newAlarm: %s, %v", a.Uuid, a.Time)
 	return g
 }
 func delAlarm(req *http.Request) string {