Compare commits

..

3 Commits

Author SHA1 Message Date
Magnus Åhall
5d24baedac Bumped to v31 2024-07-04 16:55:29 +02:00
Magnus Åhall
fefd4af10c Present times in configured timezone 2024-07-04 16:54:23 +02:00
Magnus Åhall
0de7ca4bef Immediate value presentation when adding datapoint to trigger 2024-07-04 16:48:57 +02:00
3 changed files with 20 additions and 5 deletions

View File

@ -54,14 +54,14 @@ func (dp DatapointValue) Value() any { // {{{
}
if dp.ValueDateTime.Valid {
return dp.ValueDateTime.Time
return dp.ValueDateTime.Time.In(smonConfig.timezoneLocation)
}
return nil
} // }}}
func (dp DatapointValue) FormattedTime() string { // {{{
if dp.ValueDateTime.Valid {
return dp.ValueDateTime.Time.Format("2006-01-02 15:04:05")
return dp.ValueDateTime.Time.In(smonConfig.timezoneLocation).Format("2006-01-02 15:04:05")
}
return "invalid time"
} // }}}

19
main.go
View File

@ -29,7 +29,7 @@ import (
"time"
)
const VERSION = "v30"
const VERSION = "v31"
var (
logger *slog.Logger
@ -951,7 +951,22 @@ func actionTriggerDatapointAdd(w http.ResponseWriter, r *http.Request, _ *sessio
return
}
j, _ := json.Marshal(struct{ OK bool }{OK: true})
// Also retrieve the datapoint to get the latest value
// for immediate presentation when added.
dp, err := DatapointRetrieve(0, dpName)
if err != nil {
httpError(w, werr.Wrap(err).WithData(dpName).Log())
return
}
dp.LastDatapointValue.TemplateValue = dp.LastDatapointValue.Value()
j, _ := json.Marshal(
struct {
OK bool
Datapoint Datapoint
}{
true,
dp,
})
w.Header().Add("Content-Type", "application/json")
w.Write(j)
} // }}}

View File

@ -158,7 +158,7 @@ export class Trigger {
alert(json.Error)
return
}
this.datapoints[dp.Name] = dp
this.datapoints[dp.Name] = json.Datapoint
})
}//}}}
}